experimenting with strategy pattern rather than conditional; not as terse, nor transparent, but i still feel it's better

2 files changed, 3 insertions, 6 deletions

diff --git a/lib/active_relation/extensions/hash.rb b/lib/active_relation/extensions/hash.rb
index d9496df2e9..50864912bf 100644
--- a/lib/active_relation/extensions/hash.rb
+++ b/lib/active_relation/extensions/hash.rb
@@ -5,7 +5,7 @@ class Hash
     end
   end
   
-  def to_sql(options = {})
+  def to_sql(strategy = nil)
     "(#{values.collect(&:to_sql).join(', ')})"
   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 ea582d1ca1..2d43120f70 100644
--- a/lib/active_relation/extensions/object.rb
+++ b/lib/active_relation/extensions/object.rb
@@ -1,12 +1,9 @@
 class Object
-  include ActiveRelation::SqlBuilder
-  
   def qualify
     self
   end
   
-  def to_sql(options = {})
-    options.reverse_merge!(:quote => true)
-    options[:quote] ? quote(self) : self
+  def to_sql(strategy = ActiveRelation::Sql::Scalar.new)
+    strategy.scalar self
   end
 end
\ No newline at end of file