2 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 1c792c76cd..0ded1a5318 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -915,11 +915,11 @@ module ActiveRecord
     # about the model. The model needs to pass a specification name to the handler,
     # in order to look up the correct connection pool.
     class ConnectionHandler
-      def self.create_owner_to_pool
+      def self.create_owner_to_pool # :nodoc:
         Concurrent::Map.new(initial_capacity: 2) do |h, k|
           # Discard the parent's connection pools immediately; we have no need
           # of them
-          ConnectionHandler.discard_unowned_pools(h)
+          discard_unowned_pools(h)
 
           h[k] = Concurrent::Map.new(initial_capacity: 2)
         end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/sqlite3/schema_statements.rb
index 0a637d81fa..bd649451d6 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3/schema_statements.rb
@@ -74,10 +74,8 @@ module ActiveRecord
             fk_to_table == table && options.all? { |k, v| fk.options[k].to_s == v.to_s }
           end || raise(ArgumentError, "Table '#{from_table}' has no foreign key for #{to_table}")
 
-          alter_table(from_table, foreign_keys) do |definition|
-            fk_to_table = strip_table_name_prefix_and_suffix(fkey.to_table)
-            definition.foreign_keys.delete([fk_to_table, fkey.options])
-          end
+          foreign_keys.delete(fkey)
+          alter_table(from_table, foreign_keys)
         end
 
         def create_schema_dumper(options)