index
:
rails.git
3-2-stable-for-hmno
master
Mirror of official rails repo with custom fixes.
Harald Eilertsen
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
activerecord
/
lib
/
active_record
/
relation
/
merger.rb
Commit message (
Expand
)
Author
Age
Files
Lines
*
Bugfix ActiveRecord::Relation#merge special case of from clause
Bogdan Gusiev
2018-09-28
1
-3
/
+6
*
Fix merging relation that order including `?`
Ryuta Kamizono
2018-08-21
1
-2
/
+2
*
Use `construct_join_dependency` in all places
Ryuta Kamizono
2018-07-03
1
-6
/
+2
*
Ensure to calculate column aliases after all table aliases are constructed
Ryuta Kamizono
2018-06-19
1
-6
/
+2
*
Avoid passing unnecessary arguments to relation
Daniel Colson
2018-01-24
1
-1
/
+5
*
Fix relation merger issue with `left_outer_joins`
Mehmet Emin INAC
2018-01-15
1
-1
/
+25
*
Relation merging should keep joining order
Ryuta Kamizono
2017-11-11
1
-10
/
+8
*
Decouple building `AliasTracker` from `JoinDependency`
Ryuta Kamizono
2017-10-08
1
-1
/
+1
*
`Relation::Merger` should not fill `values` with empty values
Ryuta Kamizono
2017-07-25
1
-10
/
+12
*
Use frozen-string-literal in ActiveRecord
Kir Shatrov
2017-07-19
1
-0
/
+2
*
Fix `JoinDependency` with using a custom table
Ryuta Kamizono
2017-07-18
1
-3
/
+4
*
Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"
Matthew Draper
2017-07-02
1
-1
/
+0
*
Enforce frozen string in Rubocop
Kir Shatrov
2017-07-01
1
-0
/
+1
*
Remove over meta programming in AR::Relation
Bogdan Gusiev
2016-08-23
1
-8
/
+4
*
normalizes indentation and whitespace across the project
Xavier Noria
2016-08-06
1
-61
/
+61
*
applies new string literal convention in activerecord/lib
Xavier Noria
2016-08-06
1
-1
/
+1
*
Properly include the `from` clause when merging relations
Sean Griffin
2016-01-14
1
-0
/
+3
*
Don't allocate a bunch of strings in `Relation::Merger`
Sean Griffin
2015-09-02
1
-4
/
+8
*
Fix regression caused by a01d164b
Rafael Mendonça França
2015-07-07
1
-2
/
+2
*
Fix the shadowing warning for `reflection`
Roque Pinel
2015-05-28
1
-2
/
+2
*
Properly append preload / includes args on Merger
Washington Luiz
2015-05-28
1
-1
/
+23
*
Remove redundant require 'set' lines
Mehmet Emin İNAÇ
2015-05-15
1
-1
/
+0
*
Move the `from` bind logic to a `FromClause` class
Sean Griffin
2015-01-26
1
-4
/
+2
*
Remove `Relation#bind_values=`
Sean Griffin
2015-01-26
1
-3
/
+4
*
`Relation#Merger` can merge all clause methods
Sean Griffin
2015-01-25
1
-3
/
+11
*
Move where merging logic over to `WhereClause`
Sean Griffin
2015-01-25
1
-39
/
+2
*
Don't duplicate `Relation::VALUE_METHODS` in `Relation::Merger`
Sean Griffin
2015-01-24
1
-2
/
+1
*
Inject the `PredicateBuilder` into the `Relation` instance
Sean Griffin
2014-12-26
1
-1
/
+1
*
Remove the unused second argument to `substitute_at`
Sean Griffin
2014-11-17
1
-12
/
+0
*
Remove unneccessary default values from relation merger
Sean Griffin
2014-10-28
1
-2
/
+2
*
Call value methods when merging relations, rather than accessing keys
Sean Griffin
2014-10-28
1
-14
/
+14
*
[ci skip] Make merge method nodoc
Anshul Sharma
2014-10-20
1
-8
/
+1
*
[ci skip] merge docs
Anshul Sharma
2014-10-20
1
-0
/
+7
*
Make filter_binds filter out symbols that are equal to strings
Nat Budin
2014-05-14
1
-1
/
+1
*
select! renamed to avoid name collision Array#select!
Earl J St Sauver
2014-04-21
1
-1
/
+9
*
Build the reverse_order on its proper method.
Lauro Caetano
2014-04-07
1
-1
/
+0
*
stuff the join dependency object in the "anything goes" hash.
Aaron Patterson
2013-10-10
1
-1
/
+1
*
Relation#merge should not lose readonly(false) flag.
thedarkone
2013-09-11
1
-1
/
+5
*
Don't create fibers just to iterate
Nicholas Jakobsen
2013-08-30
1
-3
/
+3
*
add a specific factory method rather than using new
Aaron Patterson
2013-07-23
1
-1
/
+1
*
reorder bind parameters when merging relations
Aaron Patterson
2013-07-15
1
-2
/
+18
*
Typo fix [skip ci]
Ankit Gupta
2013-07-12
1
-1
/
+1
*
Simplify/fix implementation of default scopes
Jon Leighton
2013-06-28
1
-4
/
+0
*
avoid creating a set if no where values are removed
Aaron Patterson
2013-05-21
1
-0
/
+2
*
remove bind values for where clauses that were removed
Aaron Patterson
2013-05-21
1
-9
/
+8
*
push partitioning up so bind elimination can get the removed wheres
Aaron Patterson
2013-05-21
1
-5
/
+3
*
push partion logic down and initialization logic up
Aaron Patterson
2013-05-21
1
-15
/
+11
*
partition the where values so we can access the removed ones
Aaron Patterson
2013-05-20
1
-1
/
+6
*
eliminate some conditionals
Aaron Patterson
2013-05-20
1
-3
/
+3
*
change method name to reflect what it actually does.
Aaron Patterson
2013-05-20
1
-2
/
+2
[next]