From ec998ae9a6aeda09ad64bb94a50ac8b9fccd246d Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 27 Sep 2010 11:32:04 -0700
Subject: using the last seen column for quoting

---
 lib/arel/visitors/to_sql.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/arel')

diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index b9379da8cc..deb087b390 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -6,11 +6,13 @@ module Arel
       def initialize engine
         @engine         = engine
         @connection     = nil
+        @last_column    = []
         @quoted_tables  = {}
         @quoted_columns = {}
       end
 
       def accept object
+        @last_column = []
         @engine.connection_pool.with_connection do |conn|
           @connection = conn
           visit object
@@ -226,6 +228,7 @@ module Arel
       end
 
       def visit_Arel_Attributes_Attribute o
+        @last_column.push o.column
         join_name = o.relation.table_alias || o.relation.name
         "#{quote_table_name join_name}.#{quote_column_name o.name}"
       end
@@ -238,7 +241,7 @@ module Arel
       alias :visit_Arel_Nodes_SqlLiteral :visit_Fixnum
       alias :visit_Arel_SqlLiteral :visit_Fixnum # This is deprecated
 
-      def visit_String o; quote(o) end
+      def visit_String o; quote(o, @last_column.pop) end
 
       alias :visit_ActiveSupport_Multibyte_Chars :visit_String
       alias :visit_BigDecimal :visit_String
-- 
cgit v1.2.3