diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-01 19:17:37 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-01 19:18:34 -0300 |
| commit | bb38df89bfbfc37913babe2edf6ad73b0dc80358 (patch) | |
| tree | 1b4bf7f0dc3e6824e812c6fd06b79ce9f0c409be /activerecord/test/cases/associations/belongs_to_associations_test.rb | |
| parent | baf8e34697b38f2ebbf1f868ac950da767d319a5 (diff) | |
| download | rails-bb38df89bfbfc37913babe2edf6ad73b0dc80358.tar.gz rails-bb38df89bfbfc37913babe2edf6ad73b0dc80358.tar.bz2 rails-bb38df89bfbfc37913babe2edf6ad73b0dc80358.zip | |
Standardize the use of current_adapter?
Diffstat (limited to 'activerecord/test/cases/associations/belongs_to_associations_test.rb')
| -rw-r--r-- | activerecord/test/cases/associations/belongs_to_associations_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb index 04d0f755b6..5fe7a1a858 100644 --- a/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -33,7 +33,7 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase def test_belongs_to_with_primary_key_joins_on_correct_column sql = Client.joins(:firm_with_primary_key).to_sql - if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter) + if current_adapter?(:MysqlAdapter, :Mysql2Adapter) assert_no_match(/`firm_with_primary_keys_companies`\.`id`/, sql) assert_match(/`firm_with_primary_keys_companies`\.`name`/, sql) elsif current_adapter?(:OracleAdapter) |