From 4325bec1d46de4a7fbe094ae18e83648532e2ddf Mon Sep 17 00:00:00 2001
From: Chris Barton <cbarton@inigral.com>
Date: Tue, 18 Sep 2012 13:15:02 -0700
Subject: Making test accurately reflect what is going on in the schema
 migrations test

---
 activerecord/test/cases/ar_schema_test.rb | 36 ++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 8 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index 588adc38e3..ee338a3b99 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -11,23 +11,30 @@ if ActiveRecord::Base.connection.supports_migrations?
 
     def teardown
       @connection.drop_table :fruits rescue nil
+      @connection.drop_table :"_pre_fruits_suf_" rescue nil
+      @connection.drop_table :"_pre_schema_migrations_suf_" rescue nil
     end
 
     def test_schema_define
-      ActiveRecord::Schema.define(:version => 7) do
-        create_table :fruits do |t|
-          t.column :color, :string
-          t.column :fruit_size, :string  # NOTE: "size" is reserved in Oracle
-          t.column :texture, :string
-          t.column :flavor, :string
-        end
-      end
+      perform_schema_define!
 
       assert_nothing_raised { @connection.select_all "SELECT * FROM fruits" }
       assert_nothing_raised { @connection.select_all "SELECT * FROM schema_migrations" }
       assert_equal 7, ActiveRecord::Migrator::current_version
     end
 
+    def test_schema_define_with_table_prefix_and_suffix
+      ActiveRecord::Base.table_name_prefix = '_pre_'
+      ActiveRecord::Base.table_name_suffix = '_suf_'
+
+      perform_schema_define!
+
+      assert_equal 7, ActiveRecord::Migrator::current_version
+    ensure
+      ActiveRecord::Base.table_name_prefix = ''
+      ActiveRecord::Base.table_name_suffix = ''
+    end
+
     def test_schema_raises_an_error_for_invalid_column_type
       assert_raise NoMethodError do
         ActiveRecord::Schema.define(:version => 8) do
@@ -39,4 +46,17 @@ if ActiveRecord::Base.connection.supports_migrations?
     end
   end
 
+  private
+
+    def perform_schema_define!
+      ActiveRecord::Schema.define(:version => 7) do
+        create_table :fruits do |t|
+          t.column :color, :string
+          t.column :fruit_size, :string  # NOTE: "size" is reserved in Oracle
+          t.column :texture, :string
+          t.column :flavor, :string
+        end
+      end
+    end
+
 end
-- 
cgit v1.2.3