3 files changed, 13 insertions, 11 deletions
diff --git a/activerecord/test/schema/mysql2_specific_schema.rb b/activerecord/test/schema/mysql2_specific_schema.rb
index 101e657982..5a49b38457 100644
--- a/activerecord/test/schema/mysql2_specific_schema.rb
+++ b/activerecord/test/schema/mysql2_specific_schema.rb
@@ -33,6 +33,7 @@ ActiveRecord::Schema.define do
   create_table :collation_tests, id: false, force: true do |t|
     t.string :string_cs_column, limit: 1, collation: 'utf8_bin'
     t.string :string_ci_column, limit: 1, collation: 'utf8_general_ci'
+    t.binary :binary_column,    limit: 1
   end
 
   ActiveRecord::Base.connection.execute <<-SQL
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 2a8996f35c..1027bcb365 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -1,10 +1,4 @@
 ActiveRecord::Schema.define do
-  def except(adapter_names_to_exclude)
-    unless [adapter_names_to_exclude].flatten.include?(adapter_name)
-      yield
-    end
-  end
-
   # ------------------------------------------------------------------- #
   #                                                                     #
   #   Please keep these create table statements in alphabetical order   #
@@ -421,6 +415,11 @@ ActiveRecord::Schema.define do
     t.integer :amount
   end
 
+  create_table :lions, force: true do |t|
+    t.integer :gender
+    t.boolean :is_vegetarian, default: false
+  end
+
   create_table :lock_without_defaults, force: true do |t|
     t.column :lock_version, :integer
   end
@@ -615,6 +614,12 @@ ActiveRecord::Schema.define do
     end
   end
 
+  create_table :pets_treasures, force: true do |t|
+    t.column :treasure_id, :integer
+    t.column :pet_id, :integer
+    t.column :rainbow_color, :string
+  end
+
   create_table :pirates, force: true do |t|
     t.column :catchphrase, :string
     t.column :parrot_id, :integer
@@ -986,7 +991,7 @@ ActiveRecord::Schema.define do
   create_table :records, force: true do |t|
   end
 
-  except 'SQLite' do
+  if supports_foreign_keys?
     # fk_test_has_fk should be before fk_test_has_pk
     create_table :fk_test_has_fk, force: true do |t|
       t.integer :fk_id, null: false
diff --git a/activerecord/test/schema/sqlite_specific_schema.rb b/activerecord/test/schema/sqlite_specific_schema.rb
index b5552c2755..cc7c36fe2b 100644
--- a/activerecord/test/schema/sqlite_specific_schema.rb
+++ b/activerecord/test/schema/sqlite_specific_schema.rb
@@ -1,8 +1,4 @@
 ActiveRecord::Schema.define do
-  create_table :table_with_autoincrement, :force => true do |t|
-    t.column :name, :string
-  end
-
   execute "DROP TABLE fk_test_has_fk" rescue nil
   execute "DROP TABLE fk_test_has_pk" rescue nil
   execute <<_SQL