Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Specified column type for quote_value | Alfred Wong | 2013-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | When calling quote_value the underlying connection sometimes requires more information about the column to properly return the correct quoted value. I ran into this issue when using optimistic locking in JRuby and the activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to insert a integer into a NVARCHAR column type so we need to format it as N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without the column type being passed the connection adapter cannot properly return the correct quote value because it doesn't know to return N'3' or '3'. This patch is fairly straight forward where it just passes in the column type into the quote_value, as it already has the ability to take in the column, so it can properly handle at the connection level. I've added the tests required to make sure that the quote_value method is being passed the column type so that the underlying connection can determine how to quote the value. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/locking/optimistic.rb | ||||
* | Fix deleting from a HABTM join table upon destroying an object of a model ↵ | Nick Rogers | 2012-11-13 | 1 | -0/+2 |
| | | | | with optimistic locking enabled. Fixes #5332. | ||||
* | Merge pull request #5810 from kennyj/fix_5797 | Aaron Patterson | 2012-05-30 | 1 | -1/+1 |
| | | | | | | Fix #5797. Error calling dup method on AR model with serialized field Conflicts: activerecord/lib/active_record/core.rb | ||||
* | Merge pull request #4531 from exviva/pessimistic_with_lock | Aaron Patterson | 2012-01-19 | 1 | -0/+22 |
| | | | | Add ActiveRecord::Base#with_lock | ||||
* | Make read_attribute code path accessible at the class level | Jon Leighton | 2011-12-22 | 1 | -15/+12 |
| | |||||
* | Avoid super; speeds up Model.new by about 12% | Jon Leighton | 2011-12-14 | 1 | -1/+1 |
| | |||||
* | Deprecate set_locking_column in favour of self.locking_column= | Jon Leighton | 2011-11-29 | 1 | -8/+13 |
| | |||||
* | Added a note that optimistic locking also needs a hidden field to function ↵ | Joost Baaij | 2011-10-25 | 1 | -0/+3 |
| | | | | across web workers. | ||||
* | Consider attempted action in exception message of ActiveRecord::StaleObjectError | Christian Bäuerlein | 2011-10-14 | 1 | -2/+2 |
| | |||||
* | Includes stale record in StaleObjectError | Christian Bäuerlein | 2011-10-14 | 1 | -2/+2 |
| | |||||
* | Make it the responsibility of the connection to hold onto an ARel visitor ↵ | Jon Leighton | 2011-08-08 | 1 | -2/+2 |
| | | | | for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now. | ||||
* | lock_optimistically is typically true, so evaluate the common failure case first | Aaron Patterson | 2011-06-28 | 1 | -1/+1 |
| | |||||
* | Closes GH #1032 | John Paul Ashenfelter | 2011-05-19 | 1 | -1/+1 |
| | | | | Fixed what looks like minor cut/paste error in documentation for ActiveRecord::Locking:Pessimistic | ||||
* | Better doc styling in ActiveRecord::Locking | Sebastian Martinez | 2011-05-17 | 2 | -17/+17 |
| | |||||
* | Don't quote ID's as Arel will quote them -- follow same conventions as the ↵ | Christopher Meiklejohn | 2011-05-08 | 1 | -1/+1 |
| | | | | delete method. | ||||
* | remove some blanks | Paco Guzman | 2011-03-11 | 2 | -4/+4 |
| | |||||
* | fixed broken link to postgresql docs | Sergii Boiko | 2011-02-15 | 1 | -1/+1 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | removed some duplication from LH issue 5505 regarding AR touch and ↵ | Josh Kalderimis | 2011-02-09 | 1 | -4/+10 |
| | | | | | | optimistic locking [#5505 state:resolved] Signed-off-by: Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com> | ||||
* | removing more calls to deprecated methods | Aaron Patterson | 2010-12-02 | 1 | -2/+4 |
| | |||||
* | Remove explicit return. | Emilio Tagua | 2010-11-25 | 1 | -1/+1 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Reuse lock_col variable instead calling locking_column class method. | Emilio Tagua | 2010-11-25 | 1 | -3/+4 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Don't create local vars. | Emilio Tagua | 2010-11-24 | 1 | -4/+1 |
| | |||||
* | use persisted? instead of new_record? wherever possible | David Chelimsky | 2010-11-09 | 2 | -2/+2 |
| | | | | | | | | | | | - persisted? is the API defined in ActiveModel - makes it easier for extension libraries to conform to ActiveModel APIs without concern for whether the extended object is specifically ActiveRecord [#5927 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Use new finders syntax in docs. | Emilio Tagua | 2010-09-01 | 1 | -3/+3 |
| | |||||
* | Set destroyed=true in opt locking's destroy [#5058 state:resolved] | Jacob Lewallen | 2010-07-14 | 1 | -0/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Use arel instead of sql strings | Pratik Naik | 2010-05-11 | 1 | -6/+5 |
| | |||||
* | eliminate alias_method_chain from ActiveRecord | wycats | 2010-05-09 | 1 | -19/+8 |
| | |||||
* | Destroy respects optimistic locking. | Curtis Hawthorne | 2010-04-27 | 1 | -1/+34 |
| | | | | | | | | | | Now works with :dependent => :destroy and includes unit tests for that case. Also includes better error messages when updating/deleting stale objects. [#1966 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Dont delegate Relation#update to arel | Pratik Naik | 2010-01-20 | 1 | -1/+1 |
| | |||||
* | Give preference to to_a over arel from Relation#method_missing | Pratik Naik | 2010-01-19 | 1 | -2/+2 |
| | |||||
* | Rename Model.active_relation to Model.unscoped | Pratik Naik | 2010-01-17 | 1 | -1/+1 |
| | |||||
* | Rename Model.arel_table to Model.active_relation | Pratik Naik | 2010-01-02 | 1 | -4/+4 |
| | |||||
* | Remove unncessary arguments passed to arel_table | Pratik Naik | 2010-01-01 | 1 | -1/+1 |
| | |||||
* | Revert "Ensure Model#destroy respects optimistic locking" | Jeremy Kemper | 2009-11-17 | 1 | -34/+0 |
| | | | | | | | | | | [#1966 state:open] This reverts commit 0d922885fb54c19f04680482f024452859218910. Conflicts: activerecord/lib/active_record/locking/optimistic.rb | ||||
* | Merge commit 'rails/master' | Emilio Tagua | 2009-09-14 | 1 | -22/+0 |
|\ | |||||
| * | Removed the copyright notice not to show it in the result of 'ri ActiveRecord'. | Shugo Maeda | 2009-09-11 | 1 | -22/+0 |
| | | |||||
* | | Cache arel_table when possible, use class method arel_table instead | Emilio Tagua | 2009-08-18 | 1 | -2/+6 |
| | | | | | | | | instance method. | ||||
* | | Performance: cache/reload arel relation when possible to speed up things. | Emilio Tagua | 2009-07-21 | 1 | -2/+2 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-02 | 1 | -1/+1 |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb | ||||
| * | Break up DependencyModule's dual function of providing a "depend_on" DSL and ↵ | Joshua Peek | 2009-05-28 | 1 | -1/+1 |
| | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-12 | 1 | -8/+8 |
|\| | |||||
| * | Use DependencyModule for included hooks in ActiveRecord | Bryan Helmkamp | 2009-05-11 | 1 | -8/+8 |
| | | |||||
* | | Refactor to use arel_table method, and also use the same method name for ↵ | Emilio Tagua | 2009-05-02 | 1 | -6/+6 |
| | | | | | | | | instance and class methods. | ||||
* | | Removed ARel table assignment | Emilio Tagua | 2009-05-02 | 1 | -1/+0 |
| | | |||||
* | | Added arel_attributes_values methods, refactored locking and AR#update to ↵ | Emilio Tagua | 2009-04-30 | 1 | -8/+1 |
| | | | | | | | | use this method | ||||
* | | Refactored locking update | Emilio Tagua | 2009-04-24 | 1 | -7/+9 |
| | | |||||
* | | Changed locking to use Arel. Arel updated | Emilio Tagua | 2009-04-24 | 1 | -14/+19 |
|/ | |||||
* | Ensure Model#destroy respects optimistic locking [#1966 state:resolved] | Curtis Hawthorne | 2009-03-09 | 1 | -0/+33 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Partial updates don't update lock_version if nothing changed. [#426 ↵ | Daniel Morrison | 2008-06-22 | 1 | -0/+1 |
| | | | | state:resolved] | ||||
* | Merge docrails. | Pratik Naik | 2008-05-25 | 1 | -7/+7 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> |