aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/merger.rb
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] Make merge method nodocAnshul Sharma2014-10-201-8/+1
* [ci skip] merge docsAnshul Sharma2014-10-201-0/+7
* Make filter_binds filter out symbols that are equal to stringsNat Budin2014-05-141-1/+1
* select! renamed to avoid name collision Array#select!Earl J St Sauver2014-04-211-1/+9
* Build the reverse_order on its proper method.Lauro Caetano2014-04-071-1/+0
* stuff the join dependency object in the "anything goes" hash.Aaron Patterson2013-10-101-1/+1
* Relation#merge should not lose readonly(false) flag.thedarkone2013-09-111-1/+5
* Don't create fibers just to iterateNicholas Jakobsen2013-08-301-3/+3
* add a specific factory method rather than using newAaron Patterson2013-07-231-1/+1
* reorder bind parameters when merging relationsAaron Patterson2013-07-151-2/+18
* Typo fix [skip ci]Ankit Gupta2013-07-121-1/+1
* Simplify/fix implementation of default scopesJon Leighton2013-06-281-4/+0
* avoid creating a set if no where values are removedAaron Patterson2013-05-211-0/+2
* remove bind values for where clauses that were removedAaron Patterson2013-05-211-9/+8
* push partitioning up so bind elimination can get the removed wheresAaron Patterson2013-05-211-5/+3
* push partion logic down and initialization logic upAaron Patterson2013-05-211-15/+11
* partition the where values so we can access the removed onesAaron Patterson2013-05-201-1/+6
* eliminate some conditionalsAaron Patterson2013-05-201-3/+3
* change method name to reflect what it actually does.Aaron Patterson2013-05-201-2/+2
* save the where values in variables so we don't need to look them up allAaron Patterson2013-05-201-4/+5
* pass where values to the helper function rather than rely on internal stateAaron Patterson2013-05-201-4/+4
* Extract JoinDependency#join_relation to DRY the repeated application of the #...Ben Woosley2013-05-101-3/+1
* extracted piece of code into a methodNeeraj Singh2013-05-081-13/+12
* Remove warningCarlos Antonio da Silva2013-04-101-2/+2
* While merging relations preserve context for joinsJared Armstrong and Neeraj Singh2013-04-101-2/+30
* Prevent Relation#merge from collapsing wheres on the RHSJon Leighton2013-01-271-17/+19
* performance improvements to joins!Aaron Patterson2012-10-121-2/+12
* Speed up relation merging by reducing calls to Array#-Aaron Patterson2012-10-121-3/+5
* Fix "last equality wins" logic in relation mergeErnie Miller2012-08-191-10/+5
* Fix merge error when Equality LHS is non-attributeErnie Miller2012-08-171-2/+5
* load active_support/core_ext/object/blank in active_support/railsXavier Noria2012-08-021-1/+0
* Add nodoc to HashMerger and MergerOscar Del Ben2012-07-171-2/+2
* Relation#from to accept other Relation objectsRadoslav Stankov2012-05-171-1/+2
* Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...Jon Leighton2012-05-051-28/+3
* Allow ActiveRecord::Relation merges to maintain context of joined associationsJared Armstrong2012-05-041-3/+28
* fix interpolation for hash mergingJon Leighton2012-04-251-15/+24
* allow merging a single where valueJon Leighton2012-04-251-1/+1
* now we can just manipulate the values hash in #only and #exceptJon Leighton2012-04-131-10/+1
* remove apply_finder_options call from AssociationScopeJon Leighton2012-04-131-1/+1
* Make Relation#extending work like other value methodsJon Leighton2012-04-131-3/+1
* assert valid keysJon Leighton2012-04-131-0/+5
* Allow Relation#merge to take a hashJon Leighton2012-04-131-44/+69
* we have no need for the ASSOCIATION_METHODS constantJon Leighton2012-04-131-1/+1
* refactoringJon Leighton2012-04-131-36/+45
* Extract clusterfuck method for surgeryJon Leighton2012-04-131-0/+84