aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-056-9/+19
| |\| | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG
| | * use Arel::Table#alias rather than passing the :as parameterAaron Patterson2011-03-052-4/+4
| | |
| | * Active Record typos.R.T. Lechow2011-03-053-4/+4
| | |
| | * fixes a missmatched column in examplemjy2011-03-051-1/+1
| | |
| | * implements ActiveRecord::Base.connection_config to be able to check the ↵Xavier Noria2011-03-051-0/+10
| | | | | | | | | | | | configuration of the current connection at runtime
| | * When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-041-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 Leighton2011-03-041-2/+2
| | | | | | | | | | | | identity map is turned off
| * | Use Base#type_condition in JoinAssociationJon Leighton2011-03-052-17/+6
| | |
| * | Push source_type and polymorphic conditions out of ThroughAssociation and ↵Jon Leighton2011-03-053-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 Leighton2011-03-052-13/+25
| | | | | | | | | | | | 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-041-2/+4
| | | | | | | | | | | | 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-041-0/+5
| |\|
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-04101-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_throughJon Leighton2010-12-1237-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 directlyAaron Patterson2010-12-101-6/+4
| | | | |
| | * | | combine regexpAaron Patterson2010-12-101-4/+2
| | | | |
| | * | | reduce method callsAaron Patterson2010-12-101-1/+1
| | | | |
| | * | | move ivar to initialize, use triple dot rather than minusAaron Patterson2010-12-102-2/+2
| | | | |
| | * | | explicitly set prefixAaron Patterson2010-12-101-1/+1
| | | | |
| | * | | remove lasgn since AST is mutatedAaron Patterson2010-12-102-3/+9
| | | | |
| | * | | just mutate the ast, fewer lasgnsAaron Patterson2010-12-101-3/+2
| | | | |
| * | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-2733-831/+1064
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb
| * \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-1726-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_throughJon Leighton2010-11-089-73/+65
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * | | | | | | Fix naughty trailing whitespaceJon Leighton2010-10-317-133/+133
| | | | | | | |
| * | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-315-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_throughJon Leighton2010-10-2817-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_throughJon Leighton2010-10-191-1/+0
| | | | | | | | | |
| * | | | | | | | | Fix typoJon Leighton2010-10-191-1/+1
| | | | | | | | | |
| * | | | | | | | | Remove obsolete autoloadJon Leighton2010-10-191-1/+0
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-199-30/+23
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add some API documentation about nested through associationsJon Leighton2010-10-191-8/+52
| | | | | | | | | | |
| * | | | | | | | | | Add some comments for ThroughReflection#through_reflection_chainJon Leighton2010-10-191-1/+10
| | | | | | | | | | |
| * | | | | | | | | | Remove various comments and code which were just being used during the ↵Jon Leighton2010-10-194-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.rbJon Leighton2010-10-191-2/+13
| | | | | | | | | | |
| * | | | | | | | | | Small refactoringJon Leighton2010-10-191-6/+2
| | | | | | | | | | |
| * | | | | | | | | | Support the :primary_key option on a through reflection in a nested through ↵Jon Leighton2010-10-191-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association
| * | | | | | | | | | Bugfix/refactoringJon Leighton2010-10-193-11/+20
| | | | | | | | | | |
| * | | | | | | | | | Remove unused methodsJon Leighton2010-10-191-11/+0
| | | | | | | | | | |
| * | | | | | | | | | Support for :primary_key option on the source reflection of a through ↵Jon Leighton2010-10-193-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association, where the source is a has_one or has_many
| * | | | | | | | | | Respect the :primary_key option on the through_reflection of (non-nested) ↵Jon Leighton2010-10-193-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through associations
| * | | | | | | | | | Properly support conditions on any of the reflections involved in a nested ↵Jon Leighton2010-10-193-76/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through association
| * | | | | | | | | | Refactoring: replace the mix of variables like @finder_sql, @counter_sql, ↵Jon Leighton2010-10-1711-154/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | etc with just a single scope hash (created on initialization of the proxy). This is now used consistently across all associations. Therefore, all you have to do to ensure finding/counting etc is done correctly is implement the scope correctly.
| * | | | | | | | | | Make sure nested through associations are read onlyJon Leighton2010-10-155-9/+40
| | | | | | | | | | |
| * | | | | | | | | | Fix small bug which was shown by the last commitJon Leighton2010-10-151-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Support preloading nested through associations (using the default ↵Jon Leighton2010-10-151-61/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-query strategy)
| * | | | | | | | | | Added ↵Jon Leighton2010-10-141-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_has_many_through_has_many_with_has_many_through_habtm_source_reflection and make it pass
| * | | | | | | | | | Fix bug in previous refactoringJon Leighton2010-10-141-6/+6
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 13:19:30 +0000