Merge pull request #9471 from yahonda/5837_32-stable

Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix

1 files changed, 4 insertions, 4 deletions

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 5b67d22c31..120948a528 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -61,7 +61,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Base.connection.initialize_schema_migrations_table
       ActiveRecord::Base.connection.execute "DELETE FROM #{ActiveRecord::Migrator.schema_migrations_table_name}"
 
-      %w(things awesome_things prefix_things_suffix prefix_awesome_things_suffix).each do |table|
+      %w(things awesome_things prefix_things_suffix p_awesome_things_s).each do |table|
         Thing.connection.drop_table(table) rescue nil
       end
       Thing.reset_column_information
@@ -1647,8 +1647,8 @@ if ActiveRecord::Base.connection.supports_migrations?
 
     def test_rename_table_with_prefix_and_suffix
       assert !Thing.table_exists?
-      ActiveRecord::Base.table_name_prefix = 'prefix_'
-      ActiveRecord::Base.table_name_suffix = '_suffix'
+      ActiveRecord::Base.table_name_prefix = 'p_'
+      ActiveRecord::Base.table_name_suffix = '_s'
       Thing.reset_table_name
       Thing.reset_sequence_name
       WeNeedThings.up
@@ -1657,7 +1657,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal "hello world", Thing.find(:first).content
 
       RenameThings.up
-      Thing.table_name = "prefix_awesome_things_suffix"
+      Thing.table_name = "p_awesome_things_s"
 
       assert_equal "hello world", Thing.find(:first).content
     ensure