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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:brynary/arel	Emilio Tagua	2010-05-27	1	-8/+8
\|\
\| *	Whitespace fixes	Bryan Helmkamp	2010-05-26	1	-8/+8
\| \|
* \|	Fix tests to work properly on Ruby 1.9, honor multiple calls to #order in ↵	Ernie Miller	2010-05-21	1	-1/+1
\|/ \| \| \|	memory engine, and make having clauses behave like where clauses in SQL engine (join with AND, allow multiple calls to having to add predicates)
*	Inequality shouldn't descend from equality, due to Rails type checks, and ↵	Ernie Miller	2010-05-07	1	-1/+1
\| \| \| \|	resolve conflicts from rebase
*	Support predicate complements and alternate not syntax (overload BasicObject#!)	Ernie Miller	2010-05-07	1	-20/+19
\|
*	Tests for notmatches and notin, and fixes for issues found in tests	Ernie Miller	2010-05-07	1	-3/+50
\|
*	Rename Attribute Not -> Inequality and add a Not predicate (complement)	Ernie Miller	2010-05-07	1	-1/+1
\|
*	Added NotMatch and NotIn predicates, made Not derive from Equality (reverted ↵	Ernie Miller	2010-05-07	1	-1/+11
\| \| \| \|	later)
*	Create an Arel::Header class representing a relation's attributes	Carl Lerche	2010-04-02	1	-3/+6
\|
*	Restrictions should be able to contain multiple predicates.	Carl Lerche	2010-03-23	1	-1/+1
\|
*	Switch Arel::Relation to a module. This will allow for classes with Relation ↵	Carl Lerche	2010-03-22	3	-3/+5
\| \| \| \|	extended on them to represent relations themselves (as opposed to their instances being relations).
*	Add support for a NOT predicate	Carl Lerche	2010-03-12	1	-0/+6
\|
*	Attributes should be typed	Carl Lerche	2010-03-12	1	-3/+8
\|
*	Added "from" method, allowing to specify custom from clauses.	Emilio Tagua	2009-12-27	1	-0/+6
\|
*	Create Predicates module to match directory structure	Bryan Helmkamp	2009-09-30	1	-24/+26
\|
*	Moving a few stray SQL references in the memory engine code	Bryan Helmkamp	2009-05-17	1	-15/+0
\|
*	Whitespace	Bryan Helmkamp	2009-05-17	6	-21/+21
\|
*	initial implementation of cross-engine join	Bryan Helmkamp	2009-05-17	3	-3/+7
\| \| \| \| \| \| \|	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	3	-0/+12
\| \| \| \| \| \|	Conflicts: lib/arel/engines/memory/relations.rb
*	using in memory relations as results from sql relation	Nick Kallen	2009-05-17	3	-10/+2
\| \| \| \| \| \| \|	Conflicts: lib/arel/algebra/primitives/expression.rb lib/arel/algebra/relations/relation.rb
*	performing in memory joins	Nick Kallen	2009-05-17	1	-0/+21
\|
*	recursive memory operations now possible	Bryan Helmkamp	2009-05-17	6	-6/+24
\| \| \| \| \| \|	Conflicts: lib/arel/algebra/relations/relation.rb
*	most in memory operations save join and group	Bryan Helmkamp	2009-05-17	4	-0/+53
\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/arel/algebra/extensions/object.rb lib/arel/algebra/primitives/value.rb lib/arel/engines/memory/relations.rb lib/arel/engines/sql/formatters.rb lib/arel/engines/sql/primitives.rb spec/arel/unit/relations/alias_spec.rb spec/arel/unit/relations/array_spec.rb spec/arel/unit/relations/order_spec.rb
*	consolidated files	Bryan Helmkamp	2009-05-17	6	-31/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/arel/algebra/predicates.rb lib/arel/algebra/relations/writes/delete.rb lib/arel/algebra/relations/writes/insert.rb lib/arel/algebra/relations/writes/update.rb lib/arel/engines/memory/predicates.rb lib/arel/engines/memory/relations.rb lib/arel/engines/sql/primitives/attribute.rb lib/arel/engines/sql/relations/writes/insert.rb lib/arel/engines/sql/relations/writes/update.rb
*	reorganized file structures	Bryan Helmkamp	2009-05-17	8	-0/+116
	Conflicts: lib/arel.rb lib/arel/arel.rb lib/arel/engines/memory/predicates.rb lib/arel/engines/memory/relations/array.rb lib/arel/engines/sql/relations/table.rb