renamed strategy to formatter

3 files changed, 5 insertions, 5 deletions

diff --git a/lib/active_relation/extensions/array.rb b/lib/active_relation/extensions/array.rb
index 3b4246fb1c..5e2981a4c5 100644
--- a/lib/active_relation/extensions/array.rb
+++ b/lib/active_relation/extensions/array.rb
@@ -3,7 +3,7 @@ class Array
     Hash[*flatten]
   end
   
-  def to_sql(strategy = Sql::SelectExpression.new)
-    strategy.array self
+  def to_sql(formatter = Sql::SelectExpression.new)
+    formatter.array self
   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 ae3e48146f..133eab1026 100644
--- a/lib/active_relation/extensions/hash.rb
+++ b/lib/active_relation/extensions/hash.rb
@@ -9,7 +9,7 @@ class Hash
     end
   end
   
-  def to_sql(strategy = nil)
+  def to_sql(formatter = nil)
     '(' +
       inject([]) do |values, (key, value)|
         values << key.format(value)
diff --git a/lib/active_relation/extensions/object.rb b/lib/active_relation/extensions/object.rb
index 2682ed99fe..cd51543c91 100644
--- a/lib/active_relation/extensions/object.rb
+++ b/lib/active_relation/extensions/object.rb
@@ -3,8 +3,8 @@ class Object
     ActiveRelation::Value.new(self, relation)
   end
   
-  def to_sql(strategy = nil)
-    strategy.scalar self
+  def to_sql(formatter = nil)
+    formatter.scalar self
   end
   
   def metaclass