arel 2.0.10 → 2.1.0

data/lib/arel/tree_manager.rb

@@ -2,6 +2,7 @@ module Arel
   class TreeManager
     # FIXME: Remove this.
     include Arel::Relation
+    include Arel::FactoryMethods
 
     attr_accessor :visitor
     attr_reader :ast, :engine

data/lib/arel/update_manager.rb

@@ -11,6 +11,10 @@ module Arel
       self
     end
 
+    def key= key
+      @ast.key = key
+    end
+
     def order *expr
       @ast.orders = expr
       self

data/lib/arel/visitors.rb

@@ -10,6 +10,7 @@ require 'arel/visitors/join_sql'
 require 'arel/visitors/where_sql'
 require 'arel/visitors/order_clauses'
 require 'arel/visitors/dot'
+require 'arel/visitors/ibm_db'
 
 module Arel
   module Visitors
@@ -22,6 +23,7 @@ module Arel
       'oracle_enhanced' => Arel::Visitors::Oracle,
       'sqlite'          => Arel::Visitors::SQLite,
       'sqlite3'         => Arel::Visitors::SQLite,
+      'ibm_db'          => Arel::Visitors::IBM_DB,
     }
 
     ENGINE_VISITORS = Hash.new do |hash, engine|

data/lib/arel/visitors/depth_first.rb

@@ -28,6 +28,7 @@ module Arel
       def function o
         visit o.expressions
         visit o.alias
+        visit o.distinct
       end
       alias :visit_Arel_Nodes_Avg    :function
       alias :visit_Arel_Nodes_Exists :function
@@ -35,25 +36,28 @@ module Arel
       alias :visit_Arel_Nodes_Min    :function
       alias :visit_Arel_Nodes_Sum    :function
 
+      def visit_Arel_Nodes_NamedFunction o
+        visit o.name
+        visit o.expressions
+        visit o.distinct
+        visit o.alias
+      end
+
       def visit_Arel_Nodes_Count o
         visit o.expressions
         visit o.alias
         visit o.distinct
       end
 
-      def join o
-        visit o.left
-        visit o.right
-        visit o.constraint
+      def nary o
+        o.children.each { |child| visit child }
       end
-      alias :visit_Arel_Nodes_InnerJoin :join
-      alias :visit_Arel_Nodes_OuterJoin :join
+      alias :visit_Arel_Nodes_And :nary
 
       def binary o
         visit o.left
         visit o.right
       end
-      alias :visit_Arel_Nodes_And                :binary
       alias :visit_Arel_Nodes_As                 :binary
       alias :visit_Arel_Nodes_Assignment         :binary
       alias :visit_Arel_Nodes_Between            :binary
@@ -63,6 +67,8 @@ module Arel
       alias :visit_Arel_Nodes_GreaterThan        :binary
       alias :visit_Arel_Nodes_GreaterThanOrEqual :binary
       alias :visit_Arel_Nodes_In                 :binary
+      alias :visit_Arel_Nodes_JoinSource         :binary
+      alias :visit_Arel_Nodes_InnerJoin          :binary
       alias :visit_Arel_Nodes_LessThan           :binary
       alias :visit_Arel_Nodes_LessThanOrEqual    :binary
       alias :visit_Arel_Nodes_Matches            :binary
@@ -70,10 +76,14 @@ module Arel
       alias :visit_Arel_Nodes_NotIn              :binary
       alias :visit_Arel_Nodes_Or                 :binary
       alias :visit_Arel_Nodes_Ordering           :binary
-      alias :visit_Arel_Nodes_StringJoin         :binary
+      alias :visit_Arel_Nodes_OuterJoin          :binary
       alias :visit_Arel_Nodes_TableAlias         :binary
       alias :visit_Arel_Nodes_Values             :binary
 
+      def visit_Arel_Nodes_StringJoin o
+        visit o.left
+      end
+
       def visit_Arel_Attribute o
         visit o.relation
         visit o.name
@@ -120,7 +130,7 @@ module Arel
 
       def visit_Arel_Nodes_SelectCore o
         visit o.projections
-        visit o.froms
+        visit o.source
         visit o.wheres
         visit o.groups
         visit o.having

data/lib/arel/visitors/dot.rb

@@ -36,15 +36,7 @@ module Arel
       def visit_Arel_Nodes_TableAlias o
         visit_edge o, "name"
         visit_edge o, "relation"
