aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-165-10/+20
|\
| * 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
|\|
| * Move ActiveModel::AttributeMethods#attribute_methods_generated? to ↵Alexander Uvarov2011-03-011-0/+11
| | | | | | | | | | | | | | | | ActiveRecord, so it's flexible now [#6428 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0497-4167/+5631
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Move JoinDependency and friends from ↵Jon Leighton2011-02-2811-626/+618
| | | | | | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations
| * Rewrote AssociationPreload.Jon Leighton2011-02-2816-439/+565
| |
| * use an attribute rather than a SQL literalAaron Patterson2011-02-261-1/+1
| |
| * removing limits and offsets from COUNT queries unless both are specified. ↵Aaron Patterson2011-02-252-1/+14
| | | | | | | | [#6268 state:resolved]
| * only take the limit if there is a limit to takeAaron Patterson2011-02-251-1/+1
| |
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-251-1/+1
| |\
| | * Fix missing inheritance from AR::Base in docsJosep M. Bach2011-02-241-1/+1
| | |
| * | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclassesEric Allam2011-02-241-2/+3
| | |
| * | Fix observer callbacks firing multiple times on descendant instancesKamal Fariz Mahyuddin2011-02-221-1/+8
| | |
| * | Relation will delegate to AR::Base which already uses the Dynamic finders, ↵Aaron Patterson2011-02-221-8/+3
| |/ | | | | | | so eliminate duplicate calls
| * Use proper objects to do the work to build the associations (adding methods, ↵Jon Leighton2011-02-2113-406/+537
| | | | | | | | callbacks etc) rather than calling a whole bunch of methods with rather long names.
| * Rename target_klass to klassJon Leighton2011-02-213-10/+10
| |
| * Delegate through_reflection and source_reflection to reflectionJon Leighton2011-02-213-34/+34
| |
| * Delegate Association#options to the reflection, and replace ↵Jon Leighton2011-02-218-47/+57
| | | | | | | | 'reflection.options' with 'options'. Also add through_options and source_options methods for through associations.
| * Singular associations no longer use a proxy, so no need to check for the ↵Jon Leighton2011-02-213-8/+2
| | | | | | | | proxy type on assignment.
| * Associations - where possible, call attributes methods rather than directly ↵Jon Leighton2011-02-2111-179/+179
| | | | | | | | accessing the instance variables
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 21:14:10 +0000