Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix env path | Jeremy Kemper | 2009-10-14 | 1 | -1/+1 |
| | |||||
* | Include bundled env in toplevel require, if present | Jeremy Kemper | 2009-10-14 | 1 | -8/+10 |
| | |||||
* | No more toplevel arel sibling | Jeremy Kemper | 2009-10-14 | 1 | -4/+2 |
| | |||||
* | Use ActiveSupport::Callbacks instead of | Emilio Tagua | 2009-10-13 | 1 | -1/+1 |
| | | | | ActiveSupport::DeprecatedCallbacks. | ||||
* | Merge commit 'rails/master' | Emilio Tagua | 2009-10-13 | 5 | -25/+41 |
|\ | |||||
| * | Callbacks, DeprecatedCallbacks = NewCallbacks, Callbacks | Joshua Peek | 2009-10-12 | 4 | -12/+12 |
| | | |||||
| * | Add a :limit option to specify the maximum number of records that can be ↵ | Pratik Naik | 2009-10-09 | 1 | -1/+14 |
| | | | | | | | | 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 | -12/+15 |
| | | | | | | | | proc for the nested attributes | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-10-08 | 1 | -8/+35 |
|\| | |||||
| * | Use indifferent access attributes instead of stringifying them | Pratik Naik | 2009-10-08 | 1 | -2/+2 |
| | | |||||
| * | Allow accepts_nested_attributes_for :reject_if option accept symbols for ↵ | Pratik Naik | 2009-10-07 | 1 | -6/+33 |
| | | | | | | | | | | | | | | | | 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/+3 |
| | | | | | | | | methods to to_a. | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-10-07 | 1 | -27/+38 |
|\| | |||||
| * | Call initialize_copy when cloning [#3164 state:resolved] | Paul Gillard | 2009-10-06 | 1 | -27/+38 |
| | | | | | | | | | | | | | | | | 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> | ||||
* | | Don't send table_name when updating attributes, use the class arel_table. | Emilio Tagua | 2009-10-07 | 1 | -1/+1 |
| | | |||||
* | | Don't send table_name when there's no need to. | Emilio Tagua | 2009-10-07 | 1 | -1/+1 |
| | | |||||
* | | Allow preload and eager_load to work on relations at the same time. | Emilio Tagua | 2009-10-07 | 1 | -6/+8 |
| | | |||||
* | | Initial documentation to Base#all. | Emilio Tagua | 2009-10-05 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'associations_2' | Emilio Tagua | 2009-10-05 | 3 | -9/+46 |
|\ \ | |||||
| * | | Added eager loading support to Relation and ActiveRecord#all. | Emilio Tagua | 2009-10-05 | 3 | -20/+33 |
| | | | |||||
| * | | Moved relation's test to relation_test. | Emilio Tagua | 2009-10-05 | 1 | -2/+1 |
| | | | |||||
| * | | Added association preload to relation. | Emilio Tagua | 2009-09-01 | 2 | -3/+28 |
| | | | |||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-10-02 | 2 | -1/+12 |
|\ \ \ | | |/ | |/| | |||||
| * | | Make has_one with :conditions hash scope build or creation of the associated ↵ | Luciano G Panaro | 2009-09-28 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | object with those conditions Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3088 state:committed] | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-22 | 1 | -13/+9 |
|\| | | |||||
| * | | Instrument process_action, render and sql. | José Valim | 2009-09-20 | 1 | -13/+9 |
| | | | |||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-21 | 2 | -30/+23 |
|\| | | |||||
| * | | Extract class-finder method from instantiate | Jeremy Kemper | 2009-09-17 | 1 | -27/+19 |
| | | | |||||
| * | | Collapse nested conditional | Jeremy Kemper | 2009-09-17 | 1 | -15/+13 |
| | | | |||||
| * | | Enable use of MySQL stored procedures by default. | Justin Bailey | 2009-09-17 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | [#3204 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-14 | 7 | -72/+77 |
|\| | | |||||
| * | | Ruby 1.9 compat: corrected instance_methods check | sdsykes | 2009-09-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | [#3156 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | Removed the version of ActiveRecord::Base#destroyed? that was added in ↵ | Eloy Duran | 2009-09-12 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | a44a1257d879311d88c2d10c366ab0d6561f903a. Because José Valim was cheeky enough to already add it to the master branch. | ||||
| * | | Removed some superfluous conditionals from the autosave association ↵ | Eloy Duran | 2009-09-12 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | validation methods. Which are unneeded now that we only define them when needed. | ||||
| * | | Define autosave association validation methods only when needed. [#3161 ↵ | Alexey Kovyrin | 2009-09-12 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | | Added some documentation about setting :autosave => false on an association. | Eloy Duran | 2009-09-12 | 1 | -3/+4 |
| | | | |||||
| * | | During autosave, ignore records that already have been destroyed. [#2537 ↵ | Eloy Duran | 2009-09-12 | 1 | -2/+4 |
| | | | | | | | | | | | | state:resolved] | ||||
| * | | Fix has_one with foreign_key and primary_key association bug which caused ↵ | Graeme Porteous | 2009-09-12 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | -21/+32 |
| | | | | | | | | | | | | | | | | | | 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 | -7/+5 |
| | | | | | | | | | | | | | | | | | | [#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 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | 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/+7 |
| | | | | | | | | | | | | 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 | -1/+6 |
| | | | | | | | | | | | | | | | | | | polymorphic belongs_to with accepts_nested_attributes_for. [#2318 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | | Fix habtm associations when using multiple databases | sdsykes | 2009-09-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | [#3128] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | Revert "Allow frameworks to be required by their gem name" | Jeremy Kemper | 2009-09-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | This has just been confusing. Better to educate than band-aid. This reverts commit 18a24274ec823ded4ffa29bf33fd3d76816aab7e. Originally from http://dev.rubyonrails.org/ticket/8845 [drnic] | ||||
| * | | Removed the copyright notice not to show it in the result of 'ri ActiveRecord'. | Shugo Maeda | 2009-09-11 | 1 | -22/+0 |
| | | | |||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 5 | -192/+149 |
|\| | | |||||
| * | | Refactor new callbacks and AR implementation. | José Valim | 2009-09-08 | 1 | -59/+20 |
| | | | | | | | | | | | | 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 | 5 | -189/+185 |
| | | | | | | | | | | | | | | | | | | notifying events that are actually being consumed. Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | | Merge commit 'rails/master' | Emilio Tagua | 2009-09-08 | 4 | -13/+22 |
|\| | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb |