aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-143-8/+15
| | |\
| | | * Adjust unique constraint comment to include info about the RecordNotUnique ↵Anders Elfving2011-03-131-4/+11
| | | | | | | | | | | | | | | | exception
| | | * remove some blanksPaco Guzman2011-03-112-4/+4
| | | |
| | * | Fixed a bug when empty? was called on a grouped Relation that wasn't loadedChris Oliver2011-03-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | [#5829 state:resolved] Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| | * | Add additional text to NotImplementedErrors [#6328 state:resolved]Mike Gehard2011-03-121-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 Leighton2011-03-071-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 Leighton2011-03-123-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 doneJon Leighton2011-03-123-9/+5
| | |
| * | Simplify implementation of ThroughReflection#chainJon Leighton2011-03-111-22/+2
| | |
| * | 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
| | |
| * | Rename Reflection#through_reflection_chain and #through_options to ↵Jon Leighton2011-03-104-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 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-071-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 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-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
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 18:13:17 +0000