-        visit_edge o, "columns"
-      end
-
-      def visit_Arel_Nodes_Sum o
-        visit_edge o, "expressions"
-        visit_edge o, "alias"
       end
-      alias :visit_Arel_Nodes_Max :visit_Arel_Nodes_Sum
-      alias :visit_Arel_Nodes_Avg :visit_Arel_Nodes_Sum
 
       def visit_Arel_Nodes_Count o
         visit_edge o, "expressions"
@@ -57,13 +49,11 @@ module Arel
 
       def visit_Arel_Nodes_StringJoin o
         visit_edge o, "left"
-        visit_edge o, "right"
       end
 
       def visit_Arel_Nodes_InnerJoin o
         visit_edge o, "left"
         visit_edge o, "right"
-        visit_edge o, "constraint"
       end
       alias :visit_Arel_Nodes_OuterJoin :visit_Arel_Nodes_InnerJoin
 
@@ -85,6 +75,24 @@ module Arel
       alias :visit_Arel_Nodes_Top               :unary
       alias :visit_Arel_Nodes_UnqualifiedColumn :unary
 
+      def function o
+        visit_edge o, "expressions"
+        visit_edge o, "distinct"
+        visit_edge o, "alias"
+      end
+      alias :visit_Arel_Nodes_Exists :function
+      alias :visit_Arel_Nodes_Min    :function
+      alias :visit_Arel_Nodes_Max    :function
+      alias :visit_Arel_Nodes_Avg    :function
+      alias :visit_Arel_Nodes_Sum    :function
+
+      def visit_Arel_Nodes_NamedFunction o
+        visit_edge o, "name"
+        visit_edge o, "expressions"
+        visit_edge o, "distinct"
+        visit_edge o, "alias"
+      end
+
       def visit_Arel_Nodes_InsertStatement o
         visit_edge o, "relation"
         visit_edge o, "columns"
@@ -92,7 +100,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_SelectCore o
-        visit_edge o, "froms"
+        visit_edge o, "source"
         visit_edge o, "projections"
         visit_edge o, "wheres"
       end
@@ -125,23 +133,32 @@ module Arel
       alias :visit_Arel_Attributes_Boolean :visit_Arel_Attribute
       alias :visit_Arel_Attributes_Attribute :visit_Arel_Attribute
 
-      def visit_Arel_Nodes_Equality o
+      def nary o
+        o.children.each_with_index do |x,i|
+          edge(i) { visit x }
+        end
+      end
+      alias :visit_Arel_Nodes_And :nary
+
+      def binary o
         visit_edge o, "left"
         visit_edge o, "right"
       end
-      alias :visit_Arel_Nodes_And                :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_Or                 :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_NotEqual           :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_GreaterThan        :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_GreaterThanOrEqual :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_Assignment         :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_In                 :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_LessThan           :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_LessThanOrEqual    :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_Between            :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_NotIn              :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_DoesNotMatch       :visit_Arel_Nodes_Equality
-      alias :visit_Arel_Nodes_Matches            :visit_Arel_Nodes_Equality
+      alias :visit_Arel_Nodes_As                 :binary
+      alias :visit_Arel_Nodes_Assignment         :binary
+      alias :visit_Arel_Nodes_Between            :binary
+      alias :visit_Arel_Nodes_DoesNotMatch       :binary
+      alias :visit_Arel_Nodes_Equality           :binary
+      alias :visit_Arel_Nodes_GreaterThan        :binary
+      alias :visit_Arel_Nodes_GreaterThanOrEqual :binary
+      alias :visit_Arel_Nodes_In                 :binary
+      alias :visit_Arel_Nodes_JoinSource         :binary
+      alias :visit_Arel_Nodes_LessThan           :binary
+      alias :visit_Arel_Nodes_LessThanOrEqual    :binary
+      alias :visit_Arel_Nodes_Matches            :binary
+      alias :visit_Arel_Nodes_NotEqual           :binary
+      alias :visit_Arel_Nodes_NotIn              :binary
+      alias :visit_Arel_Nodes_Or                 :binary
 
       def visit_String o
         @node_stack.last.fields << o

data/lib/arel/visitors/ibm_db.rb

@@ -0,0 +1,12 @@
+module Arel
+  module Visitors
+    class IBM_DB < Arel::Visitors::ToSql
+      private
+
+      def visit_Arel_Nodes_Limit o
+        "FETCH FIRST #{visit o.expr} ROWS ONLY"
+      end
+
+    end
+  end
+end

