Merge branch 'master' into bug/filtered_parameters_class

7 files changed, 61 insertions, 26 deletions

diff --git a/activerecord/test/cases/migration/change_schema_test.rb b/activerecord/test/cases/migration/change_schema_test.rb
index 48cfe89882..1d305fa11f 100644
--- a/activerecord/test/cases/migration/change_schema_test.rb
+++ b/activerecord/test/cases/migration/change_schema_test.rb
@@ -269,6 +269,8 @@ module ActiveRecord
 
         if current_adapter?(:PostgreSQLAdapter)
           assert_equal "timestamp without time zone", klass.columns_hash["foo"].sql_type
+        elsif current_adapter?(:Mysql2Adapter)
+          assert_equal "timestamp", klass.columns_hash["foo"].sql_type
         else
           assert_equal klass.connection.type_to_sql("datetime"), klass.columns_hash["foo"].sql_type
         end
diff --git a/activerecord/test/cases/migration/columns_test.rb b/activerecord/test/cases/migration/columns_test.rb
index 55c06da411..2329888345 100644
--- a/activerecord/test/cases/migration/columns_test.rb
+++ b/activerecord/test/cases/migration/columns_test.rb
@@ -225,6 +225,16 @@ module ActiveRecord
         assert_nil TestModel.new.contributor
       end
 
+      def test_change_column_to_drop_default_with_null_false
+        add_column "test_models", "contributor", :boolean, default: true, null: false
+        assert TestModel.new.contributor?
+
+        change_column "test_models", "contributor", :boolean, default: nil, null: false
+        TestModel.reset_column_information
+        assert_not TestModel.new.contributor?
+        assert_nil TestModel.new.contributor
+      end
+
       def test_change_column_with_new_default
         add_column "test_models", "administrator", :boolean, default: true
         assert TestModel.new.administrator?
diff --git a/activerecord/test/cases/migration/create_join_table_test.rb b/activerecord/test/cases/migration/create_join_table_test.rb
index 26b1bb4419..c4896f3d6e 100644
--- a/activerecord/test/cases/migration/create_join_table_test.rb
+++ b/activerecord/test/cases/migration/create_join_table_test.rb
@@ -12,7 +12,7 @@ module ActiveRecord
 
       teardown do
         %w(artists_musics musics_videos catalog).each do |table_name|
-          connection.drop_table table_name if connection.table_exists?(table_name)
+          connection.drop_table table_name, if_exists: true
         end
       end
 
@@ -78,6 +78,17 @@ module ActiveRecord
         assert_equal [%w(artist_id music_id)], connection.indexes(:artists_musics).map(&:columns)
       end
 
+      def test_create_join_table_respects_reference_key_type
+        connection.create_join_table :artists, :musics do |t|
+          t.references :video
+        end
+
+        artist_id, music_id, video_id = connection.columns(:artists_musics).sort_by(&:name)
+
+        assert_equal video_id.sql_type, artist_id.sql_type
+        assert_equal video_id.sql_type, music_id.sql_type
+      end
+
       def test_drop_join_table
         connection.create_join_table :artists, :musics
         connection.drop_join_table :artists, :musics
diff --git a/activerecord/test/cases/migration/foreign_key_test.rb b/activerecord/test/cases/migration/foreign_key_test.rb
index 2258290a3c..7762d37915 100644
--- a/activerecord/test/cases/migration/foreign_key_test.rb
+++ b/activerecord/test/cases/migration/foreign_key_test.rb
@@ -1,5 +1,4 @@
 require "cases/helper"
-require "support/ddl_helper"
 require "support/schema_dumping_helper"
 
 if ActiveRecord::Base.connection.supports_foreign_keys_in_create?
@@ -26,7 +25,6 @@ if ActiveRecord::Base.connection.supports_foreign_keys?
   module ActiveRecord
     class Migration
       class ForeignKeyTest < ActiveRecord::TestCase
-        include DdlHelper
         include SchemaDumpingHelper
         include ActiveSupport::Testing::Stream
 
@@ -94,20 +92,23 @@ if ActiveRecord::Base.connection.supports_foreign_keys?
         end
 
         def test_add_foreign_key_with_non_standard_primary_key
-          with_example_table @connection, "space_shuttles", "pk BIGINT PRIMARY KEY" do
-            @connection.add_foreign_key(:astronauts, :space_shuttles,
-                                        column: "rocket_id", primary_key: "pk", name: "custom_pk")
+          @connection.create_table :space_shuttles, id: false, force: true do |t|
+            t.bigint :pk, primary_key: true
+          end
 
