diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-03 08:31:09 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-03 08:31:09 +0000 |
| commit | a250a98a52be27700cfcf2aef236ff9a3c7304f3 (patch) | |
| tree | 8ba8b27247cec22f7d2da5325c860025d7a45a70 /activerecord/lib/active_record/locking.rb | |
| parent | 9ebe33f14b10fc00b227a408b846b6d2329746b8 (diff) | |
| download | rails-a250a98a52be27700cfcf2aef236ff9a3c7304f3.tar.gz rails-a250a98a52be27700cfcf2aef236ff9a3c7304f3.tar.bz2 rails-a250a98a52be27700cfcf2aef236ff9a3c7304f3.zip | |
r1602@asus: jeremy | 2005-07-02 14:34:00 -0700
Don't pass connection to quoted_comma_pair_list
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1621 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/locking.rb')
| -rw-r--r-- | activerecord/lib/active_record/locking.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/locking.rb b/activerecord/lib/active_record/locking.rb index 635fae89d8..d0d6296ae7 100644 --- a/activerecord/lib/active_record/locking.rb +++ b/activerecord/lib/active_record/locking.rb @@ -34,7 +34,7 @@ module ActiveRecord affected_rows = connection.update( "UPDATE #{self.class.table_name} "+ - "SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))} " + + "SET #{quoted_comma_pair_list(attributes_with_quotes(false))} " + "WHERE #{self.class.primary_key} = #{quote(id)} AND lock_version = #{quote(previous_value)}", "#{self.class.name} Update with optimistic locking" ) @@ -54,4 +54,4 @@ module ActiveRecord lock_optimistically && respond_to?(:lock_version) end end -end
\ No newline at end of file +end |