data/lib/arel/visitors/join_sql.rb

@@ -8,32 +8,11 @@ module Arel
     #
     # This visitor is used in SelectManager#join_sql and is for backwards
     # compatibility with Arel V1.0
-    class JoinSql < Arel::Visitors::ToSql
+    module JoinSql
       private
 
       def visit_Arel_Nodes_SelectCore o
-        [o.froms].grep(Nodes::Join).map { |x| visit x }.join ', '
-      end
-
-      def visit_Arel_Nodes_StringJoin o
-        [
-          (visit o.left if Nodes::Join === o.left),
-          visit(o.right)
-        ].compact.join ' '
-      end
-
-      def visit_Arel_Nodes_OuterJoin o
-        [
-          (visit o.left if Nodes::Join === o.left),
-          "LEFT OUTER JOIN #{visit o.right} #{visit o.constraint if o.constraint}"
-        ].compact.join ' '
-      end
-
-      def visit_Arel_Nodes_InnerJoin o
-        [
-          (visit o.left if Nodes::Join === o.left),
-          "INNER JOIN #{visit o.right} #{visit o.constraint if o.constraint}"
-        ].compact.join ' '
+        o.source.right.map { |j| visit j }.join ' '
       end
     end
   end

data/lib/arel/visitors/mssql.rb

@@ -3,6 +3,13 @@ module Arel
     class MSSQL < Arel::Visitors::ToSql
       private
 
+      def build_subselect key, o
+        stmt     = super
+        core     = stmt.cores.first
+        core.top = Nodes::Top.new(o.limit.expr) if o.limit
+        stmt
+      end
+
       def visit_Arel_Nodes_Limit o
         ""
       end

data/lib/arel/visitors/mysql.rb

@@ -2,6 +2,10 @@ module Arel
   module Visitors
     class MySQL < Arel::Visitors::ToSql
       private
+      def visit_Arel_Nodes_Bin o
+        "BINARY #{visit o.expr}"
+      end
+
       def visit_Arel_Nodes_Lock o
         visit o.expr
       end

data/lib/arel/visitors/oracle.rb

@@ -25,7 +25,7 @@ module Arel
               SELECT * FROM (
                 SELECT raw_sql_.*, rownum raw_rnum_
                 FROM (#{sql}) raw_sql_
-                WHERE rownum <= #{offset.value.to_i + limit}
+                WHERE rownum <= #{offset.expr.to_i + limit}
               )
               WHERE #{visit offset}
           eosql
@@ -58,7 +58,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_Offset o
-        "raw_rnum_ > #{visit o.value}"
+        "raw_rnum_ > #{visit o.expr}"
       end
 
       def visit_Arel_Nodes_Except o

data/lib/arel/visitors/postgresql.rb

@@ -6,25 +6,6 @@ module Arel
         visit o.expr
       end
 
-      def visit_Arel_Nodes_SelectStatement o
-        if !o.orders.empty? && using_distinct_on?(o)
-          subquery        = o.dup
-          subquery.orders = []
-          subquery.limit  = nil
-          subquery.offset = nil
-
-          sql = super(subquery)
-          [
-            "SELECT * FROM (#{sql}) AS id_list",
-            "ORDER BY #{aliased_orders(o.orders).join(', ')}",
-            (visit(o.limit) if o.limit),
-            (visit(o.offset) if o.offset),
-          ].compact.join ' '
-        else
-          super
-        end
-      end
-
       def visit_Arel_Nodes_Matches o
         "#{visit o.left} ILIKE #{visit o.right}"
       end
@@ -33,25 +14,8 @@ module Arel
         "#{visit o.left} NOT ILIKE #{visit o.right}"
       end
 
-      def using_distinct_on?(o)
-        o.cores.any? do |core|
-          core.projections.any? do |projection|
-            /DISTINCT ON/ === projection
-          end
-        end
-      end
-
-      def aliased_orders orders
-        #orders = o.orders.map { |x| visit x }.join(', ').split(',')
-        list = []
-        orders.each_with_index do |o,i|
-          list <<
-            [
-              "id_list.alias_#{i}",
-              (o.index(/desc/i) && 'DESC')
-            ].compact.join(' ')
-        end
-        list
+      def visit_Arel_Nodes_DistinctOn o
+        "DISTINCT ON ( #{visit o.expr} )"
       end
     end
   end

data/lib/arel/visitors/to_sql.rb

@@ -7,13 +7,16 @@ module Arel
       def initialize engine
         @engine         = engine
         @connection     = nil
+        @pool           = nil
+        @last_column    = nil
         @quoted_tables  = {}
         @quoted_columns = {}
       end
 
       def accept object
-        self.last_column = nil
-        @engine.connection_pool.with_connection do |conn|
+        @last_column = nil
+        @pool        = @engine.connection_pool
+        @pool.with_connection do |conn|
           @connection = conn
           super
         end
@@ -27,24 +30,39 @@ module Arel
         ].compact.join ' '
       end
 