-            foreign_keys = @connection.foreign_keys("astronauts")
-            assert_equal 1, foreign_keys.size
+          @connection.add_foreign_key(:astronauts, :space_shuttles,
+            column: "rocket_id", primary_key: "pk", name: "custom_pk")
 
-            fk = foreign_keys.first
-            assert_equal "astronauts", fk.from_table
-            assert_equal "space_shuttles", fk.to_table
-            assert_equal "pk", fk.primary_key
+          foreign_keys = @connection.foreign_keys("astronauts")
+          assert_equal 1, foreign_keys.size
 
-            @connection.remove_foreign_key :astronauts, name: "custom_pk"
-          end
+          fk = foreign_keys.first
+          assert_equal "astronauts", fk.from_table
+          assert_equal "space_shuttles", fk.to_table
+          assert_equal "pk", fk.primary_key
+        ensure
+          @connection.remove_foreign_key :astronauts, name: "custom_pk"
+          @connection.drop_table :space_shuttles
         end
 
         def test_add_on_delete_restrict_foreign_key
diff --git a/activerecord/test/cases/migration/pending_migrations_test.rb b/activerecord/test/cases/migration/pending_migrations_test.rb
index 61f5a061b0..6970fdcc87 100644
--- a/activerecord/test/cases/migration/pending_migrations_test.rb
+++ b/activerecord/test/cases/migration/pending_migrations_test.rb
@@ -21,8 +21,6 @@ module ActiveRecord
       end
 
       def test_errors_if_pending
-        @connection.expect :supports_migrations?, true
-
         ActiveRecord::Migrator.stub :needs_migration?, true do
           assert_raise ActiveRecord::PendingMigrationError do
             @pending.call(nil)
@@ -31,22 +29,12 @@ module ActiveRecord
       end
 
       def test_checks_if_supported
-        @connection.expect :supports_migrations?, true
         @app.expect :call, nil, [:foo]
 
         ActiveRecord::Migrator.stub :needs_migration?, false do
           @pending.call(:foo)
         end
       end
-
-      def test_doesnt_check_if_unsupported
-        @connection.expect :supports_migrations?, false
-        @app.expect :call, nil, [:foo]
-
-        ActiveRecord::Migrator.stub :needs_migration?, true do
-          @pending.call(:foo)
-        end
-      end
     end
   end
 end
diff --git a/activerecord/test/cases/migration/references_foreign_key_test.rb b/activerecord/test/cases/migration/references_foreign_key_test.rb
index 9418995ea0..f1ddac1ee2 100644
--- a/activerecord/test/cases/migration/references_foreign_key_test.rb
+++ b/activerecord/test/cases/migration/references_foreign_key_test.rb
@@ -203,6 +203,22 @@ if ActiveRecord::Base.connection.supports_foreign_keys?
           assert_equal([["testings", "testing_parents", "parent1_id"],
                         ["testings", "testing_parents", "parent2_id"]], fk_definitions)
         end
+
+        test "multiple foreign keys can be removed to the selected one" do
+          @connection.create_table :testings do |t|
+            t.references :parent1, foreign_key: { to_table: :testing_parents }
+            t.references :parent2, foreign_key: { to_table: :testing_parents }
+          end
+
+          assert_difference "@connection.foreign_keys('testings').size", -1 do
+            @connection.remove_reference :testings, :parent1, foreign_key: { to_table: :testing_parents }
+          end
+
+          fks = @connection.foreign_keys("testings").sort_by(&:column)
+
+          fk_definitions = fks.map { |fk| [fk.from_table, fk.to_table, fk.column] }
+          assert_equal([["testings", "testing_parents", "parent2_id"]], fk_definitions)
+        end
       end
     end
   end
diff --git a/activerecord/test/cases/migration/references_statements_test.rb b/activerecord/test/cases/migration/references_statements_test.rb
index df15d7cb45..06c44c8c52 100644
--- a/activerecord/test/cases/migration/references_statements_test.rb
+++ b/activerecord/test/cases/migration/references_statements_test.rb
@@ -50,6 +50,13 @@ module ActiveRecord
         assert column_exists?(table_name, :taggable_type, :string, default: "Photo")
       end
 
+      def test_does_not_share_options_with_reference_type_column
+        add_reference table_name, :taggable, type: :integer, limit: 2, polymorphic: true
+        assert column_exists?(table_name, :taggable_id, :integer, limit: 2)
+        assert column_exists?(table_name, :taggable_type, :string)
+        assert_not column_exists?(table_name, :taggable_type, :string, limit: 2)
+      end
+
       def test_creates_named_index
         add_reference table_name, :tag, index: { name: "index_taggings_on_tag_id" }
         assert index_exists?(table_name, :tag_id, name: "index_taggings_on_tag_id")