Skip to content

Commit

Permalink
Remove depreacted finders
Browse files Browse the repository at this point in the history
They were deprecated in 4.0, planned to remove in 4.1
  • Loading branch information
lukaszx0 committed Jun 27, 2013
1 parent 90f0014 commit 3cc7223
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 637 deletions.
4 changes: 4 additions & 0 deletions activerecord/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* Remove `activerecord-deprecated_finders` as a dependency

*Łukasz Strzałkowski*

* Remove Oracle / Sqlserver / Firebird database tasks that were deprecated in 4.0.

*kennyj*
Expand Down
1 change: 0 additions & 1 deletion activerecord/activerecord.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ Gem::Specification.new do |s|
s.add_dependency 'activemodel', version

s.add_dependency 'arel', '~> 4.0.0'
s.add_dependency 'activerecord-deprecated_finders', '~> 1.0.2'
end
1 change: 0 additions & 1 deletion activerecord/lib/active_record.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
require 'active_support/rails'
require 'active_model'
require 'arel'
require 'active_record/deprecated_finders'

require 'active_record/version'

Expand Down
4 changes: 2 additions & 2 deletions activerecord/test/cases/associations/eager_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -554,9 +554,9 @@ def test_eager_with_has_many_and_limit_and_conditions_array_on_the_eagers
assert_equal 2, posts.size

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

def test_eager_with_has_many_and_limit_and_high_offset
Expand Down
Loading

0 comments on commit 3cc7223

Please sign in to comment.