@@ -15,13 +15,13 @@ module DataMapper options[:limit] = @query.limit if @query.limit options[:sort] = sort_statement(@query.order) unless @query.order.empty? - condition_statement(@query.conditions) + conditions_statement(@query.conditions) @collection.find(@statements, options).to_a end private - def condition_statement(conditions, affirmative = true) + def conditions_statement(conditions, affirmative = true) case conditions when AbstractOperation then operation_statement(conditions, affirmative) when AbstractComparison then comparison_statement(conditions, affirmative) @@ -30,8 +30,8 @@ module DataMapper def operation_statement(operation, affirmative = true) case operation - when NotOperation then condition_statement(operation.first, !affirmative) - when AndOperation then operation.each{|op| condition_statement(op, affirmative)} + when NotOperation then conditions_statement(operation.first, !affirmative) + when AndOperation then operation.each{|op| conditions_statement(op, affirmative)} when OrOperation then raise NotImplementedError end end @@ -39,6 +39,10 @@ module DataMapper #-- # TODO: Rather than raise an error do what we can in a $where operation or in memory. def comparison_statement(comparison, affirmative = true) + if comparison.relationship? + return conditions_statement(comparison.foreign_key_mapping, affirmative) + end + field = comparison.subject.field value = comparison.value @@ -62,7 +66,9 @@ module DataMapper end end - @statements.update(operator.is_a?(Hash) && operator.has_key?('$where') ? operator : {field.to_sym => operator}) + statement = operator.is_a?(Hash) && operator.has_key?('$where') ? operator : {field.to_sym => operator} + + @statements.update(statement) end def sort_statement(conditions) lib/dm-mongo-adapter/query.rb @@ -22,4 +22,83 @@ describe DataMapper::Adapters::MongoAdapter do end it_should_behave_like 'An Adapter' + + describe "associations" do + before :all do + class User + include DataMapper::Resource + + property :id, DataMapper::Mongo::Types::ObjectID + property :group_id, DataMapper::Mongo::Types::ObjectID, :field => 'group_id' + property :name, String + property :age, Integer + end + + class Group + include DataMapper::Resource + + property :id, DataMapper::Mongo::Types::ObjectID + property :name, String + end + + User.belongs_to :group + Group.has Group.n, :users + end + + before :each do + @db.drop_collection('users') + @db.drop_collection('groups') + + @john = User.create(:name => 'john', :age => 101) + @jane = User.create(:name => 'jane', :age => 102) + + @group = Group.create(:name => 'dm hackers') + end + + describe "belongs_to" do + it "should set parent object _id" do + lambda { + @john.group = @group + @john.save + }.should_not raise_error + + @john.group_id.should eql(@group.id) + end + + it "should fetch parent object" do + user = User.create(:name => 'jane') + user.group_id = @group.id + user.group.should eql(@group) + end + end + + describe "has many" do + before :each do + [@john, @jane].each { |user| user.update(:group_id => @group.id) } + end + + it "should get children" do + @group.users.size.should eql(2) + end + + it "should add new children with <<" do + user = User.new(:name => 'kyle') + @group.users << user + user.group_id.should eql(@group.id) + @group.users.size.should eql(3) + end + + it "should replace children" do + user = User.create(:name => 'stan') + @group.users = [user] + @group.users.size.should eql(1) + @group.users.first.should eql(user) + end + + it "should fetch children matching conditions" do + users = @group.users.all(:name => 'john') + users.size.should eql(1) + end + end + end end spec/adapter_spec.rb 2bf39dac7c39fa9d776670f0853bd98969cf22a5 Piotr Solnica piotr@zenbe.com http://github.com/solnic/dm-mongo-adapter/commit/98563bf27a25eb995c587d920726004f8d12c83a 98563bf27a25eb995c587d920726004f8d12c83a 2009-11-02T13:28:43-08:00 2009-11-02T13:28:43-08:00 added initial support for "belongs to" and "has many" associations c38a4403d985a7f4d5b51b7d6229c493a472092a Piotr Solnica piotr@zenbe.com