Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Abstract some common code from AssociationScope and ↵ | Jon Leighton | 2011-03-11 | 4 | -97/+83 |
| | | | | JoinDependency::JoinAssociation into a JoinHelper module | ||||
* | Refactor JoinAssociation | Jon Leighton | 2011-03-10 | 1 | -100/+54 |
| | |||||
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-10 | 2 | -2/+2 |
|\ | |||||
| * | revises links to the API websites of individual components (no longer ↵ | Xavier Noria | 2011-03-09 | 1 | -1/+1 |
| | | | | | | | | maintained), and rewrites the section about after and around filters in the controller guide | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-07 | 1 | -1/+1 |
| |\ | |||||
| | * | "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 1 | -1/+1 |
| | | | | | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere | ||||
| * | | Referencing a table via the ON condition in a join should force that table ↵ | Jon Leighton | 2011-03-07 | 2 | -1/+27 |
| |/ | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | ||||
* | | Rename Reflection#through_reflection_chain and #through_options to ↵ | Jon Leighton | 2011-03-10 | 5 | -50/+53 |
| | | | | | | | | 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 | 9 | -215/+162 |
| | | | | | | | | AssociationScope class which is capable of building a scope for any association. | ||||
* | | Fix ↵ | Jon Leighton | 2011-03-07 | 2 | -2/+2 |
| | | | | | | | | test_has_many_association_through_a_has_many_association_with_nonstandard_primary_keys | ||||
* | | Referencing a table via the ON condition in a join should force that table ↵ | Jon Leighton | 2011-03-07 | 2 | -1/+27 |
| | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | ||||
* | | Refactor ThroughAssociation#join_to to be much smaller, and independent of ↵ | Jon Leighton | 2011-03-06 | 2 | -84/+34 |
| | | | | | | | | 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 | 11 | -15/+33 |
|\| | | | | | | | | | Conflicts: activerecord/CHANGELOG | ||||
| * | use Arel::Table#alias rather than passing the :as parameter | Aaron Patterson | 2011-03-05 | 2 | -4/+4 |
| | | |||||
| * | Active Record typos. | R.T. Lechow | 2011-03-05 | 6 | -10/+10 |
| | | |||||
| * | fixes a missmatched column in example | mjy | 2011-03-05 | 1 | -1/+1 |
| | | |||||
| * | implements ActiveRecord::Base.connection_config to be able to check the ↵ | Xavier Noria | 2011-03-05 | 3 | -0/+18 |
| | | | | | | | | configuration of the current connection at runtime | ||||
| * | When preloading has_and_belongs_to_many associations, we should only ↵ | Jon Leighton | 2011-03-04 | 2 | -2/+20 |
| | | | | | | | | 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 | 2 | -17/+6 |
| | | |||||
* | | Push source_type and polymorphic conditions out of ThroughAssociation and ↵ | Jon Leighton | 2011-03-05 | 4 | -47/+13 |
| | | | | | | | | 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 | 6 | -13/+46 |
| | | | | | | | | 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 | 2 | -2/+20 |
| | | | | | | | | 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 | 2 | -4/+5 |
|\| | |||||
| * | Move ActiveModel::AttributeMethods#attribute_methods_generated? to ↵ | Alexander Uvarov | 2011-03-01 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | ActiveRecord, so it's flexible now [#6428 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 207 | -5362/+9286 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -626/+618 |
| | | | | | | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations | ||||
| * | Rewrote AssociationPreload. | Jon Leighton | 2011-02-28 | 21 | -458/+583 |
| | | |||||
| * | skip this on oracle | Aaron Patterson | 2011-02-28 | 1 | -0/+2 |
| | | |||||
| * | use an attribute rather than a SQL literal | Aaron Patterson | 2011-02-26 | 2 | -1/+2 |
| | | |||||
| * | removing limits and offsets from COUNT queries unless both are specified. ↵ | Aaron Patterson | 2011-02-25 | 4 | -1/+51 |
| | | | | | | | | [#6268 state:resolved] | ||||
| * | only take the limit if there is a limit to take | Aaron Patterson | 2011-02-25 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-25 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix missing inheritance from AR::Base in docs | Josep M. Bach | 2011-02-24 | 1 | -1/+1 |
| | | | |||||
| * | | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses | Eric Allam | 2011-02-24 | 2 | -2/+7 |
| | | | |||||
| * | | observers leak across tests, so rather than modify the object, we should ↵ | Aaron Patterson | 2011-02-23 | 1 | -6/+12 |
| | | | | | | | | | | | | just count the number of times the observer was called | ||||
| * | | Fix observer callbacks firing multiple times on descendant instances | Kamal Fariz Mahyuddin | 2011-02-22 | 2 | -1/+22 |
| | | | |||||
| * | | We're in 2011, let's update our license | Prem Sichanugrist | 2011-02-22 | 2 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | expectations change when using IM. Change oracle tests to reflect that | Aaron Patterson | 2011-02-22 | 1 | -2/+6 |
| | | | |||||
| * | | Relation will delegate to AR::Base which already uses the Dynamic finders, ↵ | Aaron Patterson | 2011-02-22 | 1 | -8/+3 |
| |/ | | | | | | | so eliminate duplicate calls | ||||
| * | adding a test case for custom locking | Aaron Patterson | 2011-02-21 | 1 | -0/+17 |
| | | |||||
| * | Use proper objects to do the work to build the associations (adding methods, ↵ | Jon Leighton | 2011-02-21 | 15 | -418/+553 |
| | | | | | | | | 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 | 8 | -47/+57 |
| | | | | | | | | '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 |