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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote branch 'miloops/master' into miloops	Bryan Helmkamp	2009-09-20	33	-49/+66
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: spec/connections/mysql_connection.rb spec/connections/postgresql_connection.rb spec/connections/sqlite3_connection.rb
\| *	Use load path rather than relative path for spec_helper requires. Also fixes ↵	Jeremy Kemper	2009-09-14	33	-33/+33
\| \| \| \| \| \| \| \|	specs on Ruby 1.9 since . is no longer in the load path.
\| *	Allow SQL strings to insert query. Insert should better return engine's result.	Emilio Tagua	2009-07-01	2	-10/+9
\| \|
\| *	Build valid SQL query for SQLite3 and PostgreSQL when updating records with ↵	Emilio Tagua	2009-06-23	1	-6/+12
\| \| \| \| \| \| \| \|	limited conditions
\| *	Allow expressions on literal SQL fragments	Emilio Tagua	2009-05-28	1	-0/+12
\| \|
* \|	Bug fix: Don't use #delegate to declare delegations when intentionally ↵	Lee Bankewitz	2009-08-10	1	-0/+15
\|/ \| \| \| \| \|	delegating to nil This accounts for a behavior change after Rails 2.3
*	Adding SqlLiteral with spec for counts	Bryan Helmkamp	2009-05-19	1	-0/+23
\|
*	Expand sql engine CRUD specs	Bryan Helmkamp	2009-05-18	1	-5/+14
\|
*	Remvoing unused variable from spec	Bryan Helmkamp	2009-05-18	1	-1/+0
\|
*	Adding skeleton of spec for CRUD operations in Sql::Engine	Bryan Helmkamp	2009-05-17	1	-0/+36
\|
*	Moving SQL predicates spec to correct dir	Bryan Helmkamp	2009-05-17	1	-0/+65
\|
*	Added PostgreSQL to build	Bryan Helmkamp	2009-05-17	4	-10/+75
\|
*	Whitespace	Bryan Helmkamp	2009-05-17	18	-27/+27
\|
*	joining across engines in either direction	Bryan Helmkamp	2009-05-17	1	-11/+28
\| \| \| \| \| \|	Conflicts: spec/arel/engines/memory/integration/joins/cross_engine_spec.rb
*	initial implementation of cross-engine join	Bryan Helmkamp	2009-05-17	1	-0/+31
\| \| \| \| \| \| \|	Conflicts: lib/arel/engines/memory/relations/array.rb lib/arel/engines/sql/primitives.rb
*	basic implementation of in memory insertions	Bryan Helmkamp	2009-05-17	1	-0/+28
\| \| \| \| \| \|	Conflicts: lib/arel/engines/memory/relations.rb
*	performing in memory joins	Nick Kallen	2009-05-17	1	-0/+32
\|
*	better test ordering	Bryan Helmkamp	2009-05-17	6	-86/+145
\| \| \| \| \| \|	Conflicts: doc/TODO
*	recursive memory operations now possible	Bryan Helmkamp	2009-05-17	1	-26/+57
\| \| \| \| \| \|	Conflicts: lib/arel/algebra/relations/relation.rb
*	removed duplicates from sql tests	Bryan Helmkamp	2009-05-17	13	-553/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: spec/arel/engines/sql/unit/predicates/binary_spec.rb spec/arel/engines/sql/unit/predicates/equality_spec.rb spec/arel/engines/sql/unit/primitives/attribute_spec.rb spec/arel/engines/sql/unit/primitives/expression_spec.rb spec/arel/engines/sql/unit/relations/alias_spec.rb spec/arel/engines/sql/unit/relations/join_spec.rb spec/arel/engines/sql/unit/relations/project_spec.rb spec/arel/engines/sql/unit/relations/relation_spec.rb spec/arel/engines/sql/unit/relations/table_spec.rb spec/arel/engines/sql/unit/relations/where_spec.rb spec/arel/engines/sql/unit/session/session_spec.rb
*	reorganizing tests	Nick Kallen	2009-05-17	24	-0/+2280