aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-07-04 09:49:03 +0200
committerYves Senn <yves.senn@gmail.com>2013-07-04 09:49:03 +0200
commit685631285f21e2f63b1ecbdb1495f25c97b6bf41 (patch)
treee2edf72e84098217a42be4f8dab115d038292b5a /activerecord
parentc95911023c4e388faf1065ac46cae0e2bb1914eb (diff)
downloadrails-685631285f21e2f63b1ecbdb1495f25c97b6bf41.tar.gz
rails-685631285f21e2f63b1ecbdb1495f25c97b6bf41.tar.bz2
rails-685631285f21e2f63b1ecbdb1495f25c97b6bf41.zip
Remove deprecated String constructor from `ActiveRecord::Migrator`.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/lib/active_record/migration.rb3
-rw-r--r--activerecord/test/cases/migrator_test.rb6
3 files changed, 4 insertions, 9 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 5a8876c282..a471b93f3c 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove deprecated String constructor from `ActiveRecord::Migrator`.
+
+ *Yves Senn*
+
* Remove deprecated `scope` use without passing a callable object.
*Arun Agrawal*
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index e96c347f6f..d3f33b907a 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -869,9 +869,6 @@ module ActiveRecord
if Array(migrations).grep(String).empty?
@migrations = migrations
- else
- ActiveSupport::Deprecation.warn "instantiate this class with a list of migrations"
- @migrations = self.class.migrations(migrations)
end
validate(@migrations)
diff --git a/activerecord/test/cases/migrator_test.rb b/activerecord/test/cases/migrator_test.rb
index b5a69c4a92..3f9854200d 100644
--- a/activerecord/test/cases/migrator_test.rb
+++ b/activerecord/test/cases/migrator_test.rb
@@ -91,12 +91,6 @@ module ActiveRecord
assert_equal 'AddExpressions', migrations[0].name
end
- def test_deprecated_constructor
- assert_deprecated do
- ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/valid")
- end
- end
-
def test_relative_migrations
list = Dir.chdir(MIGRATIONS_ROOT) do
ActiveRecord::Migrator.migrations("valid/")