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
---
 lib/arel/engines/sql/formatters.rb                   |  6 +++---
 lib/arel/engines/sql/primitives.rb                   | 14 ++++++++++++++
 lib/arel/engines/sql/relations/utilities/compound.rb |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'lib/arel/engines/sql')

diff --git a/lib/arel/engines/sql/formatters.rb b/lib/arel/engines/sql/formatters.rb
index f82ddf631f..bc5f0f7c64 100644
--- a/lib/arel/engines/sql/formatters.rb
+++ b/lib/arel/engines/sql/formatters.rb
@@ -47,9 +47,9 @@ module Arel
     class WhereClause < PassThrough
     end
 
-    class OrderClause < PassThrough
-      def attribute(attribute)
-        "#{quote_table_name(name_for(attribute.original_relation))}.#{quote_column_name(attribute.name)}"
+    class OrderClause < PassThrough      
+      def ordering(ordering)
+        "#{quote_table_name(name_for(ordering.attribute.original_relation))}.#{quote_column_name(ordering.attribute.name)} #{ordering.direction_sql}"
       end
     end
 
diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb
index 6f89723afe..9e9143ac0f 100644
--- a/lib/arel/engines/sql/primitives.rb
+++ b/lib/arel/engines/sql/primitives.rb
@@ -24,6 +24,20 @@ module Arel
       object.to_sql(Sql::Value.new(relation))
     end
   end
+  
+  class Ordering
+    def to_sql(formatter = Sql::OrderClause.new(relation))
+      formatter.ordering self
+    end
+  end
+  
+  class Ascending < Ordering
+    def direction_sql; 'ASC' end
+  end
+  
+  class Descending < Ordering
+    def direction_sql; 'DESC' end
+  end
 
   class Expression < Attribute
     def to_sql(formatter = Sql::SelectClause.new(relation))
diff --git a/lib/arel/engines/sql/relations/utilities/compound.rb b/lib/arel/engines/sql/relations/utilities/compound.rb
index 502bf8b01e..61df196d6e 100644
--- a/lib/arel/engines/sql/relations/utilities/compound.rb
+++ b/lib/arel/engines/sql/relations/utilities/compound.rb
@@ -1,6 +1,6 @@
 module Arel
   class Compound < Relation
-    delegate :table, :table_sql, :array, :to => :relation
+    delegate :table, :table_sql, :to => :relation
   end
 end
     
\ No newline at end of file
-- 
cgit v1.2.3