aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Add test for define_attr_method using as name an invalid identifierSantiago Pastorino2011-03-161-0/+13
| | | | |
| | * | | Add test for define_attribute_method using as name an invalid identifierSantiago Pastorino2011-03-161-3/+26
| | | | |
| * | | | Add order clauses to fix some tests which were failing under 1.8 on oracle ↵Jon Leighton2011-03-182-14/+14
| | | | | | | | | | | | | | | | | | | | and postgres
| * | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-1630-81/+164
| |\| | |
| | * | | fixes an issue with number_to_human when converting values which are less ↵Josh Kalderimis2011-03-162-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than 1 but greater than -1 [#6576 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * | | Fix typo in assertion messageAndrew White2011-03-161-1/+1
| | | | |
| | * | | Add messages to plain assertions.Norman Clarke2011-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| | * | | use a list to represent the supported verbs for a route objectAaron Patterson2011-03-142-11/+13
| | | | |
| | * | | stop splatting arguments so that we can understand wtf is going onAaron Patterson2011-03-141-2/+3
| | | | |
| | * | | RegexpWithNamedGroups is only used for path_info, so only apply to path infoAaron Patterson2011-03-141-1/+2
| | | | |
| * | | | oracle, y u defy meJon Leighton2011-03-165-13/+15
| | | | |
| * | | | Fix tests under postgres - we should always put conditions in the WHERE part ↵Jon Leighton2011-03-124-19/+23
| | | | | | | | | | | | | | | | | | | | not in ON constraints because postgres requires that the table has been joined before the condition references it.
| * | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-128-20/+117
| |\ \ \ \
| * | | | | Resolve some TODO comments which I decided did not need anything doneJon Leighton2011-03-123-9/+5
| | | | | |
| * | | | | Simplify implementation of ThroughReflection#chainJon Leighton2011-03-112-23/+3
| | | | | |
| * | | | | Abstract some common code from AssociationScope and ↵Jon Leighton2011-03-114-97/+83
| | | | | | | | | | | | | | | | | | | | | | | | JoinDependency::JoinAssociation into a JoinHelper module
| * | | | | Refactor JoinAssociationJon Leighton2011-03-101-100/+54
| | | | | |
| * | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-1049-129/+231
| |\ \ \ \ \
| * | | | | | Rename Reflection#through_reflection_chain and #through_options to ↵Jon Leighton2011-03-105-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 Leighton2011-03-109-215/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AssociationScope class which is capable of building a scope for any association.
| * | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0725-44/+193
| |\ \ \ \ \ \
| * | | | | | | Fix ↵Jon Leighton2011-03-072-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 Leighton2011-03-072-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 Leighton2011-03-062-84/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | construct_owner_conditions.
| * | | | | | | Refactor ThroughAssociation#tables to just be a flat array of tables in the ↵Jon Leighton2011-03-061-75/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | order that they should be joined together.
| * | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0563-117/+380
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG
| * | | | | | | | Use Base#type_condition in JoinAssociationJon Leighton2011-03-052-17/+6
| | | | | | | | |
| * | | | | | | | Push source_type and polymorphic conditions out of ThroughAssociation and ↵Jon Leighton2011-03-054-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 Leighton2011-03-056-13/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the code which support this
| * | | | | | | | Stop identity-mapping the through records in the preloader since I fixed the ↵Jon Leighton2011-03-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | underlying problem in the habtm preloader.
| * | | | | | | | Fix a couple of tests in join_model_test.rb which were failing when the ↵Jon Leighton2011-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identity map is turned off
| * | | | | | | | When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-042-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.)
| * | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-045-9/+28
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-04584-13369/+18299
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_throughJon Leighton2010-12-12149-1249/+2445
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-27171-1857/+3057
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-17196-1793/+3968
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_throughJon Leighton2010-11-0852-185/+381
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * | | | | | | | | | | | | Update new tests in cascaded_eager_loading_test.rb to work with the modified ↵Jon Leighton2010-10-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixtures in this branch
| * | | | | | | | | | | | | Fix bug with 0bb85ed9ffa9808926b46e8f7e59cab5b85ac19f which missed out a ↵Jon Leighton2010-10-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixtures declaration in cascaded_eager_loading_test.rb
| * | | | | | | | | | | | | Fix naughty trailing whitespaceJon Leighton2010-10-3121-259/+259
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-3116-43/+121
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_throughJon Leighton2010-10-28116-632/+6546
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/test/schema/schema.rb
| * | | | | | | | | | | | | | | Rename nested_has_many_through_associations_test.rb because it does not only ↵Jon Leighton2010-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concern has_many associations
| * | | | | | | | | | | | | | | Add explicit ordering in relations_test.rb, as the lack of this was causing ↵Jon Leighton2010-10-191-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failures against postgres
| * | | | | | | | | | | | | | | Add explicit ordering to nested_has_many_through_associations_test.rb as ↵Jon Leighton2010-10-191-32/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was causing failures under postgres
| * | | | | | | | | | | | | | | Remove obsolete require to active_record/associations/nested_has_many_throughJon Leighton2010-10-191-1/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix typoJon Leighton2010-10-191-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove obsolete autoloadJon Leighton2010-10-191-1/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add a CHANGELOG entry about nested through associationsJon Leighton2010-10-191-0/+2
| | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-29 03:10:43 +0000