rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	use arel nodes to represent non-string `order_values`.	Yves Senn	2013-11-19	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a bug when merging relations of different classes. ``` Given: Post.joins(:author).merge(Author.order(name: :desc)).to_sql Before: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "posts"."name" DESC After: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "authors"."name" DESC ```
*	Address test_merging_where_relations failure by adding `order("posts.id")`	Yasuo Honda	2013-11-18	1	-1/+1
\|
*	fix weird Emacs auto indentation. [ci skip]	Yves Senn	2013-11-13	1	-8/+8
\|
*	tests for merging Relations of different classes.	Yves Senn	2013-11-13	1	-0/+19
\|
*	move Relation#merge tests into separate file.	Yves Senn	2013-11-13	1	-0/+131