diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-10 11:09:39 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-10 11:09:39 -0300 |
| commit | 39e07b64ce3f4bb55e60ba0266e677f8e4f4893a (patch) | |
| tree | b885fae7b75774f66ae84522df492a3f02c33598 /activerecord/test/cases | |
| parent | d50f75367bbd1baf52a8c9c246e7b27d6d9addff (diff) | |
| download | rails-39e07b64ce3f4bb55e60ba0266e677f8e4f4893a.tar.gz rails-39e07b64ce3f4bb55e60ba0266e677f8e4f4893a.tar.bz2 rails-39e07b64ce3f4bb55e60ba0266e677f8e4f4893a.zip | |
current_adapter? accepts multiple arguments
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/schema_dumper_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb index c085663efb..2748cbdbf4 100644 --- a/activerecord/test/cases/schema_dumper_test.rb +++ b/activerecord/test/cases/schema_dumper_test.rb @@ -177,7 +177,7 @@ class SchemaDumperTest < ActiveRecord::TestCase def test_schema_dumps_index_columns_in_right_order index_definition = standard_dump.split(/\n/).grep(/add_index.*companies/).first.strip - if current_adapter?(:MysqlAdapter) || current_adapter?(:Mysql2Adapter) || current_adapter?(:PostgreSQLAdapter) + if current_adapter?(:MysqlAdapter, :Mysql2Adapter, :PostgreSQLAdapter) assert_equal 'add_index "companies", ["firm_id", "type", "rating"], name: "company_index", using: :btree', index_definition else assert_equal 'add_index "companies", ["firm_id", "type", "rating"], name: "company_index"', index_definition @@ -188,7 +188,7 @@ class SchemaDumperTest < ActiveRecord::TestCase index_definition = standard_dump.split(/\n/).grep(/add_index.*company_partial_index/).first.strip if current_adapter?(:PostgreSQLAdapter) assert_equal 'add_index "companies", ["firm_id", "type"], name: "company_partial_index", where: "(rating > 10)", using: :btree', index_definition - elsif current_adapter?(:MysqlAdapter) || current_adapter?(:Mysql2Adapter) + elsif current_adapter?(:MysqlAdapter, :Mysql2Adapter) assert_equal 'add_index "companies", ["firm_id", "type"], name: "company_partial_index", using: :btree', index_definition elsif current_adapter?(:SQLite3Adapter) && ActiveRecord::Base.connection.supports_partial_index? assert_equal 'add_index "companies", ["firm_id", "type"], name: "company_partial_index", where: "rating > 10"', index_definition |