aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods...Jon Leighton2011-02-288-620/+612
* Rewrote AssociationPreload.Jon Leighton2011-02-2811-0/+553
* Use proper objects to do the work to build the associations (adding methods, ...Jon Leighton2011-02-2111-4/+501
* 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 'reflection.optio...Jon Leighton2011-02-217-47/+49
* Singular associations no longer use a proxy, so no need to check for the prox...Jon Leighton2011-02-213-8/+2
* Associations - where possible, call attributes methods rather than directly a...Jon Leighton2011-02-2111-179/+179
* Initialize @target instead asking if it is defined.Emilio Tagua2011-02-181-1/+2
* Reindent and remove wrong line left in merge by mistake.Emilio Tagua2011-02-181-4/+3
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1811-473/+527
|\
| * Split AssociationProxy into an Association class (and subclasses) which manag...Jon Leighton2011-02-189-276/+287
| * Add :nodoc: to ThroughAssociation and HasOneAssociationJon Leighton2011-02-182-2/+2
| * Allow building and then later saving has_many :through records, such that the...Jon Leighton2011-02-181-4/+46
* | Don't shadow outer local variable.Emilio Tagua2011-02-151-2/+2
* | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1514-1044/+873
|\|
| * Add a transaction wrapper in add_to_target. This means that #build will now a...Jon Leighton2011-02-141-27/+27
| * Inline ensure_owner_is_persisted! as it is only called from one placeJon Leighton2011-02-141-8/+4
| * @target should always be an arrayJon Leighton2011-02-141-1/+2
| * Rename add_record_to_target_with_callbacks to add_to_targetJon Leighton2011-02-141-4/+4
| * Don't pass the block through build_recordJon Leighton2011-02-141-10/+8
| * Move create and create! next to buildJon Leighton2011-02-141-21/+21
| * Get rid of create_record as it is not only used in one placeJon Leighton2011-02-141-8/+7
| * Get rid of AssociationCollection#save_recordJon Leighton2011-02-144-25/+25
| * Add interpolation of association conditions back in, in the form of proc { .....Jon Leighton2011-02-145-12/+19
| * Remove Relation#& alias for Relation#mergeErnie Miller2011-02-122-2/+2
| * Fix table name collision due to incorrect alias count on certain joins.Ernie Miller2011-02-121-4/+4
| * just return the record from insert_record, use truthiness for comparisonsAaron Patterson2011-02-071-2/+2
| * Refactor the implementations of AssociatioCollection#delete and #destroy to b...Jon Leighton2011-02-074-18/+14
| * This string should continueJon Leighton2011-02-071-1/+1
| * Correctly update counter caches on deletion for has_many :through [#2824 stat...Jon Leighton2011-02-072-20/+63
| * Support the :dependent option on has_many :through associations. For historic...Jon Leighton2011-02-072-16/+34
| * Make record.association.destroy(*records) on habtm and hm:t only delete recor...Jon Leighton2011-02-074-23/+30
| * scope is always a RelationSantiago Pastorino2011-02-011-3/+1
| * Propagate association extensions to scopes called on the association.Glenn Vanderburg2011-02-011-0/+3
| * Make use of helpers in AssociationReflectionJon Leighton2011-01-301-4/+4
| * Has many through - It is not necessary to manually merge in the conditions ha...Jon Leighton2011-01-301-4/+0
| * @join_table_name is no longer usedJon Leighton2011-01-301-2/+1
| * Make AssociationCollection#include? a bit more readableJon Leighton2011-01-301-4/+10
| * Don't use method_missing when we don't have toJon Leighton2011-01-301-2/+2
| * AssociationCollection#clear can basically just use #delete_all, except it sho...Jon Leighton2011-01-301-13/+7
| * AssociationCollection#to_ary should definitely dup the target! Also changed #...Jon Leighton2011-01-301-3/+3
| * Just use primary_key here, AR::Relation will resolve the ambiguity before it ...Jon Leighton2011-01-301-1/+1
| * Call sum on the scope directly, rather than relying on method_missing and cal...Jon Leighton2011-01-301-2/+2
| * Condense first_or_last a bit moreJon Leighton2011-01-301-7/+5
| * Get rid of separate reset_target! and reset_scopes_cache! methodsJon Leighton2011-01-301-26/+17
| * target is always an arrayJon Leighton2011-01-301-5/+0
| * load_target will return the target. it also will not load if loaded? is true.Jon Leighton2011-01-301-2/+1
| * DRY up first/last and hence make last benefit from the bugfix in firstJon Leighton2011-01-301-15/+13
| * Use scoped.find directly rather than having a find_by_sql methodJon Leighton2011-01-301-5/+1