aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-07 06:07:24 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-07 06:07:24 -0800
commitbb0007f70420445f140004587aa1228895ab6653 (patch)
treebc19a48b2381eeb6c7548e85bb8dd937991f5b5e /activerecord
parent51ae6f4bb19014dc081b75864cbede1d612c02d2 (diff)
parent5d57b821d04eab3fd9b4bdf78254dc428d203be7 (diff)
downloadrails-bb0007f70420445f140004587aa1228895ab6653.tar.gz
rails-bb0007f70420445f140004587aa1228895ab6653.tar.bz2
rails-bb0007f70420445f140004587aa1228895ab6653.zip
Merge pull request #9594 from yahonda/3-2-stable_prefix_suffix
Use shorter prefix and suffix to support Oracle adapter
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/ar_schema_test.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/activerecord/test/cases/ar_schema_test.rb b/activerecord/test/cases/ar_schema_test.rb
index ee338a3b99..6556219205 100644
--- a/activerecord/test/cases/ar_schema_test.rb
+++ b/activerecord/test/cases/ar_schema_test.rb
@@ -11,8 +11,8 @@ 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
+ @connection.drop_table :"_p_fruits_s_" rescue nil
+ @connection.drop_table :"_p_schema_migrations_s_" rescue nil
end
def test_schema_define
@@ -24,8 +24,9 @@ if ActiveRecord::Base.connection.supports_migrations?
end
def test_schema_define_with_table_prefix_and_suffix
- ActiveRecord::Base.table_name_prefix = '_pre_'
- ActiveRecord::Base.table_name_suffix = '_suf_'
+ # Use shorter prefix and suffix as in Oracle database identifier cannot be larger than 30 characters
+ ActiveRecord::Base.table_name_prefix = '_p_'
+ ActiveRecord::Base.table_name_suffix = '_s_'
perform_schema_define!