aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-01 14:08:53 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-01 14:08:53 -0800
commitbaf8e34697b38f2ebbf1f868ac950da767d319a5 (patch)
tree5a28f056ff3cbf8e388c41ebd582264679bded81 /activerecord/test
parente333d64f3d02358f4fbabc93589bb06c930b8cb0 (diff)
parente7ff765e116600f85fd3bb68e6e9a5a5cbaef04d (diff)
downloadrails-baf8e34697b38f2ebbf1f868ac950da767d319a5.tar.gz
rails-baf8e34697b38f2ebbf1f868ac950da767d319a5.tar.bz2
rails-baf8e34697b38f2ebbf1f868ac950da767d319a5.zip
Merge pull request #8678 from yahonda/remove_column_oracle
Address a failure test_remove_column_with_multi_column_index with Oracle
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/migration/rename_column_test.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/test/cases/migration/rename_column_test.rb b/activerecord/test/cases/migration/rename_column_test.rb
index 866b2e334c..8f6918d06a 100644
--- a/activerecord/test/cases/migration/rename_column_test.rb
+++ b/activerecord/test/cases/migration/rename_column_test.rb
@@ -107,8 +107,9 @@ module ActiveRecord
assert_equal 1, connection.indexes('test_models').size
remove_column("test_models", "hat_size")
- # FIXME: should all adapters behave the same?
- if current_adapter?(:PostgreSQLAdapter)
+ # Every database and/or database adapter has their own behavior
+ # if it drops the multi-column index when any of the indexed columns dropped by remove_column.
+ if current_adapter?(:PostgreSQLAdapter, :OracleAdapter)
assert_equal [], connection.indexes('test_models').map(&:name)
else
assert_equal ['index_test_models_on_hat_style_and_hat_size'], connection.indexes('test_models').map(&:name)