Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor ThroughAssociation#tables to just be a flat array of tables in the ↵ | Jon Leighton | 2011-03-06 | 1 | -75/+70 |
| | | | | order that they should be joined together. | ||||
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-05 | 6 | -9/+19 |
|\ | | | | | | | | | Conflicts: activerecord/CHANGELOG | ||||
| * | use Arel::Table#alias rather than passing the :as parameter | Aaron Patterson | 2011-03-05 | 2 | -4/+4 |
| | | |||||
| * | Active Record typos. | R.T. Lechow | 2011-03-05 | 3 | -4/+4 |
| | | |||||
| * | fixes a missmatched column in example | mjy | 2011-03-05 | 1 | -1/+1 |
| | | |||||
| * | implements ActiveRecord::Base.connection_config to be able to check the ↵ | Xavier Noria | 2011-03-05 | 1 | -0/+10 |
| | | | | | | | | configuration of the current connection at runtime | ||||
| * | When preloading has_and_belongs_to_many associations, we should only ↵ | Jon Leighton | 2011-03-04 | 1 | -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 Leighton | 2011-03-04 | 1 | -2/+2 |
| | | | | | | | | identity map is turned off | ||||
* | | Use Base#type_condition in JoinAssociation | Jon Leighton | 2011-03-05 | 2 | -17/+6 |
| | | |||||
* | | Push source_type and polymorphic conditions out of ThroughAssociation and ↵ | Jon Leighton | 2011-03-05 | 3 | -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 Leighton | 2011-03-05 | 2 | -13/+25 |
| | | | | | | | | the code which support this | ||||
* | | Stop identity-mapping the through records in the preloader since I fixed the ↵ | Jon Leighton | 2011-03-04 | 1 | -5/+0 |
| | | | | | | | | underlying problem in the habtm preloader. | ||||
* | | Fix a couple of tests in join_model_test.rb which were failing when the ↵ | Jon Leighton | 2011-03-04 | 1 | -2/+2 |
| | | | | | | | | identity map is turned off | ||||
* | | When preloading has_and_belongs_to_many associations, we should only ↵ | Jon Leighton | 2011-03-04 | 1 | -2/+4 |
| | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.) | ||||
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 1 | -0/+5 |
|\| | |||||
| * | Move ActiveModel::AttributeMethods#attribute_methods_generated? to ↵ | Alexander Uvarov | 2011-03-01 | 1 | -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_through | Jon Leighton | 2011-03-04 | 97 | -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 Leighton | 2011-02-28 | 11 | -626/+618 |
| | | | | | | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations | ||||
| * | Rewrote AssociationPreload. | Jon Leighton | 2011-02-28 | 16 | -439/+565 |
| | | |||||
| * | use an attribute rather than a SQL literal | Aaron Patterson | 2011-02-26 | 1 | -1/+1 |
| | | |||||
| * | removing limits and offsets from COUNT queries unless both are specified. ↵ | Aaron Patterson | 2011-02-25 | 2 | -1/+14 |
| | | | | | | | | [#6268 state:resolved] | ||||
| * | only take the limit if there is a limit to take | Aaron Patterson | 2011-02-25 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-25 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix missing inheritance from AR::Base in docs | Josep M. Bach | 2011-02-24 | 1 | -1/+1 |
| | | | |||||
| * | | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses | Eric Allam | 2011-02-24 | 1 | -2/+3 |
| | | | |||||
| * | | Fix observer callbacks firing multiple times on descendant instances | Kamal Fariz Mahyuddin | 2011-02-22 | 1 | -1/+8 |
| | | | |||||
| * | | Relation will delegate to AR::Base which already uses the Dynamic finders, ↵ | Aaron Patterson | 2011-02-22 | 1 | -8/+3 |
| |/ | | | | | | | so eliminate duplicate calls | ||||
| * | Use proper objects to do the work to build the associations (adding methods, ↵ | Jon Leighton | 2011-02-21 | 13 | -406/+537 |
| | | | | | | | | callbacks etc) rather than calling a whole bunch of methods with rather long names. | ||||
| * | Rename target_klass to klass | Jon Leighton | 2011-02-21 | 3 | -10/+10 |
| | | |||||
| * | Delegate through_reflection and source_reflection to reflection | Jon Leighton | 2011-02-21 | 3 | -34/+34 |
| | | |||||
| * | Delegate Association#options to the reflection, and replace ↵ | Jon Leighton | 2011-02-21 | 8 | -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 Leighton | 2011-02-21 | 3 | -8/+2 |
| | | | | | | | | proxy type on assignment. | ||||
| * | Associations - where possible, call attributes methods rather than directly ↵ | Jon Leighton | 2011-02-21 | 11 | -179/+179 |
| | | | | | | | | accessing the instance variables | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-21 | 3 | -3/+27 |
| |\ | |||||
| | * | copy-edits 8d96b89 | Xavier Noria | 2011-02-21 | 2 | -8/+10 |
| | | | |||||
| | * | Adding new examples for update_all method | Rodrigo Navarro | 2011-02-20 | 1 | -0/+6 |
| | | | |||||
| | * | Adding examples | Rodrigo Navarro | 2011-02-20 | 1 | -0/+2 |
| | | | |||||
| | * | Typo: fixing the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 |
| | | | |||||
| | * | Clarification of ActiveRecord ActiveModel validation documentation | Peer Allan | 2011-02-18 | 2 | -2/+16 |
| | | | |||||
| * | | instance_methods includes public and protected, so reduce funcalls and ↵ | Aaron Patterson | 2011-02-18 | 1 | -3/+2 |
| | | | | | | | | | | | | object allocs | ||||
| * | | AR::AttributeMethods does not need to be included in an AR::Base class. | Aaron Patterson | 2011-02-18 | 1 | -1/+5 |
| |/ | |||||
| * | merges docrails | Xavier Noria | 2011-02-18 | 3 | -6/+3 |
| |\ | |||||
| | * | removes unrealistic example (authentication plus gender?), that it is not ↵ | Xavier Noria | 2011-02-18 | 1 | -4/+1 |
| | | | | | | | | | | | | needed anyway | ||||
| | * | Clarify Example in ActiveRecord base | Nicholas Rowe | 2011-02-18 | 1 | -1/+1 |
| | | | |||||
| | * | Fix Typos: remove several occurences of the the | Nicholas Rowe | 2011-02-17 | 2 | -2/+2 |
| | | | |||||
| * | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | just use the list of column names to generate attribute methods | Aaron Patterson | 2011-02-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | No need to have reinit_with inside an InstanceMethods module. | Emilio Tagua | 2011-02-18 | 1 | -17/+15 |
| | | | | |||||
| * | | | Initialize @target instead asking if it is defined. | Emilio Tagua | 2011-02-18 | 1 | -1/+2 |
| | | | | |||||
| * | | | Reindent and remove wrong line left in merge by mistake. | Emilio Tagua | 2011-02-18 | 1 | -4/+3 |
| | | | |