Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 101 | -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 | ||||
| * | 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 | 17 | -440/+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 |
| | | | |||||
| * | | We're in 2011, let's update our license | Prem Sichanugrist | 2011-02-22 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | 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 |
| | | | | |||||
| * | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 21 | -609/+692 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | ||||
| | * | | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 15 | -350/+361 |
| | | | | | | | | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. | ||||
| | * | | Add :nodoc: to ThroughAssociation and HasOneAssociation | Jon Leighton | 2011-02-18 | 2 | -2/+2 |
| | | | | |||||
| | * | | Allow building and then later saving has_many :through records, such that ↵ | Jon Leighton | 2011-02-18 | 2 | -11/+77 |
| | | | | | | | | | | | | | | | | the join record is automatically saved too. This requires the :inverse_of option to be set on the source association in the join model. See the CHANGELOG for details. [#4329 state:resolved] | ||||
| | * | | Ensure that association_ids uses the correct attribute where the association ↵ | Jon Leighton | 2011-02-18 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | is a has_many :through with a :primary_key option on the source reflection. [#6376 state:resolved] | ||||
| | * | | explicitly allowing lolqueries | Aaron Patterson | 2011-02-16 | 1 | -10/+1 |
| | | | | |||||
| | * | | use the arel table rather than generating strings | Aaron Patterson | 2011-02-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | no need for Array.wrap | Aaron Patterson | 2011-02-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | removed an unnecessary second query when passing an ActiveRecord::Relation ↵ | Steven Fenigstein | 2011-02-16 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | to a where clause. And added ability to use subselects in where clauses. | ||||
| | * | | fixture methods can be overridden and super() is useful | Aaron Patterson | 2011-02-15 | 1 | -14/+17 |
| | | | | |||||
| | * | | fixing variable names to reflect reality | Aaron Patterson | 2011-02-15 | 1 | -11/+11 |
| | | | | |||||
| | * | | this is in the AR namespace, so AR must exist | Aaron Patterson | 2011-02-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Optimization for postgres adapter for add_column method. Set default and not ↵ | Timothy N. Tsvetkov | 2011-02-15 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | null in one query |