aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | 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
| * | | Ensure AR #second, #third, etc. finders work through associationsJason Meller2014-01-212-5/+51
| * | | add missing information for `id` field when used with `select` [ci skip]Kuldeep Aggarwal2014-01-221-1/+1
| * | | `has_one` and `belongs_to` accessors don't add ORDER BY to the queries anymore.Rafael Mendonça França2014-01-211-1/+1
* | | | expliticly make STI column a bind valueAaron Patterson2014-01-141-4/+9
* | | | Merge branch 'master' into set_bindsAaron Patterson2014-01-141-6/+4
|\| | |
| * | | directly create the ARel ASTAaron Patterson2014-01-141-6/+4
* | | | adding bind values to the manager objectAaron Patterson2014-01-131-5/+2
* | | | bubble bind parameters up when building join dependenciesAaron Patterson2014-01-132-7/+14
* | | | Merge branch 'master' into set_bindsAaron Patterson2014-01-1131-952/+979
|\| | |
| * | | Change all "can not"s to the correct "cannot".T.J. Schuck2014-01-031-1/+1
| * | | Merge pull request #10134 from derikson/collection_proxy_select_with_multiple...Rafael Mendonça França2014-01-032-5/+5
| |\ \ \
| | * | | Changed ActiveRecord::Associations::CollectionProxy#select to take multiple a...Dan Erikson2013-04-082-5/+5
| * | | | Merge pull request #13550 from vipulnsward/13437-fixRafael Mendonça França2014-01-011-1/+1
| |\ \ \ \
| | * | | | https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5a...Vipul A M2013-12-311-1/+1
| * | | | | Make outer joins on proper parentWashington Luiz2013-12-311-1/+1
| |/ / / /
| * | | | On destroying do not touch destroyed belongs to association.Paul Nikitochkin2013-12-231-1/+1