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

1 files changed, 6 insertions, 6 deletions

diff --git a/spec/arel/unit/relations/order_spec.rb b/spec/arel/unit/relations/order_spec.rb
index 31014ddd39..cb0f1de84c 100644
--- a/spec/arel/unit/relations/order_spec.rb
+++ b/spec/arel/unit/relations/order_spec.rb
@@ -16,7 +16,7 @@ module Arel
             sql.should be_like(%Q{
               SELECT `users`.`id`, `users`.`name`
               FROM `users`
-              ORDER BY `users`.`id`
+              ORDER BY `users`.`id` ASC
             })
           end
 
@@ -24,7 +24,7 @@ module Arel
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name"
               FROM "users"
-              ORDER BY "users"."id"
+              ORDER BY "users"."id" ASC
             })
           end
         end
@@ -42,7 +42,7 @@ module Arel
             sql.should be_like(%Q{
               SELECT `users`.`id`, `users`.`name`
               FROM `users`
-              ORDER BY `users`.`id`, `users`.`name`
+              ORDER BY `users`.`id` ASC, `users`.`name` ASC
             })
           end
 
@@ -50,7 +50,7 @@ module Arel
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name"
               FROM "users"
-              ORDER BY "users"."id", "users"."name"
+              ORDER BY "users"."id" ASC, "users"."name" ASC
             })
           end
         end
@@ -95,7 +95,7 @@ module Arel
             sql.should be_like(%Q{
               SELECT `users`.`id`, `users`.`name`
               FROM `users`
-              ORDER BY `users`.`name`, `users`.`id`
+              ORDER BY `users`.`name` ASC, `users`.`id` ASC
             })
           end
 
@@ -103,7 +103,7 @@ module Arel
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name"
               FROM "users"
-              ORDER BY "users"."name", "users"."id"
+              ORDER BY "users"."name" ASC, "users"."id" ASC
             })
           end
         end