Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | TableAlias leg ordering has changed, so change accordingly | Aaron Patterson | 2011-03-30 | 1 | -1/+1 |
| | |||||
* | Make clearing of HABTM join table contents happen in an after_destory callback. | Murray Steele | 2011-03-23 | 1 | -12/+12 |
| | | | | The old method of redefining destroy meant that clearing the HABTM join table would happen as long as the call to destroy succeeded. Which meant if there was a before_destroy that stopped the instance being destroyed using normal means (returning false, raising ActiveRecord::Rollback) rather than exceptional means the join table would be cleared even though the instance wasn't destroyed. Doing it in an after_destroy hook avoids this and has the advantage of happening inside the DB transaction too. | ||||
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-16 | 1 | -1/+1 |
|\ | |||||
| * | Add additional text to NotImplementedErrors [#6328 state:resolved] | Mike Gehard | 2011-03-12 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | Fix tests under postgres - we should always put conditions in the WHERE part ↵ | Jon Leighton | 2011-03-12 | 3 | -18/+22 |
| | | | | | | | | not in ON constraints because postgres requires that the table has been joined before the condition references it. | ||||
* | | Resolve some TODO comments which I decided did not need anything done | Jon Leighton | 2011-03-12 | 2 | -8/+5 |
| | | |||||
* | | Abstract some common code from AssociationScope and ↵ | Jon Leighton | 2011-03-11 | 3 | -97/+82 |
| | | | | | | | | JoinDependency::JoinAssociation into a JoinHelper module | ||||
* | | Refactor JoinAssociation | Jon Leighton | 2011-03-10 | 1 | -100/+54 |
| | | |||||
* | | Rename Reflection#through_reflection_chain and #through_options to ↵ | Jon Leighton | 2011-03-10 | 3 | -18/+15 |
| | | | | | | | | Reflection#chain and Reflection#options as they now no longer relate solely to through associations. | ||||
* | | Move the code which builds a scope for through associations into a generic ↵ | Jon Leighton | 2011-03-10 | 7 | -209/+155 |
| | | | | | | | | AssociationScope class which is capable of building a scope for any association. | ||||
* | | Fix ↵ | Jon Leighton | 2011-03-07 | 1 | -1/+1 |
| | | | | | | | | test_has_many_association_through_a_has_many_association_with_nonstandard_primary_keys | ||||
* | | Refactor ThroughAssociation#join_to to be much smaller, and independent of ↵ | Jon Leighton | 2011-03-06 | 1 | -84/+28 |
| | | | | | | | | construct_owner_conditions. | ||||
* | | Refactor ThroughAssociation#tables to just be a flat array of tables in the ↵ | Jon Leighton | 2011-03-06 | 1 | -75/+70 |
| | | | | | | | | order that they should be joined together. | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-05 | 1 | -2/+2 |
|\| | | | | | | | | | Conflicts: activerecord/CHANGELOG | ||||
| * | Active Record typos. | R.T. Lechow | 2011-03-05 | 1 | -2/+2 |
| | | |||||
| * | When preloading has_and_belongs_to_many associations, we should only ↵ | Jon Leighton | 2011-03-04 | 1 | -2/+4 |
| | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.) | ||||
| * | Fix a couple of tests in join_model_test.rb which were failing when the ↵ | Jon Leighton | 2011-03-04 | 1 | -2/+2 |
| | | | | | | | | identity map is turned off | ||||
* | | Use Base#type_condition in JoinAssociation | Jon Leighton | 2011-03-05 | 1 | -15/+4 |
| | | |||||
* | | Push source_type and polymorphic conditions out of ThroughAssociation and ↵ | Jon Leighton | 2011-03-05 | 2 | -35/+0 |
| | | | | | | | | JoinDependency::JoinAssociation and into the reflection instead. | ||||
* | | Add a test for STI on the through where the through is nested, and change ↵ | Jon Leighton | 2011-03-05 | 1 | -13/+22 |
| | | | | | | | | the code which support this | ||||
* | | Stop identity-mapping the through records in the preloader since I fixed the ↵ | Jon Leighton | 2011-03-04 | 1 | -5/+0 |
| | | | | | | | | underlying problem in the habtm preloader. | ||||
* | | Fix a couple of tests in join_model_test.rb which were failing when the ↵ | Jon Leighton | 2011-03-04 | 1 | -2/+2 |
| | | | | | | | | identity map is turned off | ||||
* | | When preloading has_and_belongs_to_many associations, we should only ↵ | Jon Leighton | 2011-03-04 | 1 | -2/+4 |
| | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.) | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 1 | -0/+5 |
|\| | |||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 42 | -2259/+3173 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/associations/has_one_through_association.rb activerecord/lib/active_record/associations/through_association_scope.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/associations/has_many_through_associations_test.rb activerecord/test/cases/associations/has_one_through_associations_test.rb activerecord/test/cases/reflection_test.rb activerecord/test/cases/relations_test.rb activerecord/test/fixtures/memberships.yml activerecord/test/models/categorization.rb activerecord/test/models/category.rb activerecord/test/models/member.rb activerecord/test/models/reference.rb activerecord/test/models/tagging.rb | ||||
| * | Move JoinDependency and friends from ↵ | Jon Leighton | 2011-02-28 | 8 | -620/+612 |
| | | | | | | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations | ||||
| * | Rewrote AssociationPreload. | Jon Leighton | 2011-02-28 | 11 | -0/+553 |
| | | |||||
| * | Use proper objects to do the work to build the associations (adding methods, ↵ | Jon Leighton | 2011-02-21 | 11 | -4/+501 |
| | | | | | | | | callbacks etc) rather than calling a whole bunch of methods with rather long names. | ||||
| * | Rename target_klass to klass | Jon Leighton | 2011-02-21 | 3 | -10/+10 |
| | | |||||
| * | Delegate through_reflection and source_reflection to reflection | Jon Leighton | 2011-02-21 | 3 | -34/+34 |
| | | |||||
| * | Delegate Association#options to the reflection, and replace ↵ | Jon Leighton | 2011-02-21 | 7 | -47/+49 |
| | | | | | | | | 'reflection.options' with 'options'. Also add through_options and source_options methods for through associations. | ||||
| * | Singular associations no longer use a proxy, so no need to check for the ↵ | Jon Leighton | 2011-02-21 | 3 | -8/+2 |
| | | | | | | | | proxy type on assignment. | ||||
| * | Associations - where possible, call attributes methods rather than directly ↵ | Jon Leighton | 2011-02-21 | 11 | -179/+179 |
| | | | | | | | | accessing the instance variables | ||||
| * | Initialize @target instead asking if it is defined. | Emilio Tagua | 2011-02-18 | 1 | -1/+2 |
| | | |||||
| * | 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 |