aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/primary_keys_test.rb
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2015-12-18 13:46:18 +1030
committerMatthew Draper <matthew@trebex.net>2015-12-18 13:51:04 +1030
commit4a58aef7e3035e775b4cd6cc65575c8ed02cd8af (patch)
tree683e0e7b82ceae65ebc0dd864a910546781d7fe0 /activerecord/test/cases/primary_keys_test.rb
parent7a6772c0e7acc10f4edad8ce3e6d401524ea1336 (diff)
parentfb24d0ed6c26da70045c6fc128aaa9dcb777c28c (diff)
downloadrails-4a58aef7e3035e775b4cd6cc65575c8ed02cd8af.tar.gz
rails-4a58aef7e3035e775b4cd6cc65575c8ed02cd8af.tar.bz2
rails-4a58aef7e3035e775b4cd6cc65575c8ed02cd8af.zip
Merge pull request #22642 from seuros/remove-mysql-adapter
Remove legacy mysql 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 d883784553..7e18313c00 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -268,7 +268,7 @@ class CompositePrimaryKeyTest < ActiveRecord::TestCase
end
end
-if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
+if current_adapter?(:Mysql2Adapter)
class PrimaryKeyWithAnsiQuotesTest < ActiveRecord::TestCase
self.use_transactional_tests = false
@@ -308,7 +308,7 @@ if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
end
end
-if current_adapter?(:PostgreSQLAdapter, :MysqlAdapter, :Mysql2Adapter)
+if current_adapter?(:PostgreSQLAdapter, :Mysql2Adapter)
class PrimaryKeyBigSerialTest < ActiveRecord::TestCase
include SchemaDumpingHelper
@@ -351,7 +351,7 @@ if current_adapter?(:PostgreSQLAdapter, :MysqlAdapter, :Mysql2Adapter)
end
end
- if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
+ if current_adapter?(:Mysql2Adapter)
test "primary key column type with options" do
@connection.create_table(:widgets, id: :primary_key, limit: 8, unsigned: true, force: true)
column = @connection.columns(:widgets).find { |c| c.name == 'id' }