| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | Add additional text to NotImplementedErrors [#6328 state:resolved] | Mike Gehard | 2011-03-12 | 1 | -1/+1 | |
| | | |/ | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | | * | Referencing a table via the ON condition in a join should force that table ↵ | Jon Leighton | 2011-03-07 | 1 | -1/+12 | |
| | | | | | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | |||||
| | * | | 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 | 3 | -9/+5 | |
| | | | | ||||||
| | * | | Simplify implementation of ThroughReflection#chain | Jon Leighton | 2011-03-11 | 1 | -22/+2 | |
| | | | | ||||||
| | * | | 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 | |
| | | | | ||||||
| | * | | Rename Reflection#through_reflection_chain and #through_options to ↵ | Jon Leighton | 2011-03-10 | 4 | -45/+48 | |
| | | | | | | | | | | | | | 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 | 1 | -1/+12 | |
| | | | | | | | | | | | | | 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 | 6 | -9/+19 | |
| | |\| | | | | | | | | | | | | | 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 | 3 | -4/+4 | |
| | | | | ||||||
| | | * | 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 | 1 | -0/+10 | |
| | | | | | | | | | | | | | configuration of the current connection at runtime | |||||
| | | * | 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 | 2 | -17/+6 | |
| | | | | ||||||
| | * | | Push source_type and polymorphic conditions out of ThroughAssociation and ↵ | Jon Leighton | 2011-03-05 | 3 | -45/+11 | |
| | | | | | | | | | | | | | 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 | 2 | -13/+25 | |
| | | | | | | | | | | | | | 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 | 101 | -4174/+5652 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * \ \ | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-12-12 | 37 | -324/+387 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG 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_through_association.rb | |||||
| | | * | | | just use the regexp directly | Aaron Patterson | 2010-12-10 | 1 | -6/+4 | |
| | | | | | | ||||||
| | | * | | | combine regexp | Aaron Patterson | 2010-12-10 | 1 | -4/+2 | |
| | | | | | | ||||||
| | | * | | | reduce method calls | Aaron Patterson | 2010-12-10 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | move ivar to initialize, use triple dot rather than minus | Aaron Patterson | 2010-12-10 | 2 | -2/+2 | |
| | | | | | | ||||||
| | | * | | | explicitly set prefix | Aaron Patterson | 2010-12-10 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | remove lasgn since AST is mutated | Aaron Patterson | 2010-12-10 | 2 | -3/+9 | |
| | | | | | | ||||||
| | | * | | | just mutate the ast, fewer lasgns | Aaron Patterson | 2010-12-10 | 1 | -3/+2 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-27 | 33 | -831/+1064 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb | |||||
| | * \ \ \ \ | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-17 | 26 | -104/+132 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/test/cases/associations/has_many_through_associations_test.rb | |||||
| | * \ \ \ \ \ | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-08 | 9 | -73/+65 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | |||||
| | * | | | | | | | Fix naughty trailing whitespace | Jon Leighton | 2010-10-31 | 7 | -133/+133 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-31 | 5 | -34/+68 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-28 | 17 | -126/+386 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/test/schema/schema.rb | |||||
| | * | | | | | | | | | Remove obsolete require to active_record/associations/nested_has_many_through | Jon Leighton | 2010-10-19 | 1 | -1/+0 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Fix typo | Jon Leighton | 2010-10-19 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Remove obsolete autoload | Jon Leighton | 2010-10-19 | 1 | -1/+0 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-19 | 9 | -30/+23 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Add some API documentation about nested through associations | Jon Leighton | 2010-10-19 | 1 | -8/+52 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Add some comments for ThroughReflection#through_reflection_chain | Jon Leighton | 2010-10-19 | 1 | -1/+10 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Remove various comments and code which were just being used during the ↵ | Jon Leighton | 2010-10-19 | 4 | -194/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development of nested through association support (OMFGZ, I might just have nearly finished this\! | |||||
| | * | | | | | | | | | | Add explicit tests for the nested through association changes in reflection.rb | Jon Leighton | 2010-10-19 | 1 | -2/+13 | |
| | | | | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |