aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/primary_keys_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-01 19:17:37 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-01 19:18:34 -0300
commitbb38df89bfbfc37913babe2edf6ad73b0dc80358 (patch)
tree1b4bf7f0dc3e6824e812c6fd06b79ce9f0c409be /activerecord/test/cases/primary_keys_test.rb
parentbaf8e34697b38f2ebbf1f868ac950da767d319a5 (diff)
downloadrails-bb38df89bfbfc37913babe2edf6ad73b0dc80358.tar.gz
rails-bb38df89bfbfc37913babe2edf6ad73b0dc80358.tar.bz2
rails-bb38df89bfbfc37913babe2edf6ad73b0dc80358.zip
Standardize the use of current_adapter?
Diffstat (limited to 'activerecord/test/cases/primary_keys_test.rb')
-rw-r--r--activerecord/test/cases/primary_keys_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index bf8aacc363..8e5379cb1f 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -201,10 +201,10 @@ class PrimaryKeyWithNoConnectionTest < ActiveRecord::TestCase
end
end
-if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
+if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
class PrimaryKeyWithAnsiQuotesTest < ActiveRecord::TestCase
self.use_transactional_fixtures = false
-
+
def test_primaery_key_method_with_ansi_quotes
con = ActiveRecord::Base.connection
con.execute("SET SESSION sql_mode='ANSI_QUOTES'")
@@ -212,7 +212,7 @@ if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
ensure
con.reconnect!
end
-
+
end
end