From 4e3c9a01307339916f6b947d24f19b0f442afd78 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Sun, 17 May 2009 14:58:46 -0400
Subject: most in memory operations save join and group

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
---
 spec/arel/unit/relations/alias_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/arel/unit/relations/alias_spec.rb')

diff --git a/spec/arel/unit/relations/alias_spec.rb b/spec/arel/unit/relations/alias_spec.rb
index 570f315892..63c15cfeff 100644
--- a/spec/arel/unit/relations/alias_spec.rb
+++ b/spec/arel/unit/relations/alias_spec.rb
@@ -30,7 +30,7 @@ module Arel
               FROM `users`
               WHERE `users`.`id` = 1
               GROUP BY `users`.`id`
-              ORDER BY `users`.`id`
+              ORDER BY `users`.`id` ASC
             })
           end
 
@@ -40,7 +40,7 @@ module Arel
               FROM "users"
               WHERE "users"."id" = 1
               GROUP BY "users"."id"
-              ORDER BY "users"."id"
+              ORDER BY "users"."id" ASC
             })
           end
         end
-- 
cgit v1.2.3