Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-14 | 3 | -8/+15 |
|\ | |||||
| * | Adjust unique constraint comment to include info about the RecordNotUnique ↵ | Anders Elfving | 2011-03-13 | 1 | -4/+11 |
| | | | | | | | | exception | ||||
| * | remove some blanks | Paco Guzman | 2011-03-11 | 2 | -4/+4 |
| | | |||||
* | | Fixed a bug when empty? was called on a grouped Relation that wasn't loaded | Chris Oliver | 2011-03-12 | 1 | -1/+4 |
| | | | | | | | | | | | | [#5829 state:resolved] Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
* | | Add additional text to NotImplementedErrors [#6328 state:resolved] | Mike Gehard | 2011-03-12 | 1 | -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 Leighton | 2011-03-07 | 1 | -1/+12 |
| | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | ||||
* | 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 | ||||
* | 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> | ||||
* | 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 |
| | | | |||||
* | | | 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] |