aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relation/merging_test.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into set_bindsAaron Patterson2014-01-141-2/+2
|\
* | where uses bind values so we don't need to manually create themAaron Patterson2014-01-141-11/+3
* | remove test that does not apply anymoreAaron Patterson2014-01-141-12/+1
|/
* use arel nodes to represent non-string `order_values`.Yves Senn2013-11-191-0/+12
* Address test_merging_where_relations failure by adding `order("posts.id")`Yasuo Honda2013-11-181-1/+1
* fix weird Emacs auto indentation. [ci skip]Yves Senn2013-11-131-8/+8
* tests for merging Relations of different classes.Yves Senn2013-11-131-0/+19
* move Relation#merge tests into separate file.Yves Senn2013-11-131-0/+131