aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'rails/master'Xavier Noria2010-06-201-1/+5
|\ | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb
| * Don't overwrite unsaved updates when loading an association but preserve the ↵James Le Cuirot2010-06-201-1/+5
| | | | | | | | | | | | | | | | order of the loaded records. Reapplied from before but now allows already-saved records to be refreshed. [#4830 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Adds title to activerecord/lib/active_record/associations/*Rizwan Reza2010-06-1610-0/+12
| |
* | Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-151-1/+1
|\ \
| * | Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-111-1/+1
| | |
* | | Revert "removing the extra \"Neeraj Singh2010-06-151-1/+1
| | | | | | | | | | | | This reverts commit 51a9703b1e80caa30d699f30615f023079874623.
* | | removing the extra \Neeraj Singh2010-06-151-1/+1
| |/ |/|
* | Revert "Don't overwrite unsaved updates when loading an association but ↵José Valim2010-06-111-1/+1
|/ | | | | | | | preserve the order of the loaded records. [#4642 state:open]" This commit introduced a regression described in ticket [#4830]. This reverts commit 0265c708b9696c3943518ad5f3dabdc22c5eba11.
* Don't overwrite unsaved updates when loading an association but preserve the ↵James Le Cuirot2010-06-091-1/+1
| | | | | | order of the loaded records. [#4642 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Properly cache association_collection#scopes calls having argumentsPratik Naik2010-06-041-1/+2
|
* Prevent calling regexp on symbol in Ruby 1.9 in association_proxyErnie Miller2010-05-051-1/+1
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Ensure not to load the entire association when bulk updating existing ↵Pratik Naik2010-04-141-10/+10
| | | | records using nested attributes
* Avoid deprecated String#to_a by using Array.wrap(...) instead of Array(...)Jeremy Kemper2010-04-102-2/+5
|
* Some doc updates reflecting the new query APIPratik Naik2010-04-081-1/+1
|
* Reset named scope cache whenever the @target is resetPratik Naik2010-04-071-2/+9
|
* Memoize association.named_scope callsPratik Naik2010-04-051-0/+3
|
* Sanitize association conditions using the correct classCarl Lerche2010-04-031-1/+1
|
* adds missing requires for Object#blank? and Object#present?Xavier Noria2010-03-281-0/+1
|
* fisting uninitialized ivar warnings. [#4198 state:resolved]Aaron Patterson2010-03-161-0/+1
| | | | Signed-off-by: wycats <wycats@gmail.com>
* clean up more warnings, remove unnecessary methods, fix eval line numbers. ↵Aaron Patterson2010-03-161-0/+4
| | | | | | [#4193 state:resolved] Signed-off-by: wycats <wycats@gmail.com>
* keep AssociationProxy#to_a to avoid warning in Array(post.author), and ↵Xavier Noria2010-03-122-1/+2
| | | | | | | | delegate it to @target in association collections [#4165 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Get rid of construct_count_options_from_argsPratik Naik2010-01-191-3/+4
|
* Inherit named scope class Scope from RelationPratik Naik2010-01-181-2/+0
|
* save(false) is gone, use save(:validate => false) instead.José Valim2010-01-173-3/+3
|
* Make type_condition return Arel predicate and not a string conditionPratik Naik2010-01-161-1/+1
|
* Make scopes use relations under the hoodPratik Naik2010-01-163-7/+7
|
* Add Relation#includes to be an equivalent of current finder option :includePratik Naik2010-01-031-1/+1
|
* Get rid of Model.construct_finder_arel_with_includes. Use ↵Pratik Naik2010-01-031-1/+1
| | | | construct_finder_arel instead
* Use Arel::Table instead of ActiveRecord::Relation from HABTM and ↵Pratik Naik2010-01-012-4/+4
| | | | has_many#delete_records
* Make sure association proxy does not pass quoted table name to sanitize_sqlPratik Naik2010-01-011-1/+1
|
* Add Relation#delete [Pratik Naik, Emilio Tagua]Pratik Naik2010-01-011-1/+1
|
* Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally ↵José Valim2009-12-301-1/+8
| | | | remove it.
* Migrate all the calculation methods to RelationPratik Naik2009-12-291-1/+1
|
* Merge commit 'Fingertips/master'Jeremy Kemper2009-12-282-12/+36
|\
| * Provide a slightly more robust we_can_set_the_inverse_on_this? method for ↵Murray Steele2009-12-281-2/+7
| | | | | | | | | | | | | | | | polymorphic belongs_to associations. [#3520 state:resolved] Also add a new test for polymorphic belongs_to that test direct accessor assignment, not just .replace assignment. Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
| * Add inverse polymorphic association support. [#3520 state:resolved]George Ogata2009-12-281-10/+29
| | | | | | | | Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
| * Add more tests for the various ways we can assign objects to associations. ↵Murray Steele2009-12-281-2/+1
| | | | | | | | | | | | | | | | [#3513 state:resolved] Get rid of a duplicate set_inverse_instance call if you use new_record(true) (e.g. you want to replace the existing instance). Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
| * Set inverse for #replace on a has_one association. [#3513 state:resolved]George Ogata2009-12-281-0/+1
| | | | | | | | Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
* | Add Model.having and Relation#havingPratik Naik2009-12-291-1/+1
|/
* Add Model.readonly and association_collection#readonly finder methodPratik Naik2009-12-281-1/+1
|
* Add Model.lock and relation#lock now that arel has lockingPratik Naik2009-12-281-1/+1
|
* Add Model.from and association_collection#from finder methodsPratik Naik2009-12-281-1/+1
|
* Rewrite AssociationCollection#find using relationsPratik Naik2009-12-271-19/+13
|
* Add new finder methods to association collection.Pratik Naik2009-12-271-2/+17
|
* Rename Model.conditions and relation.conditions to .wherePratik Naik2009-12-262-2/+2
|
* Revert "Fix instance_eval calls to association proxies"Joshua Peek2009-12-121-2/+6
| | | | | | | | | | I think it may of broke the build. Lets see. This reverts commit 49e943c4f0ac3459bd53023167aaa08fc8e46733. Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb
* Fix instance_eval calls to association proxiesMat Brown2009-12-021-6/+2
| | | | | | | | 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>
* Revert "Revert "Assert primary key does not exist in habtm when the ↵Jeremy Kemper2009-11-231-13/+1
| | | | | | | | | | | | | 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
* Ruby 1.9.2: use recursive flattenJeremy Kemper2009-11-141-7/+1
|
* Ruby 1.9.2: fix flatten_deeper to preserve nilsJeremy Kemper2009-11-141-1/+1
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 07:37:49 +0000