@@ -215,7 +215,7 @@ module ActiveRecord::Extensions def self.process_without_suffix( key, val, caller ) return nil unless caller.columns_hash.has_key?( key ) if val.nil? - str = "#{caller.quoted_table_name}.#{caller.connection.quote_column_name( key )} IS NULL" + str = "#{caller.quoted_table_name}.#{caller.connection.quote_column_name( key )} is ?" else str = "#{caller.quoted_table_name}.#{caller.connection.quote_column_name( key )}=?" end ar-extensions/lib/ar-extensions/extensions.rb @@ -49,6 +49,7 @@ class ActiveRecord::Base def sanitize_sql_from_hash( hsh ) #:nodoc: conditions, values = [], [] + hsh = expand_hash_conditions_for_aggregates(hsh) # introduced in Rails 2.0.2 hsh.each_pair do |key,val| if val.respond_to?( :to_sql ) ar-extensions/lib/ar-extensions/finders.rb @@ -1,4 +1,13 @@ class Topic < ActiveRecord::Base validates_presence_of :author_name has_many :books + + composed_of :description, :mapping => [ %w(title title), %w(author_name author_name)], :allow_nil => true, :class_name => "TopicDescription" end + +class TopicDescription + attr_reader :title, :author_name + def initialize(title, author_name) + @title, @author_name = title, author_name + end +end \ No newline at end of file ar-extensions/tests/models/topic.rb @@ -6,7 +6,7 @@ class FindersTest < Test::Unit::TestCase def setup @connection = ActiveRecord::Base.connection end - + def test_activerecord_model_can_be_used_with_reserved_words group1 = Group.create!(:order => "x") group2 = Group.create!(:order => "y") @@ -28,5 +28,21 @@ class FindersTest < Test::Unit::TestCase Group.find(group1.id, :conditions => { 'group.order' => "y" }) } end + + def test_exists_with_aggregate_having_three_mappings + topic = Topic.create! :title => "SomeBook", :author_name => "Joe Smith" + assert Topic.exists?(:description => topic.description) + + topic = Topic.new :title => "MayDay", :author_name => "Joe Smith the 2nd" + assert !Topic.exists?(:description => topic.description) + end + + def test_find_with_aggregate + topic = Topic.create! :title => "SomeBook", :author_name => "Joe Smith" + assert_equal topic, Topic.find(:first, :conditions => { :description => topic.description }) + + topic = Topic.new :title => "MayDay", :author_name => "Joe Smith the 2nd" + assert !Topic.find(:first, :conditions => { :description => topic.description }) + end end ar-extensions/tests/test_activerecord_compatability.rb 480ec74067716f4a660f02bd95532355ac6a1152 Zach Dennis zach.dennis@gmail.com http://github.com/zdennis/ar-extensions/commit/75b88587a8e44055f020e1cdc0ee8491a6c5d46e 75b88587a8e44055f020e1cdc0ee8491a6c5d46e 2008-07-18T07:27:53-07:00 2008-07-18T07:27:53-07:00 * Fixed bug where passing in nil values to a conditions hash was producing the wrong number of bind variables * Fixed bug where aggregate attributes of a AR model weren't being processed correctly for Rails 2.0.2 ef58b0cb03a87af54fc4dd06f852b849225a2408 Zach Dennis zach.dennis@gmail.com