diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 01:09:23 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 01:09:23 +0000 |
| commit | 80b5331c0f2eba19e53b5c9bc8e9b3e5faffc499 (patch) | |
| tree | 54ac0dabc902769fb1a27fa0602a0c012bf126ec /activerecord | |
| parent | 1060fe2d723cc2ce4b3bfff308eab5360090c595 (diff) | |
| download | rails-80b5331c0f2eba19e53b5c9bc8e9b3e5faffc499.tar.gz rails-80b5331c0f2eba19e53b5c9bc8e9b3e5faffc499.tar.bz2 rails-80b5331c0f2eba19e53b5c9bc8e9b3e5faffc499.zip | |
Rollback [4584], bad test. Reopens #3819.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4586 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/finder_test.rb | 15 |
3 files changed, 2 insertions, 17 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index fe56738ec8..c745eb4aea 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -2,8 +2,6 @@ * Update callbacks documentation. #3970 [Robby Russell <robby@planetargon.com>] -* Don't modify options parameters in-place. #3819 [mpalmer@hezmatt.org] - * PostgreSQL: correctly quote the ' in pk_and_sequence_for. #5462 [tietew@tietew.net] * PostgreSQL: correctly quote microseconds in timestamps. #5641 [rick@rickbradley.com] diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 94b6645a17..1c8c819efa 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1390,7 +1390,7 @@ module ActiveRecord #:nodoc: end def extract_options_from_args!(args) #:nodoc: - args.last.is_a?(Hash) ? args.pop.dup : {} + args.last.is_a?(Hash) ? args.pop : {} end VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset, diff --git a/activerecord/test/finder_test.rb b/activerecord/test/finder_test.rb index 229de2aa18..23b6508f99 100644 --- a/activerecord/test/finder_test.rb +++ b/activerecord/test/finder_test.rb @@ -5,10 +5,9 @@ require 'fixtures/reply' require 'fixtures/entrant' require 'fixtures/developer' require 'fixtures/post' -require 'fixtures/author' class FinderTest < Test::Unit::TestCase - fixtures :authors, :companies, :topics, :entrants, :developers, :developers_projects, :posts, :accounts + fixtures :companies, :topics, :entrants, :developers, :developers_projects, :posts, :accounts def test_find assert_equal(topics(:first).title, Topic.find(1).title) @@ -450,18 +449,6 @@ class FinderTest < Test::Unit::TestCase assert_equal ["37signals","Summit","Microsoft", "Flamboyant Software", "Ex Nihilo", "RailsCore", "Leetsoft", "Jadedpixel"], Company.connection.select_values("SELECT name FROM companies ORDER BY id") end - def test_find_doesnt_mangle_parameters - author = Author.find(1) - - args = [:all, {:conditions => "body like '%t%'"}] - - author.posts.each do |p| - assert_equal Post.find(p.id).comments.length, - p.comments.find(*args).length, - "Post ##{p.id} doesn't find correct number of comments" - end - end - protected def bind(statement, *vars) if vars.first.is_a?(Hash) |