aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relation/merging_test.rb
Commit message (Expand)AuthorAgeFilesLines
* improve error message when include assertions failMichael Grosser2016-09-161-3/+3
* modernizes hash syntax in activerecordXavier Noria2016-08-061-3/+3
* applies new string literal convention in activerecord/testXavier Noria2016-08-061-17/+17
* Properly include the `from` clause when merging relationsSean Griffin2016-01-141-0/+7
* Remove Relation#bind_paramsSean Griffin2015-01-271-2/+2
* Use an `Attribute` object to represent a bind valueSean Griffin2015-01-271-11/+0
* Remove all cases of manuallly wrapping `Arel::Nodes::Quoted`Sean Griffin2014-12-291-2/+2
* Inform Arel we don't need additional type casting in testsSean Griffin2014-12-261-2/+2
* Build fix when running in isolationArun Agrawal2014-11-141-0/+1
* Load :developers fixtures where expecting a Developer to be thereAkira Matsuda2014-09-051-1/+1
* "warning: assigned but unused variable"Akira Matsuda2014-08-211-1/+1
* Only merge scopes with zero arity in has_many throughAgis-2014-08-201-0/+13
* Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_masterRafael Mendonça França2014-05-141-0/+5
|\
| * Make filter_binds filter out symbols that are equal to stringsNat Budin2014-05-141-0/+5
|/
* Modify assert conditions not to be affectedYasuo Honda2014-05-121-2/+3
* remove the bind substitution visitor. to_sql should never return bind valuesAaron Patterson2014-04-091-3/+1
* 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