scalars are now lifted; the heavy lifting is done by the operations on relation (select, join, etc.)

4 files changed, 12 insertions, 27 deletions

diff --git a/lib/active_relation/extensions/array.rb b/lib/active_relation/extensions/array.rb
index 5b6d6d6abd..aa4354a78a 100644
--- a/lib/active_relation/extensions/array.rb
+++ b/lib/active_relation/extensions/array.rb
@@ -2,4 +2,8 @@ class Array
   def to_hash
     Hash[*flatten]
   end
+
+  def to_sql(strategy = nil)
+    "(#{collect(&:to_sql).join(', ')})"
+  end
 end
\ No newline at end of file
diff --git a/lib/active_relation/extensions/class.rb b/lib/active_relation/extensions/class.rb
deleted file mode 100644
index 72b3bf0c15..0000000000
--- a/lib/active_relation/extensions/class.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Class
-  def memoize(method)
-    define_method "#{method}_with_memoization" do |*args|
-    end
-    alias_method_chain method, :memoization
-  end
-end
\ No newline at end of file
diff --git a/lib/active_relation/extensions/hash.rb b/lib/active_relation/extensions/hash.rb
index 50864912bf..a33ace5738 100644
--- a/lib/active_relation/extensions/hash.rb
+++ b/lib/active_relation/extensions/hash.rb
@@ -1,11 +1,11 @@
 class Hash
-  def alias(&block)
-    inject({}) do |aliased, (key, value)|
-      aliased.merge(yield(key) => value)
-    end
+  def bind(relation)
+    descend { |x| x.bind(relation) }
   end
   
-  def to_sql(strategy = nil)
-    "(#{values.collect(&:to_sql).join(', ')})"
+  def descend(&block)
+    inject({}) do |descendent, (key, value)|
+      descendent.merge(yield(key) => yield(value))
+    end
   end
 end
\ No newline at end of file
diff --git a/lib/active_relation/extensions/object.rb b/lib/active_relation/extensions/object.rb
index b0c7ada999..d13cf9aabb 100644
--- a/lib/active_relation/extensions/object.rb
+++ b/lib/active_relation/extensions/object.rb
@@ -1,18 +1,6 @@
-class Object
-  def qualify
-    self
-  end
-  
+class Object  
   def bind(relation)
-    self
-  end
-  
-  def to_sql(strategy = self.strategy)
-    strategy.scalar self
-  end
-  
-  def strategy
-    ActiveRelation::Sql::Scalar.new(ActiveRelation::Table.engine)
+    ActiveRelation::Scalar.new(self, relation)
   end
   
   def metaclass