Rename language_code to code - language_code is tautological when it's

in the language table anyway.

diff --git a/app/models/language.rb b/app/models/language.rb
index 9c7ca4c0e83b2df9dce973f69d632b1bd7608064..8965cf4532a141b2a514f53a729df2f2d6ad8303 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,6 +1,6 @@
 class Language < ActiveRecord::Base
-  set_primary_key :language_code
-  
+  set_primary_key :code
+
   has_many :users, :foreign_key => 'locale'
   has_many :diary_entries, :foreign_key => 'language'
 end

diff --git a/app/views/diary_entry/edit.rhtml b/app/views/diary_entry/edit.rhtml
index 8a91fe5343172e6da369dbd109e7200dc67c44ce..6657d033a22da841b340f006271c8cfde094e5a9 100644 (file)
--- a/app/views/diary_entry/edit.rhtml
+++ b/app/views/diary_entry/edit.rhtml
@@ -14,7 +14,7 @@
     </tr>
     <tr valign="top">
       <td class="fieldName">Language:</td>
-      <td><%= f.select :language, Language.find(:all).map {|l| [l.name, l.language_code]} %></td>
+      <td><%= f.select :language, Language.find(:all).map {|l| [l.name, l.code]} %></td>
     </tr>
     <tr valign="top">
       <td class="fieldName">Location:</td>

diff --git a/db/migrate/034_create_languages.rb b/db/migrate/034_create_languages.rb
index db34978a8ff856894e1bf1ef62c9f62ca6ac289d..ca9552d98298f6eafe559f6c581844a5985c5e37 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -2,23 +2,22 @@ require 'lib/migrate'
 
 class CreateLanguages < ActiveRecord::Migration
   def self.up
-    create_table :languages do |t|
-      t.string :language_code, :limit => 5, :null => false
+    create_table :languages, innodb_table do |t|
+      t.string :code, :limit => 5, :null => false
       t.string :name, :null => false
       t.boolean :translation_available, :null => false, :default => false
-
-      t.timestamps
     end
-    
-    add_index :languages, [:language_code], :unique => true
 
-    Language.create(:language_code => 'en', :name => 'English', :translation_available => true)
-    
-    add_foreign_key :users, [:locale], :languages, [:language_code]
-    add_foreign_key :diary_entries, [:language], :languages, [:language_code]    
+    add_primary_key :languages, [:code]
+
+    Language.create(:code => 'en', :name => 'English', :translation_available => true)
+
+    add_foreign_key :users, [:locale], :languages, [:code]
+    add_foreign_key :diary_entries, [:language], :languages, [:code]    
   end
 
   def self.down
     raise IrreversibleMigration.new
   end
 end
+