aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into adequaterecordAaron Patterson2014-04-075-46/+22
|\
| * remove check for present? from delete_alleileencodes2014-04-071-2/+2
| * fix CollectionProxy delete_all documentationeileencodes2014-04-061-6/+1
| * Merge pull request #11650 from prathamesh-sonpatki/renameRafael Mendonça França2014-04-042-7/+7
| |\
| | * [Active Record] Renamed private methods create_record and update_recordPrathamesh Sonpatki2014-02-202-7/+7
| * | CollectionProxy uses the arel of its association's scope.Jefferson Lai2014-04-021-0/+4
| * | Merge pull request #14546 from eileencodes/fix_delete_all_to_not_use_IN_state...Aaron Patterson2014-03-311-1/+1
| |\ \
| | * | fix delete_all to remove records directlyeileencodes2014-03-311-1/+1
| * | | Simplify Preloader#grouped_records code.thedarkone2014-03-301-20/+6
| * | | Fix polymorphic preloads on NOT NULL _type columns.thedarkone2014-03-301-10/+1
| |/ /
| * | Merge pull request #14154 from al2o3cr/issue12770Aaron Patterson2014-03-271-1/+1
| |\ \
| | * | Pass a base relation to build_default_scope when joiningMatt Jones2014-02-211-1/+1
* | | | Merge branch 'master' into adequaterecordAaron Patterson2014-03-251-2/+1
|\| | |
| * | | Avoid duplicated conditionalsCarlos Antonio da Silva2014-03-141-2/+1
* | | | Merge branch 'master' into adequaterecordAaron Patterson2014-03-131-1/+1
|\| | |
| * | | passing an ActiveRecord object to `exists?` is deprecated.Aaron Patterson2014-03-131-1/+1
* | | | Merge branch 'master' into adequaterecordAaron Patterson2014-03-133-6/+8
|\| | |
| * | | make tests pass on Ruby 2.2Aaron Patterson2014-03-131-4/+4
| * | | Replace map.flatten with flat_map in activerecordErik Michaels-Ober2014-03-031-1/+1
| * | | Remove unnecessary db call when replacing.Arthur Neves2014-02-281-1/+3
* | | | Merge branch 'master' into adequaterecordAaron Patterson2014-02-263-10/+5
|\| | |
| * | | let `insert_record` actuall save the object.Aaron Patterson2014-02-252-4/+3
| |/ /
| * | Prevent foreign_key_for? from type casting all attributesWojtek Kruszewski2014-02-211-1/+1
| * | Revert "speed up the collection proxy reader method, but slow down the constr...Arthur Neves2014-02-201-5/+1
| |/
* | Merge branch 'master' into adequaterecordAaron Patterson2014-02-1711-114/+193
|\|
| * add factory methods for empty alias trackersAaron Patterson2014-02-143-23/+38
| * guarantee a list in the alias tracker so we can remove a conditionalAaron Patterson2014-02-142-5/+3
| * stop exposing table_joinsAaron Patterson2014-02-141-4/+3
| * make most parameters to the AliasTracker requiredAaron Patterson2014-02-142-6/+4
| * make a singleton for AssociationScopeAaron Patterson2014-02-142-1/+7
| * pass the association and connection to the scope methodAaron Patterson2014-02-142-9/+3
| * pass the tracker down the stack and construct it in the scope methodAaron Patterson2014-02-141-18/+18
| * clean up add_constraints signatureAaron Patterson2014-02-141-8/+9
| * remove the reflection delegateAaron Patterson2014-02-141-15/+14
| * remove klass delegatorAaron Patterson2014-02-141-10/+11
| * remove chain delegateAaron Patterson2014-02-141-5/+6
| * remove scope_chain delegateAaron Patterson2014-02-141-3/+3
| * remove more delegate methodsAaron Patterson2014-02-131-7/+9
| * :scissors: whitespaceAaron Patterson2014-02-131-1/+0
| * rm delegate methods that are not actually usedAaron Patterson2014-02-131-2/+2
| * JoinHelper is never reused, so there is no need to separateAaron Patterson2014-02-132-41/+25
| * speed up the collection proxy reader method, but slow down the constructorAaron Patterson2014-02-131-1/+5
| * Dont use Enumarator on join_associationArthur Neves2014-02-131-2/+4
| * Avoid using deprecated arel constantsRafael Mendonça França2014-02-102-3/+3
| * Merge pull request #13899 from Fortisque/kevin/active_record_HABTM_with_belon...Rafael Mendonça França2014-02-041-1/+1
| |\
| | * fix HABTM w/out primary key errors on destructionKevin Casey2014-02-021-1/+1
| * | this class depends on JoinHelper, so we should require itAaron Patterson2014-01-311-0/+2
| |/
| * Associations now raise `ArgumentError` on name conflicts.Lauro Caetano2014-01-311-0/+6
| * Make CollectionProxy#reset return selfRafael Mendonça França2014-01-221-1/+2
| * Calling reset on a collection association should unload the assocationKelsey Schlarman2014-01-211-0/+21