Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 2 | -2/+14 |
| | | | | | | :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 |
| | |||||
* | 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 | 1 | -0/+28 |
|\| | |||||
| * | 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 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | 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 | 2 | -2/+20 |
|\ \ \ | | |/ | |/| | |||||
| * | | Make has_one with :conditions hash scope build or creation of the associated ↵ | Luciano G Panaro | 2009-09-28 | 2 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | object with those conditions Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3088 state:committed] | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-21 | 1 | -0/+8 |
|\| | | |||||
| * | | Enable use of MySQL stored procedures by default. | Justin Bailey | 2009-09-17 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | [#3204 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-14 | 5 | -40/+285 |
|\| | | |||||
| * | | 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 | 1 | -0/+115 |
| | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | Explicitely setting `autosave => false' should override new_record ↵ | Eloy Duran | 2009-09-12 | 2 | -3/+67 |
| | | | | | | | | | | | | | | | | | | autosaving. [#2214 state:resolved] Original author is Jacob. | ||||
| * | | Don't cascade autosave validation to destroyed children. [#2761 state:resolved] | Lance Ivy | 2009-09-12 | 2 | -0/+13 |
| | | | | | | | | | | | | Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | | Raise an exception with friendlier error message when attempting to build a ↵ | Mike Breen | 2009-09-12 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | polymorphic belongs_to with accepts_nested_attributes_for. [#2318 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | | Fix default_error_messages back to the original message | Akira Matsuda | 2009-09-11 | 1 | -3/+6 |
| | | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 10 | -183/+78 |
|\| | | |||||
| * | | Refactor new callbacks and AR implementation. | José Valim | 2009-09-08 | 4 | -29/+10 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | | Changed ActiveRecord to use new callbacks and speed up observers by only ↵ | José Valim | 2009-09-08 | 9 | -164/+78 |
| | | | | | | | | | | | | | | | | | | notifying events that are actually being consumed. Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 2 | -34/+14 |
|\| | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | ||||
| * | | Revert "Assert primary key does not exist in habtm when the association is ↵ | Jeremy Kemper | 2009-09-02 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defined, instead of doing that everytime a record is inserted." Test failures on PostgreSQL. [#3128 state:open] This reverts commit da636809daca9c338200811d3590e446f57c8e81. |