+      # FIXME: we should probably have a 2-pass visitor for this
+      def build_subselect key, o
+        stmt             = Nodes::SelectStatement.new
+        core             = stmt.cores.first
+        core.froms       = o.relation
+        core.wheres      = o.wheres
+        core.projections = [key]
+        stmt.limit       = o.limit
+        stmt.orders      = o.orders
+        stmt
+      end
+
       def visit_Arel_Nodes_UpdateStatement o
         if o.orders.empty? && o.limit.nil?
           wheres = o.wheres
         else
-          stmt             = Nodes::SelectStatement.new
-          core             = stmt.cores.first
-          core.froms       = o.relation
-          core.projections = [o.relation.primary_key]
-          stmt.limit       = o.limit
-          stmt.orders      = o.orders
-
-          wheres = [Nodes::In.new(o.relation.primary_key, [stmt])]
+          key = o.key
+          unless key
+            warn(<<-eowarn) if $VERBOSE
+(#{caller.first}) Using UpdateManager without setting UpdateManager#key is
+deprecated and support will be removed in ARel 3.0.0.  Please set the primary
+key on UpdateManager using UpdateManager#key=
+            eowarn
+            key = o.relation.primary_key
+          end
+
+          wheres = [Nodes::In.new(key, [build_subselect(key, o)])]
         end
 
         [
           "UPDATE #{visit o.relation}",
           ("SET #{o.values.map { |value| visit value }.join ', '}" unless o.values.empty?),
-          ("WHERE #{wheres.map { |x| visit x }.join ' AND '}" unless wheres.empty?)
+          ("WHERE #{wheres.map { |x| visit x }.join ' AND '}" unless wheres.empty?),
         ].compact.join ' '
       end
 
@@ -53,26 +71,48 @@ module Arel
           "INSERT INTO #{visit o.relation}",
 
           ("(#{o.columns.map { |x|
-                quote_column_name x.name
-            }.join ', '})" unless o.columns.empty?),
+          quote_column_name x.name
+        }.join ', '})" unless o.columns.empty?),
 
           (visit o.values if o.values),
         ].compact.join ' '
       end
 
       def visit_Arel_Nodes_Exists o
-        "EXISTS (#{visit o.select_stmt})#{
+        "EXISTS (#{visit o.expressions})#{
           o.alias ? " AS #{visit o.alias}" : ''}"
       end
 
+      def table_exists? name
+        @pool.table_exists? name
+      end
+
+      def column_for attr
+        name    = attr.name.to_s
+        table   = attr.relation.table_name
+
+        return nil unless table_exists? table
+
+        column_cache[table][name]
+      end
+
+      def column_cache
+        @pool.columns_hash
+      end
+
       def visit_Arel_Nodes_Values o
