diff options
| author | Michael Koziarski <michael@koziarski.com> | 2006-09-04 23:41:13 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2006-09-04 23:41:13 +0000 |
| commit | b445ab986a2c177621a2154b0559be4c700abeeb (patch) | |
| tree | 3c5529b1f41099f8f1789604b163c904e1e34252 /activerecord/lib/active_record/locking | |
| parent | 97487c4e1154696fb0b30ea8727ba5459f575719 (diff) | |
| download | rails-b445ab986a2c177621a2154b0559be4c700abeeb.tar.gz rails-b445ab986a2c177621a2154b0559be4c700abeeb.tar.bz2 rails-b445ab986a2c177621a2154b0559be4c700abeeb.zip | |
Rename quote to quote_value so the name can be used in AR models. #3628 [Koz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5007 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/locking')
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index 823f4e19fc..e9e8a44273 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -66,8 +66,8 @@ module ActiveRecord affected_rows = connection.update(<<-end_sql, "#{self.class.name} Update with optimistic locking") UPDATE #{self.class.table_name} SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))} - WHERE #{self.class.primary_key} = #{quote(id)} - AND #{self.class.quoted_locking_column} = #{quote(previous_value)} + WHERE #{self.class.primary_key} = #{quote_value(id)} + AND #{self.class.quoted_locking_column} = #{quote_value(previous_value)} end_sql unless affected_rows == 1 |