Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix postgresql AR test failure | John Pignata | 2009-12-11 | 1 | -2/+2 |
| | | | | | | | | Due to the ordering of the returning result set, the test fails under the postgresql adapter. Order results by id prior to checking the first item [#3542 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Replace reset_counter_cache with reset_counters that has API inline with ↵ | Gabe da Silveira | 2009-12-03 | 1 | -2/+2 |
| | | | | | | | | existing update_counters method [#1211 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Add support for Mysql column positioning via #add_column and #change_column | Ben Marini | 2009-12-03 | 1 | -0/+47 |
| | | | | | | | | | | | | | | add_column and change_column in the Mysql adapter now accept some additional options: :first => true # Put the column in front of all the columns :after => column_name # Put the colmn after 'column_name' add_column :new_col, :string, :first => true add_column :another_col, :integer, :default => 0, :after => :new_col [#3286 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix instance_eval calls to association proxies | Mat Brown | 2009-12-02 | 1 | -0/+8 |
| | | | | | | | | In the current stable, ActiveRecord::Associations::AssociationProxy#method_missing calls yield() if a block is given, causing the block to always be evaluated in its calling context. However, in the case of instance_eval, correct behavior requires that the block be passed directly to the @target, rather than being evaluated inside a different block. Incidentally, this also simplifies the code slightly. [#3412 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Implement ActiveRecord#reset_counter_cache | Mike Breen | 2009-12-02 | 1 | -0/+10 |
| | | | | | | [#1211 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Revert "Revert "Assert primary key does not exist in habtm when the ↵ | Jeremy Kemper | 2009-11-23 | 3 | -17/+4 |
| | | | | | | | | | | | | | association is defined, instead of doing that everytime a record is inserted."" This reverts commit 2b82708b0efb3a3458e8177beab58f0c585788ae. [#3128 state:resolved] Conflicts: activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | ||||
* | Insert generated association members in the same order they are specified ↵ | Gabe da Silveira | 2009-11-17 | 1 | -0/+22 |
| | | | | | | | | when assigning to a has_many :through using the generated *_ids method [#3491 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Revert "Ensure Model#destroy respects optimistic locking" | Jeremy Kemper | 2009-11-17 | 1 | -18/+0 |
| | | | | | | | | | | [#1966 state:open] This reverts commit 0d922885fb54c19f04680482f024452859218910. Conflicts: activerecord/lib/active_record/locking/optimistic.rb | ||||
* | Ruby 1.9: skip pg locking test for 1.9.1 also | Jeremy Kemper | 2009-11-15 | 1 | -1/+1 |
| | |||||
* | Skip pg locking test due to connection checkout deadlock detection | Jeremy Kemper | 2009-11-14 | 1 | -5/+8 |
| | |||||
* | Missing customers fixture | Jeremy Kemper | 2009-11-13 | 1 | -2/+2 |
| | |||||
* | Resolve deadlock in pooled connections test | Jeremy Kemper | 2009-11-10 | 1 | -1/+1 |
| | |||||
* | delete correct records for a has_many with :primary_key and :dependent => ↵ | Matt Jones | 2009-11-10 | 3 | -2/+16 |
| | | | | | | :delete_all Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Avoid adding component lib/ to load path multiple times | Joshua Peek | 2009-11-09 | 1 | -1/+3 |
| | |||||
* | Clarify failed assertion | Jeremy Kemper | 2009-11-09 | 1 | -1/+1 |
| | |||||
* | Define autosave association callbacks when using accepts_nested_attributes_for. | Eloy Duran | 2009-11-07 | 2 | -2/+2 |
| | | | | | | | This way we don't define all the validation methods for all associations by default, but only when needed. [#3355 state:resolved] | ||||
* | Move validator, human_name and human_attribute_name to ActiveModel, remove ↵ | José Valim | 2009-10-20 | 5 | -888/+14 |
| | | | | | | deprecated error messages and add i18n_scope and lookup_ancestors. Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
* | Have all the tests running off a single Gemfile | Yehuda Katz + Carl Lerche | 2009-10-20 | 1 | -7/+6 |
| | |||||
* | Use bundled env for tests only | Jeremy Kemper | 2009-10-19 | 1 | -1/+7 |
| | |||||
* | Fixed: #without_typecast should only disable typecasting on the duplicated ↵ | Eric Chapweske | 2009-10-18 | 1 | -2/+4 |
| | | | | | | attributes [#3387 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Refactoring attributes/types [#3348 state:resolved] | Eric Chapweske | 2009-10-17 | 8 | -0/+315 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Modify connection pool callbacks to be compatible w/ new style | Nick Sieger | 2009-10-16 | 1 | -2/+19 |
| | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
* | Unify benchmark APIs. | José Valim | 2009-10-15 | 1 | -5/+5 |
| | |||||
* | Include bundled env in toplevel require, if present | Jeremy Kemper | 2009-10-14 | 1 | -3/+0 |
| | |||||
* | Move from git submodule to gem bundle | Jeremy Kemper | 2009-10-14 | 1 | -0/+3 |
| | |||||
* | Merge commit 'rails/master' | Emilio Tagua | 2009-10-13 | 1 | -4/+34 |
|\ | |||||
| * | Add a :limit option to specify the maximum number of records that can be ↵ | Pratik Naik | 2009-10-09 | 1 | -0/+30 |
| | | | | | | | | processed by accepts_nested_attributes_for | ||||
| * | Store entire options hash in the class var rather than just the reject_if ↵ | Pratik Naik | 2009-10-09 | 1 | -4/+4 |
| | | | | | | | | proc for the nested attributes | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-10-08 | 2 | -0/+32 |
|\| | |||||
| * | Use indifferent access attributes instead of stringifying them | Pratik Naik | 2009-10-08 | 1 | -0/+8 |
| | | |||||
| * | Allow accepts_nested_attributes_for :reject_if option accept symbols for ↵ | Pratik Naik | 2009-10-07 | 2 | -0/+24 |
| | | | | | | | | | | | | | | | | using a method Conflicts: activerecord/lib/active_record/nested_attributes.rb | ||||
* | | Relations: Added offset when finding with associations. Delegate array instance | Emilio Tagua | 2009-10-07 | 1 | -5/+4 |
| | | | | | | | | methods to to_a. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-10-07 | 1 | -1/+1 |
|\| | |||||
| * | Call initialize_copy when cloning [#3164 state:resolved] | Paul Gillard | 2009-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Cloned AR objects are now instantiated through initialize_copy rather than new/initialize. This allows AR classes to override initialize_copy in order to implement deep cloning. Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Allow preload and eager_load to work on relations at the same time. | Emilio Tagua | 2009-10-07 | 1 | -0/+22 |
| | | |||||
* | | Merge branch 'associations_2' | Emilio Tagua | 2009-10-05 | 3 | -4/+44 |
|\ \ | |||||
| * | | Added eager loading support to Relation and ActiveRecord#all. | Emilio Tagua | 2009-10-05 | 1 | -1/+1 |
| | | | |||||
| * | | Moved relation's test to relation_test. | Emilio Tagua | 2009-10-05 | 2 | -2/+13 |
| | | | |||||
| * | | Added association preload to relation. | Emilio Tagua | 2009-09-01 | 1 | -1/+30 |
| | | | |||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-10-02 | 3 | -2/+22 |
|\ \ \ | | |/ | |/| | |||||
| * | | Make has_one with :conditions hash scope build or creation of the associated ↵ | Luciano G Panaro | 2009-09-28 | 3 | -2/+22 |
| | | | | | | | | | | | | | | | | | | | | | object with those conditions Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3088 state:committed] | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-21 | 2 | -0/+20 |
|\| | | |||||
| * | | Enable use of MySQL stored procedures by default. | Justin Bailey | 2009-09-17 | 2 | -0/+20 |
| | | | | | | | | | | | | | | | | | | [#3204 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-14 | 11 | -44/+302 |
|\| | | |||||
| * | | Removed the version of ActiveRecord::Base#destroyed? that was added in ↵ | Eloy Duran | 2009-09-12 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | a44a1257d879311d88c2d10c366ab0d6561f903a. Because José Valim was cheeky enough to already add it to the master branch. | ||||
| * | | Define autosave association validation methods only when needed. [#3161 ↵ | Alexey Kovyrin | 2009-09-12 | 3 | -4/+122 |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | | During autosave, ignore records that already have been destroyed. [#2537 ↵ | Eloy Duran | 2009-09-12 | 1 | -0/+24 |
| | | | | | | | | | | | | state:resolved] | ||||
| * | | Fix has_one with foreign_key and primary_key association bug which caused ↵ | Graeme Porteous | 2009-09-12 | 5 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | the associated object being lost when saving the owner. [#1756 state:resolved] Mixed in a bit from patch by ransom-briggs. [#2813 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | | Rename nested attributes _delete to _destroy to reflect its actual behavior ↵ | José Valim | 2009-09-12 | 1 | -33/+39 |
| | | | | | | | | | | | | | | | | | | and DSL (:allow_destroy). Deprecation warning added. [#2889 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | | Fix autosave association to skip validation if it is marked for destruction. ↵ | Dmitry Polushkin | 2009-09-12 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | [#2064 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> |