-        "VALUES (#{o.expressions.zip(o.columns).map { |value, column|
-          quote(value, column && column.column)
+        "VALUES (#{o.expressions.zip(o.columns).map { |value, attr|
+          if Nodes::SqlLiteral === value
+            visit_Arel_Nodes_SqlLiteral value
+          else
+            quote(value, attr && column_for(attr))
+          end
         }.join ', '})"
       end
 
       def visit_Arel_Nodes_SelectStatement o
         [
+          (visit(o.with) if o.with),
           o.cores.map { |x| visit_Arel_Nodes_SelectCore x }.join,
           ("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
           (visit(o.limit) if o.limit),
@@ -85,14 +125,51 @@ module Arel
         [
           "SELECT",
           (visit(o.top) if o.top),
-          "#{o.projections.map { |x| visit x }.join ', '}",
-          ("FROM #{visit o.froms}" if o.froms),
+          (visit(o.set_quantifier) if o.set_quantifier),
+          ("#{o.projections.map { |x| visit x }.join ', '}" unless o.projections.empty?),
+          (visit(o.source) if o.source),
           ("WHERE #{o.wheres.map { |x| visit x }.join ' AND ' }" unless o.wheres.empty?),
           ("GROUP BY #{o.groups.map { |x| visit x }.join ', ' }" unless o.groups.empty?),
           (visit(o.having) if o.having),
         ].compact.join ' '
       end
 
+      def visit_Arel_Nodes_Bin o
+        visit o.expr
+      end
+
+      def visit_Arel_Nodes_Distinct o
+        'DISTINCT'
+      end
+
+      def visit_Arel_Nodes_DistinctOn o
+        raise NotImplementedError, 'DISTINCT ON not implemented for this db'
+      end
+
+      def visit_Arel_Nodes_With o
+        "WITH #{o.children.map { |x| visit x }.join(', ')}"
+      end
+
+      def visit_Arel_Nodes_WithRecursive o
+        "WITH RECURSIVE #{o.children.map { |x| visit x }.join(', ')}"
+      end
+
+      def visit_Arel_Nodes_Union o
+        "( #{visit o.left} UNION #{visit o.right} )"
+      end
+
+      def visit_Arel_Nodes_UnionAll o
+        "( #{visit o.left} UNION ALL #{visit o.right} )"
+      end
+
+      def visit_Arel_Nodes_Intersect o
+        "( #{visit o.left} INTERSECT #{visit o.right} )"
+      end
+
+      def visit_Arel_Nodes_Except o
+        "( #{visit o.left} EXCEPT #{visit o.right} )"
+      end
+
       def visit_Arel_Nodes_Having o
         "HAVING #{visit o.expr}"
       end
@@ -127,6 +204,12 @@ module Arel
         visit o.expr
       end
 
+      def visit_Arel_Nodes_NamedFunction o
+        "#{o.name}(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
+          visit x
+        }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
+      end
+
       def visit_Arel_Nodes_Count o
         "COUNT(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
           visit x
@@ -185,16 +268,26 @@ module Arel
         "#{visit o.left} NOT LIKE #{visit o.right}"
       end
 
+      def visit_Arel_Nodes_JoinSource o
+        return unless o.left || !o.right.empty?
+
+        [
+          "FROM",
+          (visit(o.left) if o.left),
+          o.right.map { |j| visit j }.join(' ')
+        ].compact.join ' '
+      end
+
       def visit_Arel_Nodes_StringJoin o
-        "#{visit o.left} #{visit o.right}"
+        visit o.left
       end
 
       def visit_Arel_Nodes_OuterJoin o
-        "#{visit o.left} LEFT OUTER JOIN #{visit o.right} #{visit o.constraint}"
+        "LEFT OUTER JOIN #{visit o.left} #{visit o.right}"
       end
 
       def visit_Arel_Nodes_InnerJoin o
-        "#{visit o.left} INNER JOIN #{visit o.right} #{visit o.constraint if o.constraint}"
+        "INNER JOIN #{visit o.left} #{visit o.right if o.right}"
       end
 
       def visit_Arel_Nodes_On o
@@ -205,22 +298,6 @@ module Arel
         "NOT (#{visit o.expr})"
       end
 
-      def visit_Arel_Nodes_Union o
-        "( #{visit o.left} UNION #{visit o.right} )"
-      end
-
-      def visit_Arel_Nodes_UnionAll o
-        "( #{visit o.left} UNION ALL #{visit o.right} )"
-      end
-
-      def visit_Arel_Nodes_Intersect o
-        "( #{visit o.left} INTERSECT #{visit o.right} )"
-      end
-
-      def visit_Arel_Nodes_Except o
-        "( #{visit o.left} EXCEPT #{visit o.right} )"
-      end
-
       def visit_Arel_Table o
         if o.table_alias
           "#{quote_table_name o.name} #{quote_table_name o.table_alias}"
@@ -230,15 +307,15 @@ module Arel
       end
 
       def visit_Arel_Nodes_In o
-      "#{visit o.left} IN (#{visit o.right})"
+        "#{visit o.left} IN (#{visit o.right})"
       end
 
       def visit_Arel_Nodes_NotIn o
-      "#{visit o.left} NOT IN (#{visit o.right})"
+        "#{visit o.left} NOT IN (#{visit o.right})"
       end
 
       def visit_Arel_Nodes_And o
-        "#{visit o.left} AND #{visit o.right}"
+        o.children.map { |x| visit x }.join ' AND '
       end
 
       def visit_Arel_Nodes_Or o
@@ -246,7 +323,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_Assignment o
-        right = quote(o.right, o.left.column)
+        right = quote(o.right, column_for(o.left))
         "#{visit o.left} = #{right}"
       end
 
@@ -279,7 +356,7 @@ module Arel
       end
 
       def visit_Arel_Attributes_Attribute o
-        self.last_column = o.column
+        @last_column = column_for o
         join_name = o.relation.table_alias || o.relation.name
         "#{quote_table_name join_name}.#{quote_column_name o.name}"
       end
@@ -290,34 +367,38 @@ module Arel
       alias :visit_Arel_Attributes_Time :visit_Arel_Attributes_Attribute
       alias :visit_Arel_Attributes_Boolean :visit_Arel_Attributes_Attribute
 
-      def visit_Fixnum o; o end
-      alias :visit_Arel_Nodes_SqlLiteral :visit_Fixnum
-      alias :visit_Arel_SqlLiteral :visit_Fixnum # This is deprecated
-      alias :visit_Bignum :visit_Fixnum
+      def literal o; o end
 
-      def visit_String o; quote(o, last_column) end
+      alias :visit_Arel_Nodes_SqlLiteral :literal
+      alias :visit_Arel_SqlLiteral       :literal # This is deprecated
+      alias :visit_Bignum                :literal
+      alias :visit_Fixnum                :literal
 
-      def last_column
-        Thread.current[:arel_visitors_to_sql_last_column]
-      end
+      def quoted o; quote(o, @last_column) end
+
+      alias :visit_ActiveSupport_Multibyte_Chars :quoted
+      alias :visit_ActiveSupport_StringInquirer  :quoted
+      alias :visit_BigDecimal                    :quoted
+      alias :visit_Class                         :quoted
+      alias :visit_Date                          :quoted
+      alias :visit_DateTime                      :quoted
+      alias :visit_FalseClass                    :quoted
+      alias :visit_Float                         :quoted
+      alias :visit_Hash                          :quoted
+      alias :visit_NilClass                      :quoted
+      alias :visit_String                        :quoted
+      alias :visit_Symbol                        :quoted
+      alias :visit_Time                          :quoted
+      alias :visit_TrueClass                     :quoted
 
-      def last_column= col
-        Thread.current[:arel_visitors_to_sql_last_column] = col
+      def visit_Arel_Nodes_InfixOperation o
+        "#{visit o.left} #{o.operator} #{visit o.right}"
       end
 
-      alias :visit_ActiveSupport_Multibyte_Chars :visit_String
-      alias :visit_BigDecimal :visit_String
-      alias :visit_Date :visit_String
-      alias :visit_DateTime :visit_String
-      alias :visit_FalseClass :visit_String
-      alias :visit_Float :visit_String
-      alias :visit_Hash :visit_String
-      alias :visit_Symbol :visit_String
-      alias :visit_Time :visit_String
-      alias :visit_TrueClass :visit_String
-      alias :visit_NilClass :visit_String
-      alias :visit_ActiveSupport_StringInquirer :visit_String
-      alias :visit_Class :visit_String
+      alias :visit_Arel_Nodes_Addition       :visit_Arel_Nodes_InfixOperation
+      alias :visit_Arel_Nodes_Subtraction    :visit_Arel_Nodes_InfixOperation
+      alias :visit_Arel_Nodes_Multiplication :visit_Arel_Nodes_InfixOperation
+      alias :visit_Arel_Nodes_Division       :visit_Arel_Nodes_InfixOperation
 
       def visit_Array o
         o.empty? ? 'NULL' : o.map { |x| visit x }.join(', ')
@@ -328,11 +409,11 @@ module Arel
       end
 
       def quote_table_name name
-        @quoted_tables[name] ||= @connection.quote_table_name(name)
+        @quoted_tables[name] ||= Arel::Nodes::SqlLiteral === name ? name : @connection.quote_table_name(name)
       end
 
       def quote_column_name name
-        @quoted_columns[name] ||= @connection.quote_column_name(name)
+        @quoted_columns[name] ||= Arel::Nodes::SqlLiteral === name ? name : @connection.quote_column_name(name)
       end
     end
   end