Make migrations honor table name prefixes and suffixes.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2352 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 53 insertions, 2 deletions

diff --git a/activerecord/test/migration_test.rb b/activerecord/test/migration_test.rb
index b24b7a7d44..5a86a678cd 100644
--- a/activerecord/test/migration_test.rb
+++ b/activerecord/test/migration_test.rb
@@ -15,7 +15,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
     def teardown
       ActiveRecord::Base.connection.initialize_schema_information
-      ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
+      ActiveRecord::Base.connection.update "UPDATE #{ActiveRecord::Migrator.schema_info_table_name} SET version = 0"
 
       Reminder.connection.drop_table("reminders") rescue nil
       Reminder.connection.drop_table("people_reminders") rescue nil
@@ -262,5 +262,56 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
       assert_equal "hello world", Reminder.find(:first).content
     end
-  end
+
+    def test_schema_info_table_name
+      ActiveRecord::Base.table_name_prefix = "prefix_"
+      ActiveRecord::Base.table_name_suffix = "_suffix"
+      assert_equal "prefix_schema_info_suffix", ActiveRecord::Migrator.schema_info_table_name
+      ActiveRecord::Base.table_name_prefix = ""
+      ActiveRecord::Base.table_name_suffix = ""
+      assert_equal "schema_info", ActiveRecord::Migrator.schema_info_table_name
+    end
+  
+    def test_proper_table_name
+      assert_equal "table", ActiveRecord::Migrator.proper_table_name('table')
+      assert_equal "table", ActiveRecord::Migrator.proper_table_name(:table)
+      assert_equal "reminders", ActiveRecord::Migrator.proper_table_name(Reminder)
+      assert_equal Reminder.table_name, ActiveRecord::Migrator.proper_table_name(Reminder)
+  
+      # Use the model's own prefix/suffix if a model is given
+      ActiveRecord::Base.table_name_prefix = "ARprefix_"
+      ActiveRecord::Base.table_name_suffix = "_ARsuffix"
+      Reminder.table_name_prefix = 'prefix_'
+      Reminder.table_name_suffix = '_suffix'
+      assert_equal "prefix_reminders_suffix", ActiveRecord::Migrator.proper_table_name(Reminder)
+      Reminder.table_name_prefix = ''
+      Reminder.table_name_suffix = ''
+      
+      # Use AR::Base's prefix/suffix if string or symbol is given      
+      ActiveRecord::Base.table_name_prefix = "prefix_"
+      ActiveRecord::Base.table_name_suffix = "_suffix"
+      assert_equal "prefix_table_suffix", ActiveRecord::Migrator.proper_table_name('table')
+      assert_equal "prefix_table_suffix", ActiveRecord::Migrator.proper_table_name(:table)
+      ActiveRecord::Base.table_name_prefix = ""
+      ActiveRecord::Base.table_name_suffix = ""
+    end  
+
+    def test_add_drop_table_with_prefix_and_suffix
+      assert_raises(ActiveRecord::StatementInvalid) { Reminder.column_methods_hash }
+
+      ActiveRecord::Base.table_name_prefix = 'prefix_'
+      ActiveRecord::Base.table_name_suffix = '_suffix'
+      WeNeedReminders.up
+
+      assert Reminder.create("content" => "hello world", "remind_at" => Time.now)
+      assert_equal "hello world", Reminder.find(:first).content
+
+      WeNeedReminders.down
+      assert_raises(ActiveRecord::StatementInvalid) { Reminder.find(:first) }
+      ActiveRecord::Base.table_name_prefix = ''
+      ActiveRecord::Base.table_name_suffix = ''
+    end
+
+  end  
+  
 end