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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Modify assert conditions not to be affected	Yasuo Honda	2014-05-12	1	-2/+3
\| \| \| \|	by each database bind variable naming conventions
*	remove the bind substitution visitor. to_sql should never return bind values	Aaron Patterson	2014-04-09	1	-3/+1
\|
*	Merge branch 'master' into set_binds	Aaron Patterson	2014-01-14	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: rm dup code Conflicts: activerecord/test/cases/relations_test.rb
* \|	where uses bind values so we don't need to manually create them	Aaron Patterson	2014-01-14	1	-11/+3
\| \|
* \|	remove test that does not apply anymore	Aaron Patterson	2014-01-14	1	-12/+1
\|/
*	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