Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reindent and remove wrong line left in merge by mistake. | Emilio Tagua | 2011-02-18 | 1 | -4/+3 |
| | |||||
* | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 11 | -473/+527 |
|\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | ||||
| * | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 9 | -276/+287 |
| | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. | ||||
| * | Add :nodoc: to ThroughAssociation and HasOneAssociation | Jon Leighton | 2011-02-18 | 2 | -2/+2 |
| | | |||||
| * | Allow building and then later saving has_many :through records, such that ↵ | Jon Leighton | 2011-02-18 | 1 | -4/+46 |
| | | | | | | | | the join record is automatically saved too. This requires the :inverse_of option to be set on the source association in the join model. See the CHANGELOG for details. [#4329 state:resolved] | ||||
* | | Don't shadow outer local variable. | Emilio Tagua | 2011-02-15 | 1 | -2/+2 |
| | | |||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 14 | -1044/+873 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb | ||||
| * | Add a transaction wrapper in add_to_target. This means that #build will now ↵ | Jon Leighton | 2011-02-14 | 1 | -27/+27 |
| | | | | | | | | also use a transaction. IMO this is reasonable given that the before_add and after_add callbacks might do anything, and this great consistency allows us to abstract out the duplicate code from #build and #create. | ||||
| * | Inline ensure_owner_is_persisted! as it is only called from one place | Jon Leighton | 2011-02-14 | 1 | -8/+4 |
| | | |||||
| * | @target should always be an array | Jon Leighton | 2011-02-14 | 1 | -1/+2 |
| | | |||||
| * | Rename add_record_to_target_with_callbacks to add_to_target | Jon Leighton | 2011-02-14 | 1 | -4/+4 |
| | | |||||
| * | Don't pass the block through build_record | Jon Leighton | 2011-02-14 | 1 | -10/+8 |
| | | |||||
| * | Move create and create! next to build | Jon Leighton | 2011-02-14 | 1 | -21/+21 |
| | | |||||
| * | Get rid of create_record as it is not only used in one place | Jon Leighton | 2011-02-14 | 1 | -8/+7 |
| | | |||||
| * | Get rid of AssociationCollection#save_record | Jon Leighton | 2011-02-14 | 4 | -25/+25 |
| | | |||||
| * | Add interpolation of association conditions back in, in the form of proc { ↵ | Jon Leighton | 2011-02-14 | 5 | -12/+19 |
| | | | | | | | | ... } rather than instance_eval-ing strings | ||||
| * | Remove Relation#& alias for Relation#merge | Ernie Miller | 2011-02-12 | 2 | -2/+2 |
| | | |||||
| * | Fix table name collision due to incorrect alias count on certain joins. | Ernie Miller | 2011-02-12 | 1 | -4/+4 |
| | | | | | | | | | | | | [#6423 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | just return the record from insert_record, use truthiness for comparisons | Aaron Patterson | 2011-02-07 | 1 | -2/+2 |
| | | |||||
| * | Refactor the implementations of AssociatioCollection#delete and #destroy to ↵ | Jon Leighton | 2011-02-07 | 4 | -18/+14 |
| | | | | | | | | be more consistent with each other, and to stop passing blocks around, thus making the execution easier to follow. | ||||
| * | This string should continue | Jon Leighton | 2011-02-07 | 1 | -1/+1 |
| | | |||||
| * | Correctly update counter caches on deletion for has_many :through [#2824 ↵ | Jon Leighton | 2011-02-07 | 2 | -20/+63 |
| | | | | | | | | state:resolved]. Also fixed a bunch of other counter cache bugs in the process, as once I fixed this one others started appearing like nobody's business. | ||||
| * | Support the :dependent option on has_many :through associations. For ↵ | Jon Leighton | 2011-02-07 | 2 | -16/+34 |
| | | | | | | | | historical and practical reasons, :delete_all is the default deletion strategy employed by association.delete(*records), despite the fact that the default strategy is :nullify for regular has_many. Also, this only works at all if the source reflection is a belongs_to. For other situations, you should directly modify the through association. | ||||
| * | Make record.association.destroy(*records) on habtm and hm:t only delete ↵ | Jon Leighton | 2011-02-07 | 4 | -23/+30 |
| | | | | | | | | records in the join table. This is to make the destroy method more consistent across the different types of associations. For more details see the CHANGELOG entry. | ||||
| * | scope is always a Relation | Santiago Pastorino | 2011-02-01 | 1 | -3/+1 |
| | | |||||
| * | Propagate association extensions to scopes called on the association. | Glenn Vanderburg | 2011-02-01 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Make use of helpers in AssociationReflection | Jon Leighton | 2011-01-30 | 1 | -4/+4 |
| | | |||||
| * | Has many through - It is not necessary to manually merge in the conditions ↵ | Jon Leighton | 2011-01-30 | 1 | -4/+0 |
| | | | | | | | | hash for the through record, because the creation is done directly on the through association, which will already handle setting the conditions. | ||||
| * | @join_table_name is no longer used | Jon Leighton | 2011-01-30 | 1 | -2/+1 |
| | | |||||
| * | Make AssociationCollection#include? a bit more readable | Jon Leighton | 2011-01-30 | 1 | -4/+10 |
| | | |||||
| * | Don't use method_missing when we don't have to | Jon Leighton | 2011-01-30 | 1 | -2/+2 |
| | | |||||
| * | AssociationCollection#clear can basically just use #delete_all, except it ↵ | Jon Leighton | 2011-01-30 | 1 | -13/+7 |
| | | | | | | | | should return self. | ||||
| * | AssociationCollection#to_ary should definitely dup the target! Also changed ↵ | Jon Leighton | 2011-01-30 | 1 | -3/+3 |
| | | | | | | | | #replace which was previously incorrect, but the test passed due to the fact that to_a was not duping. | ||||
| * | Just use primary_key here, AR::Relation will resolve the ambiguity before it ↵ | Jon Leighton | 2011-01-30 | 1 | -1/+1 |
| | | | | | | | | is converted to SQL | ||||
| * | Call sum on the scope directly, rather than relying on method_missing and ↵ | Jon Leighton | 2011-01-30 | 1 | -2/+2 |
| | | | | | | | | calculate | ||||
| * | Condense first_or_last a bit more | Jon Leighton | 2011-01-30 | 1 | -7/+5 |
| | | |||||
| * | Get rid of separate reset_target! and reset_scopes_cache! methods | Jon Leighton | 2011-01-30 | 1 | -26/+17 |
| | | |||||
| * | target is always an array | Jon Leighton | 2011-01-30 | 1 | -5/+0 |
| | | |||||
| * | load_target will return the target. it also will not load if loaded? is true. | Jon Leighton | 2011-01-30 | 1 | -2/+1 |
| | | |||||
| * | DRY up first/last and hence make last benefit from the bugfix in first | Jon Leighton | 2011-01-30 | 1 | -15/+13 |
| | | |||||
| * | Use scoped.find directly rather than having a find_by_sql method | Jon Leighton | 2011-01-30 | 1 | -5/+1 |
| | | |||||
| * | Use scoped.first and scoped.last instead of find(:first, ...) and ↵ | Jon Leighton | 2011-01-30 | 1 | -2/+2 |
| | | | | | | | | find(:last, ...) | ||||
| * | Try to make fetch_first_or_last_using_find? more readable | Jon Leighton | 2011-01-30 | 1 | -2/+20 |
| | | |||||
| * | load_target returns the target | Jon Leighton | 2011-01-30 | 1 | -2/+1 |
| | | |||||
| * | Rename AssociationProxy#loaded to loaded! as it mutates the association | Jon Leighton | 2011-01-30 | 4 | -6/+6 |
| | | |||||
| * | Abstract load_target conditional logic | Jon Leighton | 2011-01-30 | 2 | -6/+7 |
| | | |||||
| * | Remove unused methods conditions, sql_conditions and sanitize_sql | Jon Leighton | 2011-01-30 | 1 | -12/+0 |
| | | |||||
| * | Don't pass around conditions as strings in ThroughAssociation | Jon Leighton | 2011-01-30 | 1 | -30/+25 |
| | | |||||
| * | Indent methods under private/protected sections | Jon Leighton | 2011-01-30 | 2 | -115/+115 |
| | | |||||
| * | Let's be less blasé about method visibility on association proxies | Jon Leighton | 2011-01-30 | 9 | -117/+135 |
| | |