refactor to_sql so it does not depend on the to_sql implementation of

the connection

1 files changed, 11 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 612f376c55..4e86e905ed 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -502,12 +502,19 @@ module ActiveRecord
     #   # => SELECT "users".* FROM "users"  WHERE "users"."name" = 'Oscar'
     def to_sql
       @to_sql ||= begin
+                    relation   = self
+                    connection = klass.connection
+                    visitor    = connection.visitor
+
                     if eager_loading?
                       join_dependency = construct_join_dependency
-                      relation = construct_relation_for_association_find(join_dependency)
-                      klass.connection.to_sql(relation.arel, relation.bind_values)
-                    else
-                      klass.connection.to_sql(arel, bind_values.dup)
+                      relation        = construct_relation_for_association_find(join_dependency)
+                    end
+
+                    ast   = relation.arel.ast
+                    binds = relation.bind_values.dup
+                    visitor.accept(ast) do
+                      connection.quote(*binds.shift.reverse)
                     end
                   end
     end