Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't overwrite unsaved updates when loading an association but preserve the ↵ | James Le Cuirot | 2010-06-20 | 1 | -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> | ||||
* | Revert "Don't overwrite unsaved updates when loading an association but ↵ | José Valim | 2010-06-11 | 1 | -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 Cuirot | 2010-06-09 | 1 | -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 arguments | Pratik Naik | 2010-06-04 | 1 | -1/+2 |
| | |||||
* | Prevent calling regexp on symbol in Ruby 1.9 in association_proxy | Ernie Miller | 2010-05-05 | 1 | -1/+1 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure not to load the entire association when bulk updating existing ↵ | Pratik Naik | 2010-04-14 | 1 | -10/+10 |
| | | | | records using nested attributes | ||||
* | Avoid deprecated String#to_a by using Array.wrap(...) instead of Array(...) | Jeremy Kemper | 2010-04-10 | 2 | -2/+5 |
| | |||||
* | Some doc updates reflecting the new query API | Pratik Naik | 2010-04-08 | 1 | -1/+1 |
| | |||||
* | Reset named scope cache whenever the @target is reset | Pratik Naik | 2010-04-07 | 1 | -2/+9 |
| | |||||
* | Memoize association.named_scope calls | Pratik Naik | 2010-04-05 | 1 | -0/+3 |
| | |||||
* | Sanitize association conditions using the correct class | Carl Lerche | 2010-04-03 | 1 | -1/+1 |
| | |||||
* | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 1 | -0/+1 |
| | |||||
* | fisting uninitialized ivar warnings. [#4198 state:resolved] | Aaron Patterson | 2010-03-16 | 1 | -0/+1 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | clean up more warnings, remove unnecessary methods, fix eval line numbers. ↵ | Aaron Patterson | 2010-03-16 | 1 | -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 Noria | 2010-03-12 | 2 | -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_args | Pratik Naik | 2010-01-19 | 1 | -3/+4 |
| | |||||
* | Inherit named scope class Scope from Relation | Pratik Naik | 2010-01-18 | 1 | -2/+0 |
| | |||||
* | save(false) is gone, use save(:validate => false) instead. | José Valim | 2010-01-17 | 3 | -3/+3 |
| | |||||
* | Make type_condition return Arel predicate and not a string condition | Pratik Naik | 2010-01-16 | 1 | -1/+1 |
| | |||||
* | Make scopes use relations under the hood | Pratik Naik | 2010-01-16 | 3 | -7/+7 |
| | |||||
* | Add Relation#includes to be an equivalent of current finder option :include | Pratik Naik | 2010-01-03 | 1 | -1/+1 |
| | |||||
* | Get rid of Model.construct_finder_arel_with_includes. Use ↵ | Pratik Naik | 2010-01-03 | 1 | -1/+1 |
| | | | | construct_finder_arel instead | ||||
* | Use Arel::Table instead of ActiveRecord::Relation from HABTM and ↵ | Pratik Naik | 2010-01-01 | 2 | -4/+4 |
| | | | | has_many#delete_records | ||||
* | Make sure association proxy does not pass quoted table name to sanitize_sql | Pratik Naik | 2010-01-01 | 1 | -1/+1 |
| | |||||
* | Add Relation#delete [Pratik Naik, Emilio Tagua] | Pratik Naik | 2010-01-01 | 1 | -1/+1 |
| | |||||
* | Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally ↵ | José Valim | 2009-12-30 | 1 | -1/+8 |
| | | | | remove it. | ||||
* | Migrate all the calculation methods to Relation | Pratik Naik | 2009-12-29 | 1 | -1/+1 |
| | |||||
* | Merge commit 'Fingertips/master' | Jeremy Kemper | 2009-12-28 | 2 | -12/+36 |
|\ | |||||
| * | Provide a slightly more robust we_can_set_the_inverse_on_this? method for ↵ | Murray Steele | 2009-12-28 | 1 | -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 Ogata | 2009-12-28 | 1 | -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 Steele | 2009-12-28 | 1 | -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 Ogata | 2009-12-28 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
* | | Add Model.having and Relation#having | Pratik Naik | 2009-12-29 | 1 | -1/+1 |
|/ | |||||
* | Add Model.readonly and association_collection#readonly finder method | Pratik Naik | 2009-12-28 | 1 | -1/+1 |
| | |||||
* | Add Model.lock and relation#lock now that arel has locking | Pratik Naik | 2009-12-28 | 1 | -1/+1 |
| | |||||
* | Add Model.from and association_collection#from finder methods | Pratik Naik | 2009-12-28 | 1 | -1/+1 |
| | |||||
* | Rewrite AssociationCollection#find using relations | Pratik Naik | 2009-12-27 | 1 | -19/+13 |
| | |||||
* | Add new finder methods to association collection. | Pratik Naik | 2009-12-27 | 1 | -2/+17 |
| | |||||
* | Rename Model.conditions and relation.conditions to .where | Pratik Naik | 2009-12-26 | 2 | -2/+2 |
| | |||||
* | Revert "Fix instance_eval calls to association proxies" | Joshua Peek | 2009-12-12 | 1 | -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 proxies | Mat Brown | 2009-12-02 | 1 | -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 Kemper | 2009-11-23 | 1 | -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 flatten | Jeremy Kemper | 2009-11-14 | 1 | -7/+1 |
| | |||||
* | Ruby 1.9.2: fix flatten_deeper to preserve nils | Jeremy Kemper | 2009-11-14 | 1 | -1/+1 |
| | |||||
* | Revert "Split arel_table into method to get a relation and another to ↵ | Jeremy Kemper | 2009-11-13 | 2 | -3/+3 |
| | | | | | | memoize the default relation." This reverts commit bd51790895fc75a3b4e19e8dd7aa6dc389d77068. | ||||
* | Split arel_table into method to get a relation and another to memoize the ↵ | Jeremy Kemper | 2009-11-13 | 2 | -3/+3 |
| | | | | default relation. | ||||
* | Ruby 1.9.2: avoid #flatten | Jeremy Kemper | 2009-11-13 | 1 | -4/+16 |
| | |||||
* | Arel::In -> Arel::Predicates::In | Jeremy Kemper | 2009-11-02 | 2 | -2/+2 |
| | |||||
* | Merge commit 'rails/master' | Emilio Tagua | 2009-10-13 | 1 | -1/+1 |
|\ | |||||
| * | Callbacks, DeprecatedCallbacks = NewCallbacks, Callbacks | Joshua Peek | 2009-10-12 | 1 | -1/+1 |
| | |