aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/migration
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/migration
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/migration')
-rw-r--r--activerecord/test/cases/migration/change_schema_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/migration/change_schema_test.rb b/activerecord/test/cases/migration/change_schema_test.rb
index 4a3c48f750..5ac4a16f33 100644
--- a/activerecord/test/cases/migration/change_schema_test.rb
+++ b/activerecord/test/cases/migration/change_schema_test.rb
@@ -50,7 +50,7 @@ module ActiveRecord
def test_create_table_with_defaults
# MySQL doesn't allow defaults on TEXT or BLOB columns.
- mysql = current_adapter?(:MysqlAdapter) || current_adapter?(:Mysql2Adapter)
+ mysql = current_adapter?(:MysqlAdapter, :Mysql2Adapter)
connection.create_table :testings do |t|
t.column :one, :string, :default => "hello"
@@ -99,7 +99,7 @@ module ActiveRecord
assert_equal 'smallint', one.sql_type
assert_equal 'integer', four.sql_type
assert_equal 'bigint', eight.sql_type
- elsif current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
+ elsif current_adapter?(:MysqlAdapter, :Mysql2Adapter)
assert_match 'int(11)', default.sql_type
assert_match 'tinyint', one.sql_type
assert_match 'int', four.sql_type