diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-03 08:31:57 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-03 08:31:57 +0000 |
| commit | 121b15bfc957f7c7d6fe965c126936a72c80b1c9 (patch) | |
| tree | a2184b5cbf686de1ffa08895c6eab1e97c1a9c4e /activerecord/lib/active_record | |
| parent | 96c60b0ec6d59eec58f7919eaed9d1a878a57615 (diff) | |
| download | rails-121b15bfc957f7c7d6fe965c126936a72c80b1c9.tar.gz rails-121b15bfc957f7c7d6fe965c126936a72c80b1c9.tar.bz2 rails-121b15bfc957f7c7d6fe965c126936a72c80b1c9.zip | |
r1604@asus: jeremy | 2005-07-02 14:40:20 -0700
Bring the column_quoter arg back to locking.rb.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1623 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/locking.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/locking.rb b/activerecord/lib/active_record/locking.rb index d0d6296ae7..90aba3913c 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(attributes_with_quotes(false))} " + + "SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))} " + "WHERE #{self.class.primary_key} = #{quote(id)} AND lock_version = #{quote(previous_value)}", "#{self.class.name} Update with optimistic locking" ) |