From 43591b43a6c3a0ccbbfeefe496392526e72fb503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= <rafael@franca.dev>
Date: Thu, 7 May 2020 12:32:44 -0400
Subject: [PATCH] Remove deprecated `migrations_path` argument in
 `ActiveRecord::ConnectionAdapter::SchemaStatements#assume_migrated_upto_version`

---
 activerecord/CHANGELOG.md                                 | 4 ++++
 .../connection_adapters/abstract/schema_statements.rb     | 8 +-------
 activerecord/test/cases/migration_test.rb                 | 7 -------
 guides/source/6_1_release_notes.md                        | 3 +++
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 27d33933d1..8c5325386e 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecated `migrations_path` argument in `ActiveRecord::ConnectionAdapter::SchemaStatements#assume_migrated_upto_version`.
+
+    *Rafael Mendonça França*
+
 *   Remove deprecated `config.active_record.sqlite3.represent_boolean_as_integer`.
 
     *Rafael Mendonça França*
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 9c40a30e9d..4dd04e8d6d 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -1190,13 +1190,7 @@ module ActiveRecord
         { primary_key: true }
       end
 
-      def assume_migrated_upto_version(version, migrations_paths = nil)
-        unless migrations_paths.nil?
-          ActiveSupport::Deprecation.warn(<<~MSG.squish)
-            Passing migrations_paths to #assume_migrated_upto_version is deprecated and will be removed in Rails 6.1.
-          MSG
-        end
-
+      def assume_migrated_upto_version(version)
         version = version.to_i
         sm_table = quote_table_name(schema_migration.table_name)
 
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 2a5c03b95c..d6e34a1e9a 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -72,13 +72,6 @@ class MigrationTest < ActiveRecord::TestCase
     ActiveRecord::Migration.verbose = @verbose_was
   end
 
-  def test_passing_migrations_paths_to_assume_migrated_upto_version_is_deprecated
-    ActiveRecord::SchemaMigration.create_table
-    assert_deprecated do
-      ActiveRecord::Base.connection.assume_migrated_upto_version(0, [])
-    end
-  end
-
   def test_migration_version_matches_component_version
     assert_equal ActiveRecord::VERSION::STRING.to_f, ActiveRecord::Migration.current_version
   end
diff --git a/guides/source/6_1_release_notes.md b/guides/source/6_1_release_notes.md
index 1d2cc7572d..537e1dc033 100644
--- a/guides/source/6_1_release_notes.md
+++ b/guides/source/6_1_release_notes.md
@@ -149,6 +149,9 @@ Please refer to the [Changelog][active-record] for detailed changes.
 
 ### Removals
 
+*   Remove deprecated `migrations_path` argument in
+    `ActiveRecord::ConnectionAdapter::SchemaStatements#assume_migrated_upto_version`.
+
 *   Remove deprecated `config.active_record.sqlite3.represent_boolean_as_integer`.
 
 *   Remove deprecated methods from `ActiveRecord::DatabaseConfigurations`.