Skip to content

Commit 3cc7223

Browse files
committed
Remove depreacted finders
They were deprecated in 4.0, planned to remove in 4.1
1 parent 90f0014 commit 3cc7223

7 files changed

Lines changed: 7 additions & 637 deletions

File tree

activerecord/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* Remove `activerecord-deprecated_finders` as a dependency
2+
3+
*Łukasz Strzałkowski*
4+
15
* Remove Oracle / Sqlserver / Firebird database tasks that were deprecated in 4.0.
26

37
*kennyj*

activerecord/activerecord.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,4 @@ Gem::Specification.new do |s|
2525
s.add_dependency 'activemodel', version
2626

2727
s.add_dependency 'arel', '~> 4.0.0'
28-
s.add_dependency 'activerecord-deprecated_finders', '~> 1.0.2'
2928
end

activerecord/lib/active_record.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
require 'active_support/rails'
2626
require 'active_model'
2727
require 'arel'
28-
require 'active_record/deprecated_finders'
2928

3029
require 'active_record/version'
3130

activerecord/test/cases/associations/eager_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,9 +554,9 @@ def test_eager_with_has_many_and_limit_and_conditions_array_on_the_eagers
554554
assert_equal 2, posts.size
555555

556556
count = ActiveSupport::Deprecation.silence do
557-
Post.count(:include => [ :author, :comments ], :limit => 2, :conditions => [ "authors.name = ?", 'David' ])
557+
Post.includes(:author, :comments).limit(2).references(:author).where("authors.name = ?", 'David').count
558558
end
559-
assert_equal count, posts.size
559+
assert_equal posts.size, count
560560
end
561561

562562
def test_eager_with_has_many_and_limit_and_high_offset

0 commit comments

Comments
 (0)