aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-09-146-71/+77
|\
| * 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-121-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 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-121-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 Duran2009-09-121-3/+4
| |
| * During autosave, ignore records that already have been destroyed. [#2537 ↵Eloy Duran2009-09-121-2/+4
| | | | | | | | state:resolved]
| * Fix has_one with foreign_key and primary_key association bug which caused ↵Graeme Porteous2009-09-121-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é Valim2009-09-121-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 Polushkin2009-09-121-7/+5
| | | | | | | | | | | | [#2064 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
| * Explicitely setting `autosave => false' should override new_record ↵Eloy Duran2009-09-121-3/+3
| | | | | | | | | | | | autosaving. [#2214 state:resolved] Original author is Jacob.
| * Don't cascade autosave validation to destroyed children. [#2761 state:resolved]Lance Ivy2009-09-122-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 Breen2009-09-121-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 databasessdsykes2009-09-121-2/+2
| | | | | | | | | | | | [#3128] 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-085-192/+149
|\|
| * Refactor new callbacks and AR implementation.José Valim2009-09-081-59/+20
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Changed ActiveRecord to use new callbacks and speed up observers by only ↵José Valim2009-09-085-189/+185
| | | | | | | | | | | | notifying events that are actually being consumed. Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Merge commit 'rails/master'Emilio Tagua2009-09-084-13/+22
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * Fix warnings in AMoJoshua Peek2009-09-051-1/+1
| |
| * Revert "Assert primary key does not exist in habtm when the association is ↵Jeremy Kemper2009-09-022-11/+27
| | | | | | | | | | | | | | | | | | | | defined, instead of doing that everytime a record is inserted." Test failures on PostgreSQL. [#3128 state:open] This reverts commit da636809daca9c338200811d3590e446f57c8e81.
| * Don't try to log protected attribute removal if there's no logger defined ↵Jeffrey Hardy2009-09-021-1/+3
| | | | | | | | | | | | [#3135 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Merge commit 'rails/master'Emilio Tagua2009-09-013-20/+20
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * Assert primary key does not exist in habtm when the association is defined, ↵José Valim2009-09-012-28/+12
| | | | | | | | | | | | | | | | instead of doing that everytime a record is inserted. [#3128 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * I added this feature so that a Map of changed fields could be retrievedJosh Sharpe2009-08-311-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after a model had been saved. This is useful in the after_save callback when you need to know what fields changed. At present there is no way to do this other than have code in the before_save callback that takes a copy of the changes Map, which I thought was a bit messy. Example. person = Person.find_by_name('bob') person.name = 'robert' person.changes # => {'name' => ['bob, 'robert']} person.save person.changes # => {} person.previous_changes # => {'name' => ['bob, 'robert']} person.reload person.previous_changes # => {} Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Revert "Revert "Add readonly support for relations.""Emilio Tagua2009-08-272-2/+17
| | | | | | | | This reverts commit f2c0725d79e29b02e30e7a4827851acc4a766730.
* | Revert "Add readonly support for relations."Emilio Tagua2009-08-272-17/+2
| | | | | | | | This reverts commit 7cce95b25ace33e04526d4490e487a080c1f9b96.
* | Add readonly support for relations.Emilio Tagua2009-08-272-2/+17
| |
* | No need to reload the relation table with a method param, just nil it.Emilio Tagua2009-08-271-5/+3
| |
* | Performance: Don't reload ARel relation on update.Emilio Tagua2009-08-271-1/+1
| |
* | Performance: Don't reload the ARel relation on create, do it onEmilio Tagua2009-08-271-2/+2
| | | | | | | | reset_column_information.
* | Performance: Don't reload the arel_table when destroying.Emilio Tagua2009-08-271-1/+1
| |
* | Merge commit 'rails/master'Emilio Tagua2009-08-273-8/+12
|\|
| * Don't use AR::Base.connection for fixture column quoting. Use the connection ↵Jeffrey Hardy2009-08-261-7/+9
| | | | | | | | | | | | | | | | given to Fixtures.new [#3104 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * allow ActiveRecord#RecordInvalid exception message to be localizedSven Fuchs2009-08-262-1/+3
| | | | | | | | | | | | [#2754 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Remove useless var local definition.Emilio Tagua2009-08-261-1/+1
| |
* | No need to create a new relation if the argument is blank.Emilio Tagua2009-08-251-6/+6
| |
* | Remove useless conditionals/local var.Emilio Tagua2009-08-191-5/+1
| |
* | Make sure join association methods are called once.Emilio Tagua2009-08-192-13/+14
| |
* | Don't sanitize_sql where it doesn't make sense.Emilio Tagua2009-08-191-2/+2
| |
* | Remove old method and comment.Emilio Tagua2009-08-191-14/+0
| |
* | Remove useless InnerJoinDependency, inner joins are performed throughEmilio Tagua2009-08-192-22/+5
| | | | | | | | Arel::InnerJoin.
* | Remove whitespace.Emilio Tagua2009-08-192-2/+3
| |
* | Remove unused quoted_record_ids, now ARel does this using ARel::In.Emilio Tagua2009-08-181-9/+0
| |
* | has_many nullify associations keys using ARel.Emilio Tagua2009-08-181-9/+9
| |
* | Remove now unused quote_table_name, ARel does that quoting now.Emilio Tagua2009-08-181-7/+0
| |
* | habtm insertion with ARel integration.Emilio Tagua2009-08-181-8/+5
| |
* | habtm delete method integrated with ARel.Emilio Tagua2009-08-181-4/+5
| |
* | Call to_sql method on ActiveRecord::Relation instance not it's relationEmilio Tagua2009-08-181-1/+1
| | | | | | | | attribute.'
* | Override respond_to? in ActiveRecord::Relation to go withEmilio Tagua2009-08-181-0/+8
| | | | | | | | method_missing.