aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/merger.rb
Commit message (Expand)AuthorAgeFilesLines
* Relation merging should keep joining orderRyuta Kamizono2017-11-111-10/+8
* Decouple building `AliasTracker` from `JoinDependency`Ryuta Kamizono2017-10-081-1/+1
* `Relation::Merger` should not fill `values` with empty valuesRyuta Kamizono2017-07-251-10/+12
* Use frozen-string-literal in ActiveRecordKir Shatrov2017-07-191-0/+2
* Fix `JoinDependency` with using a custom tableRyuta Kamizono2017-07-181-3/+4
* Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-021-1/+0
* Enforce frozen string in RubocopKir Shatrov2017-07-011-0/+1
* Remove over meta programming in AR::RelationBogdan Gusiev2016-08-231-8/+4
* normalizes indentation and whitespace across the projectXavier Noria2016-08-061-61/+61
* applies new string literal convention in activerecord/libXavier Noria2016-08-061-1/+1
* Properly include the `from` clause when merging relationsSean Griffin2016-01-141-0/+3
* Don't allocate a bunch of strings in `Relation::Merger`Sean Griffin2015-09-021-4/+8
* Fix regression caused by a01d164bRafael Mendonça França2015-07-071-2/+2
* Fix the shadowing warning for `reflection`Roque Pinel2015-05-281-2/+2
* Properly append preload / includes args on MergerWashington Luiz2015-05-281-1/+23
* Remove redundant require 'set' linesMehmet Emin İNAÇ2015-05-151-1/+0
* Move the `from` bind logic to a `FromClause` classSean Griffin2015-01-261-4/+2
* Remove `Relation#bind_values=`Sean Griffin2015-01-261-3/+4
* `Relation#Merger` can merge all clause methodsSean Griffin2015-01-251-3/+11
* Move where merging logic over to `WhereClause`Sean Griffin2015-01-251-39/+2
* Don't duplicate `Relation::VALUE_METHODS` in `Relation::Merger`Sean Griffin2015-01-241-2/+1
* Inject the `PredicateBuilder` into the `Relation` instanceSean Griffin2014-12-261-1/+1
* Remove the unused second argument to `substitute_at`Sean Griffin2014-11-171-12/+0
* Remove unneccessary default values from relation mergerSean Griffin2014-10-281-2/+2
* Call value methods when merging relations, rather than accessing keysSean Griffin2014-10-281-14/+14
* [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