@@ -122,20 +122,24 @@ module DataMapper def update(repository, resource) properties = resource.dirty_attributes - - sql = update_statement(resource.class, properties) - values = properties.map { |property| resource.instance_variable_get(property.instance_variable_name) } - parameters = (values + resource.key) - DataMapper.logger.debug { "UPDATE: #{sql} PARAMETERS: #{parameters.inspect}" } - - connection = create_connection - command = connection.create_command(sql) - - affected_rows = command.execute_non_query(*parameters).to_i - - close_connection(connection) - - affected_rows == 1 + + if properties.empty? + return false + else + sql = update_statement(resource.class, properties) + values = properties.map { |property| resource.instance_variable_get(property.instance_variable_name) } + parameters = (values + resource.key) + DataMapper.logger.debug { "UPDATE: #{sql} PARAMETERS: #{parameters.inspect}" } + + connection = create_connection + command = connection.create_command(sql) + + affected_rows = command.execute_non_query(*parameters).to_i + + close_connection(connection) + + affected_rows == 1 + end end def delete(repository, resource) lib/data_mapper/adapters/data_objects_adapter.rb @@ -176,6 +176,15 @@ describe DataMapper::Adapters::DataObjectsAdapter::SQL, "creating, reading, upda end end + describe "#update" do + it 'should not try to update if there are no dirty attributes' do + repository = mock("repository") + resource = mock("resource") + resource.stub!(:dirty_attributes).and_return({}) + @adapter.update(repository, resource).should == false + end + end + describe "#create_statement_with_returning" do it 'should generate a SQL statement for all fields' do spec/unit/adapters/data_objects_adapter_spec.rb eeb17029c0020d323dc29aae437d5251f9cd7701 Martin Kihlgren zond@cthulhu.rlyeh http://github.com/wycats/dm-core/commit/e6e61fcc9021a63c638ef86d41fc13c3cd52fc6c e6e61fcc9021a63c638ef86d41fc13c3cd52fc6c 2008-04-17T09:48:52-07:00 2008-04-17T09:48:52-07:00 Resolved ticket #210. * Made DataObjectsAdapter#update do nothing when no properties are updated. b08331eb01a8beb5d26aa11632258024817fe3e6 Martin Kihlgren zond@cthulhu.rlyeh