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
*
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
*
save the where values in variables so we don't need to look them up all
Aaron Patterson
2013-05-20
1
-4
/
+5
*
pass where values to the helper function rather than rely on internal state
Aaron Patterson
2013-05-20
1
-4
/
+4
*
Extract JoinDependency#join_relation to DRY the repeated application of the #...
Ben Woosley
2013-05-10
1
-3
/
+1
*
extracted piece of code into a method
Neeraj Singh
2013-05-08
1
-13
/
+12
*
Remove warning
Carlos Antonio da Silva
2013-04-10
1
-2
/
+2
*
While merging relations preserve context for joins
Jared Armstrong and Neeraj Singh
2013-04-10
1
-2
/
+30
*
Prevent Relation#merge from collapsing wheres on the RHS
Jon Leighton
2013-01-27
1
-17
/
+19
*
performance improvements to joins!
Aaron Patterson
2012-10-12
1
-2
/
+12
*
Speed up relation merging by reducing calls to Array#-
Aaron Patterson
2012-10-12
1
-3
/
+5
*
Fix "last equality wins" logic in relation merge
Ernie Miller
2012-08-19
1
-10
/
+5
*
Fix merge error when Equality LHS is non-attribute
Ernie Miller
2012-08-17
1
-2
/
+5
*
load active_support/core_ext/object/blank in active_support/rails
Xavier Noria
2012-08-02
1
-1
/
+0
*
Add nodoc to HashMerger and Merger
Oscar Del Ben
2012-07-17
1
-2
/
+2
*
Relation#from to accept other Relation objects
Radoslav Stankov
2012-05-17
1
-1
/
+2
*
Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...
Jon Leighton
2012-05-05
1
-28
/
+3
*
Allow ActiveRecord::Relation merges to maintain context of joined associations
Jared Armstrong
2012-05-04
1
-3
/
+28
*
fix interpolation for hash merging
Jon Leighton
2012-04-25
1
-15
/
+24
*
allow merging a single where value
Jon Leighton
2012-04-25
1
-1
/
+1
*
now we can just manipulate the values hash in #only and #except
Jon Leighton
2012-04-13
1
-10
/
+1
*
remove apply_finder_options call from AssociationScope
Jon Leighton
2012-04-13
1
-1
/
+1
*
Make Relation#extending work like other value methods
Jon Leighton
2012-04-13
1
-3
/
+1
*
assert valid keys
Jon Leighton
2012-04-13
1
-0
/
+5
*
Allow Relation#merge to take a hash
Jon Leighton
2012-04-13
1
-44
/
+69
*
we have no need for the ASSOCIATION_METHODS constant
Jon Leighton
2012-04-13
1
-1
/
+1
*
refactoring
Jon Leighton
2012-04-13
1
-36
/
+45
*
Extract clusterfuck method for surgery
Jon Leighton
2012-04-13
1
-0
/
+84