Merge pull request rails#50198 from fatkodima/fix-duplicate-deferrable-directive

Fix duplicate `DEFERRABLE` directive added for foreign keys in PostgreSQL and SQLite

Author: kamipo

activerecord/lib/active_record/connection_adapters/postgresql/schema_creation.rb

@@ -18,7 +18,6 @@ def visit_AlterTable(o)
 
           def visit_AddForeignKey(o)
             super.dup.tap do |sql|
-              sql << " DEFERRABLE INITIALLY #{o.options[:deferrable].to_s.upcase}" if o.deferrable
               sql << " NOT VALID" unless o.validate?
             end
           end

activerecord/lib/active_record/connection_adapters/sqlite3/schema_creation.rb

@@ -5,12 +5,6 @@ module ConnectionAdapters
     module SQLite3
       class SchemaCreation < SchemaCreation # :nodoc:
         private
-          def visit_AddForeignKey(o)
-            super.dup.tap do |sql|
-              sql << " DEFERRABLE INITIALLY #{o.options[:deferrable].to_s.upcase}" if o.deferrable
-            end
-          end
-
           def visit_ForeignKeyDefinition(o)
             super.dup.tap do |sql|
               sql << " DEFERRABLE INITIALLY #{o.deferrable.to_s.upcase}" if o.deferrable

activerecord/test/cases/migration/foreign_key_test.rb

@@ -519,7 +519,9 @@ def test_add_invalid_foreign_key
 
         if ActiveRecord::Base.lease_connection.supports_deferrable_constraints?
           def test_deferrable_foreign_key
-            @connection.add_foreign_key :astronauts, :rockets, column: "rocket_id", deferrable: :immediate
+            assert_queries_match(/\("id"\)\s+DEFERRABLE INITIALLY IMMEDIATE\W*\z/i) do
+              @connection.add_foreign_key :astronauts, :rockets, column: "rocket_id", deferrable: :immediate
+            end
 
             foreign_keys = @connection.foreign_keys("astronauts")
             assert_equal 1, foreign_keys.size