aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Fix env pathJeremy Kemper2009-10-141-1/+1
|
* Include bundled env in toplevel require, if presentJeremy Kemper2009-10-142-11/+10
|
* No more toplevel arel siblingJeremy Kemper2009-10-141-4/+2
|
* Move from git submodule to gem bundleJeremy Kemper2009-10-143-0/+14
|
* Use ActiveSupport::Callbacks instead ofEmilio Tagua2009-10-131-1/+1
| | | | ActiveSupport::DeprecatedCallbacks.
* Merge commit 'rails/master'Emilio Tagua2009-10-136-29/+75
|\
| * Callbacks, DeprecatedCallbacks = NewCallbacks, CallbacksJoshua Peek2009-10-124-12/+12
| |
| * Add a :limit option to specify the maximum number of records that can be ↵Pratik Naik2009-10-092-1/+44
| | | | | | | | processed by accepts_nested_attributes_for
| * Store entire options hash in the class var rather than just the reject_if ↵Pratik Naik2009-10-092-16/+19
| | | | | | | | proc for the nested attributes
* | Merge commit 'rails/master'Emilio Tagua2009-10-083-8/+67
|\|
| * Use indifferent access attributes instead of stringifying themPratik Naik2009-10-082-2/+10
| |
| * Allow accepts_nested_attributes_for :reject_if option accept symbols for ↵Pratik Naik2009-10-073-6/+57
| | | | | | | | | | | | | | | | using a method Conflicts: activerecord/lib/active_record/nested_attributes.rb
* | Relations: Added offset when finding with associations. Delegate array instanceEmilio Tagua2009-10-072-10/+7
| | | | | | | | methods to to_a.
* | Merge commit 'rails/master'Emilio Tagua2009-10-072-28/+39
|\|
| * Call initialize_copy when cloning [#3164 state:resolved]Paul Gillard2009-10-062-28/+39
| | | | | | | | | | | | | | | | 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 Tagua2009-10-071-1/+1
| |
* | Don't send table_name when there's no need to.Emilio Tagua2009-10-071-1/+1
| |
* | Allow preload and eager_load to work on relations at the same time.Emilio Tagua2009-10-072-6/+30
| |
* | Initial documentation to Base#all.Emilio Tagua2009-10-051-2/+2
| |
* | Merge branch 'associations_2'Emilio Tagua2009-10-056-13/+90
|\ \
| * | Added eager loading support to Relation and ActiveRecord#all.Emilio Tagua2009-10-054-21/+34
| | |
| * | Moved relation's test to relation_test.Emilio Tagua2009-10-053-4/+14
| | |
| * | Added association preload to relation.Emilio Tagua2009-09-013-4/+58
| | |
* | | Merge commit 'rails/master'Emilio Tagua2009-10-027-76/+54
|\ \ \ | | |/ | |/|
| * | Make has_one with :conditions hash scope build or creation of the associated ↵Luciano G Panaro2009-09-285-3/+34
| | | | | | | | | | | | | | | | | | | | | object with those conditions Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3088 state:committed]
| * | Make gemspecs the authoritative source instead of generating them from the ↵Joshua Peek2009-09-252-73/+20
| | | | | | | | | | | | Rakefile
* | | Merge commit 'rails/master'Emilio Tagua2009-09-221-13/+9
|\| |
| * | Instrument process_action, render and sql.José Valim2009-09-201-13/+9
| | |
* | | Merge commit 'rails/master'Emilio Tagua2009-09-214-30/+43
|\| |
| * | Extract class-finder method from instantiateJeremy Kemper2009-09-171-27/+19
| | |
| * | Collapse nested conditionalJeremy Kemper2009-09-171-15/+13
| | |
| * | Enable use of MySQL stored procedures by default.Justin Bailey2009-09-173-1/+24
| | | | | | | | | | | | | | | | | | [#3204 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | | Merge commit 'rails/master'Emilio Tagua2009-09-1418-116/+379
|\| |
| * | Ruby 1.9 compat: corrected instance_methods checksdsykes2009-09-131-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 Duran2009-09-122-7/+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 Duran2009-09-121-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 Kovyrin2009-09-124-7/+132
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
| * | Added some documentation about setting :autosave => false on an association.Eloy Duran2009-09-121-3/+4
| | |
| * | During autosave, ignore records that already have been destroyed. [#2537 ↵Eloy Duran2009-09-122-2/+28
| | | | | | | | | | | | state:resolved]
| * | Fix has_one with foreign_key and primary_key association bug which caused ↵Graeme Porteous2009-09-126-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | 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é Valim2009-09-122-54/+71
| | | | | | | | | | | | | | | | | | 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 Polushkin2009-09-122-8/+11
| | | | | | | | | | | | | | | | | | [#2064 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
| * | Explicitely setting `autosave => false' should override new_record ↵Eloy Duran2009-09-124-6/+75
| | | | | | | | | | | | | | | | | | autosaving. [#2214 state:resolved] Original author is Jacob.
| * | Don't cascade autosave validation to destroyed children. [#2761 state:resolved]Lance Ivy2009-09-124-0/+20
| | | | | | | | | | | | Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
| * | Raise an exception with friendlier error message when attempting to build a ↵Mike Breen2009-09-123-1/+16
| | | | | | | | | | | | | | | | | | 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 databasessdsykes2009-09-121-2/+2
| | | | | | | | | | | | | | | | | | [#3128] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Revert "Allow frameworks to be required by their gem name"Jeremy Kemper2009-09-121-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]
| * | Fix default_error_messages back to the original messageAkira Matsuda2009-09-111-3/+6
| | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Removed the copyright notice not to show it in the result of 'ri ActiveRecord'.Shugo Maeda2009-09-111-22/+0
| | |
* | | Merge commit 'rails/master'Emilio Tagua2009-09-0820-383/+257
|\| |