aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-071-1/+1
| | |\
| | | * "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-071-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 Leighton2011-03-072-1/+27
| | |/ | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries.
| * | 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.
| * | 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-0511-15/+33
| |\| | | | | | | | | | | | | 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-056-10/+10
| | |
| | * fixes a missmatched column in examplemjy2011-03-051-1/+1
| | |
| | * implements ActiveRecord::Base.connection_config to be able to check the ↵Xavier Noria2011-03-053-0/+18
| | | | | | | | | | | | configuration of the current connection at runtime
| | * 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.)
| | * 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-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-042-4/+5
| |\|
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-04207-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
| * \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-12-1265-420/+756
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2756-911/+1611
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb
| * \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-1760-287/+461
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0822-134/+144
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3110-34/+113
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2839-209/+811
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-1913-44/+65
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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-195-199/+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-195-2/+80
| | | | | | | | | | |
| * | | | | | | | | | Fix broken testJon Leighton2010-10-191-1/+5
| | | | | | | | | | |
| * | | | | | | | | | Small refactoringJon Leighton2010-10-191-6/+2
| | | | | | | | | | |
| * | | | | | | | | | Support the :primary_key option on a through reflection in a nested through ↵Jon Leighton2010-10-196-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association
| * | | | | | | | | | Bugfix/refactoringJon Leighton2010-10-193-11/+20
| | | | | | | | | | |
| * | | | | | | | | | Remove unused methodsJon Leighton2010-10-191-11/+0
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 12:05:00 +0000