arel 3.0.3 → 4.0.0.beta1

data/lib/arel/nodes/table_alias.rb

@@ -12,6 +12,10 @@ module Arel
       def table_name
         relation.respond_to?(:name) ? relation.name : name
       end
+
+      def engine
+        relation.engine
+      end
     end
   end
 end

data/lib/arel/nodes/terminal.rb

@@ -1,6 +1,13 @@
 module Arel
   module Nodes
     class Distinct < Arel::Nodes::Node
+      def hash
+        self.class.hash
+      end
+
+      def eql? other
+        self.class == other.class
+      end
     end
   end
 end

data/lib/arel/nodes/true.rb

@@ -1,6 +1,13 @@
 module Arel
   module Nodes
     class True < Arel::Nodes::Node
+      def hash
+        self.class.hash
+      end
+
+      def eql? other
+        self.class == other.class
+      end
     end
   end
 end

data/lib/arel/nodes/unary.rb

@@ -7,12 +7,21 @@ module Arel
       def initialize expr
         @expr = expr
       end
+
+      def hash
+        @expr.hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+          self.expr == other.expr
+      end
+      alias :== :eql?
     end
 
     %w{
       Bin
       Group
-      Grouping
       Having
       Limit
       Not

data/lib/arel/nodes/update_statement.rb

@@ -18,6 +18,21 @@ module Arel
         @wheres = @wheres.clone
         @values = @values.clone
       end
+
+      def hash
+        [@relation, @wheres, @values, @orders, @limit, @key].hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+          self.relation == other.relation &&
+          self.wheres == other.wheres &&
+          self.values == other.values &&
+          self.orders == other.orders &&
+          self.limit == other.limit &&
+          self.key == other.key
+      end
+      alias :== :eql?
     end
   end
 end

data/lib/arel/nodes/window.rb

@@ -17,7 +17,6 @@ module Arel
       end
 
       def frame(expr)
-        raise ArgumentError, "Window frame cannot be set more than once" if @frame
         @framing = expr
       end
 
@@ -33,6 +32,17 @@ module Arel
         super
         @orders = @orders.map { |x| x.clone }
       end
+
+      def hash
+        [@orders, @framing].hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+          self.orders == other.orders &&
+          self.framing == other.framing
+      end
+      alias :== :eql?
     end
 
     class NamedWindow < Window
@@ -47,6 +57,15 @@ module Arel
         super
         @name = other.name.clone
       end
+
+      def hash
+        super ^ @name.hash
+      end
+
+      def eql? other
+        super && self.name == other.name
+      end
+      alias :== :eql?
     end
 
     class Rows < Unary
@@ -61,7 +80,15 @@ module Arel
       end
     end
 
-    class CurrentRow < Arel::Nodes::Node; end
+    class CurrentRow < Node
+      def hash
+        self.class.hash
+      end
+
+      def eql? other
+        self.class == other.class
+      end
+    end
 
     class Preceding < Unary
       def initialize(expr = nil)
@@ -75,4 +102,4 @@ module Arel
       end
     end
   end
-end
+end

data/lib/arel/select_manager.rb

@@ -141,6 +141,10 @@ module Arel
       self
     end
 
+    def projections
+      @ctx.projections
+    end
+
     def projections= projections
       @ctx.projections = projections
     end

data/lib/arel/table.rb

@@ -123,6 +123,19 @@ Arel 4.0.0 with no replacement.  PEW PEW PEW!!!
       InsertManager.new(@engine)
     end
 
+    def hash
+      [@name, @engine, @aliases, @table_alias].hash
+    end
+
+    def eql? other
+      self.class == other.class &&
+        self.name == other.name &&
+        self.engine == other.engine &&
+        self.aliases == other.aliases &&
+        self.table_alias == other.table_alias
+    end
+    alias :== :eql?
+
     private
 
     def attributes_for columns

data/lib/arel/tree_manager.rb

@@ -1,7 +1,5 @@
 module Arel
   class TreeManager
-    # FIXME: Remove this.
-    include Arel::Relation
     include Arel::FactoryMethods
 
     attr_reader :ast, :engine

data/lib/arel/visitors/bind_visitor.rb

@@ -12,6 +12,15 @@ module Arel
       end
 
       private
+
+      def visit_Arel_Nodes_Assignment o
+        if o.right.is_a? Arel::Nodes::BindParam
+          "#{visit o.left} = #{visit o.right}"
+        else
+          super
+        end
+      end
+
       def visit_Arel_Nodes_BindParam o
         if @block
           @block.call
@@ -19,6 +28,7 @@ module Arel
           super
         end
       end
+      
     end
   end
 end

data/lib/arel/visitors/dot.rb

@@ -65,7 +65,6 @@ module Arel
         visit_edge o, "expr"
       end
       alias :visit_Arel_Nodes_Group             :unary
-      alias :visit_Arel_Nodes_BindParam         :unary
       alias :visit_Arel_Nodes_Grouping          :unary
       alias :visit_Arel_Nodes_Having            :unary
       alias :visit_Arel_Nodes_Limit             :unary
@@ -195,6 +194,7 @@ module Arel
       alias :visit_TrueClass :visit_String
       alias :visit_FalseClass :visit_String
       alias :visit_Arel_SqlLiteral :visit_String
+      alias :visit_Arel_Nodes_BindParam :visit_String
       alias :visit_Fixnum :visit_String
       alias :visit_BigDecimal :visit_String
       alias :visit_Float :visit_String

data/lib/arel/visitors/oracle.rb

@@ -25,9 +25,8 @@ module Arel
               SELECT * FROM (
                 SELECT raw_sql_.*, rownum raw_rnum_
                 FROM (#{sql}) raw_sql_
-                WHERE rownum <= #{offset.expr.to_i + limit}
               )
-              WHERE #{visit offset}
+              WHERE raw_rnum_ >= #{offset.expr.to_i + 1 } and rownum <= #{limit}
           eosql
         end
 

data/lib/arel/visitors/to_sql.rb

@@ -4,6 +4,55 @@ require 'date'
 module Arel
   module Visitors
     class ToSql < Arel::Visitors::Visitor
+      ##
+      # This is some roflscale crazy stuff.  I'm roflscaling this because
+      # building SQL queries is a hotspot.  I will explain the roflscale so that
+      # others will not rm this code.
+      #
+      # In YARV, string literals in a method body will get duped when the byte
+      # code is executed.  Let's take a look:
+      #
+      # > puts RubyVM::InstructionSequence.new('def foo; "bar"; end').disasm
+      #
+      #   == disasm: <RubyVM::InstructionSequence:foo@<compiled>>=====
+      #    0000 trace            8
+      #    0002 trace            1
+      #    0004 putstring        "bar"
+      #    0006 trace            16
+      #    0008 leave
+      #
+      # The `putstring` bytecode will dup the string and push it on the stack.
+      # In many cases in our SQL visitor, that string is never mutated, so there
+      # is no need to dup the literal.
+      #
+      # If we change to a constant lookup, the string will not be duped, and we
+      # can reduce the objects in our system:
+      #
+      # > puts RubyVM::InstructionSequence.new('BAR = "bar"; def foo; BAR; end').disasm
+      #
+      #  == disasm: <RubyVM::InstructionSequence:foo@<compiled>>========
+      #  0000 trace            8
+      #  0002 trace            1
+      #  0004 getinlinecache   11, <ic:0>
+      #  0007 getconstant      :BAR
+      #  0009 setinlinecache   <ic:0>
+      #  0011 trace            16
+      #  0013 leave
+      #
+      # `getconstant` should be a hash lookup, and no object is duped when the
+      # value of the constant is pushed on the stack.  Hence the crazy
+      # constants below.
+
+      WHERE    = ' WHERE '    # :nodoc:
+      SPACE    = ' '          # :nodoc:
+      COMMA    = ', '         # :nodoc:
+      GROUP_BY = ' GROUP BY ' # :nodoc:
+      ORDER_BY = ' ORDER BY ' # :nodoc:
+      WINDOW   = ' WINDOW '   # :nodoc:
+      AND      = ' AND '      # :nodoc:
+
+      DISTINCT = 'DISTINCT'   # :nodoc:
+
       attr_accessor :last_column
 
       def initialize connection
@@ -23,7 +72,7 @@ module Arel
       def visit_Arel_Nodes_DeleteStatement o
         [
           "DELETE FROM #{visit o.relation}",
-          ("WHERE #{o.wheres.map { |x| visit x }.join ' AND '}" unless o.wheres.empty?)
+          ("WHERE #{o.wheres.map { |x| visit x }.join AND}" unless o.wheres.empty?)
         ].compact.join ' '
       end
 
@@ -116,28 +165,80 @@ key on UpdateManager using UpdateManager#key=
       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),
-          (visit(o.offset) if o.offset),
-          (visit(o.lock) if o.lock),
-        ].compact.join ' '
+        str = ''
+
+        if o.with
+          str << visit(o.with)
+          str << SPACE
+        end
+
+        o.cores.each { |x| str << visit_Arel_Nodes_SelectCore(x) }
+
+        unless o.orders.empty?
+          str << SPACE
+          str << ORDER_BY
+          len = o.orders.length - 1
+          o.orders.each_with_index { |x, i|
+            str << visit(x)
+            str << COMMA unless len == i
+          }
+        end
+
+        str << " #{visit(o.limit)}" if o.limit
+        str << " #{visit(o.offset)}" if o.offset
+        str << " #{visit(o.lock)}" if o.lock
+
+        str.strip!
+        str
       end
 
       def visit_Arel_Nodes_SelectCore o
-        [
-          "SELECT",
-          (visit(o.top) if o.top),
-          (visit(o.set_quantifier) if o.set_quantifier),
-          ("#{o.projections.map { |x| visit x }.join ', '}" unless o.projections.empty?),
-          ("FROM #{visit(o.source)}" if o.source && !o.source.empty?),
-          ("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),
-          ("WINDOW #{o.windows.map { |x| visit x }.join ', ' }" unless o.windows.empty?)
-        ].compact.join ' '
+        str = "SELECT"
+
+        str << " #{visit(o.top)}"            if o.top
+        str << " #{visit(o.set_quantifier)}" if o.set_quantifier
+
+        unless o.projections.empty?
+          str << SPACE
+          len = o.projections.length - 1
+          o.projections.each_with_index do |x, i|
+            str << visit(x)
+            str << COMMA unless len == i
+          end
+        end
+
+        str << " FROM #{visit(o.source)}" if o.source && !o.source.empty?
+
+        unless o.wheres.empty?
+          str << WHERE
+          len = o.wheres.length - 1
+          o.wheres.each_with_index do |x, i|
+            str << visit(x)
+            str << AND unless len == i
+          end
+        end
+
+        unless o.groups.empty?
+          str << GROUP_BY
+          len = o.groups.length - 1
+          o.groups.each_with_index do |x, i|
+            str << visit(x)
+            str << COMMA unless len == i
+          end
+        end
+
+        str << " #{visit(o.having)}" if o.having
+
+        unless o.windows.empty?
+          str << WINDOW
+          len = o.windows.length - 1
+          o.windows.each_with_index do |x, i|
+            str << visit(x)
+            str << COMMA unless len == i
+          end
+        end
+
+        str
       end
 
       def visit_Arel_Nodes_Bin o
@@ -145,7 +246,7 @@ key on UpdateManager using UpdateManager#key=
       end
 
       def visit_Arel_Nodes_Distinct o
-        'DISTINCT'
+        DISTINCT
       end
 
       def visit_Arel_Nodes_DistinctOn o
@@ -254,6 +355,10 @@ key on UpdateManager using UpdateManager#key=
         "(#{visit o.expr})"
       end
 
+      def visit_Arel_SelectManager o
+        "(#{o.to_sql.rstrip})"
+      end
+
       def visit_Arel_Nodes_Ascending o
         "#{visit o.expr} ASC"
       end
@@ -283,22 +388,22 @@ key on UpdateManager using UpdateManager#key=
       end
 
       def visit_Arel_Nodes_Sum o
-        "SUM(#{o.expressions.map { |x|
+        "SUM(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
           visit x }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
       end
 
       def visit_Arel_Nodes_Max o
-        "MAX(#{o.expressions.map { |x|
+        "MAX(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
           visit x }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
       end
 
       def visit_Arel_Nodes_Min o
-        "MIN(#{o.expressions.map { |x|
+        "MIN(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
           visit x }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
       end
 
       def visit_Arel_Nodes_Avg o
-        "AVG(#{o.expressions.map { |x|
+        "AVG(#{o.distinct ? 'DISTINCT ' : ''}#{o.expressions.map { |x|
           visit x }.join(', ')})#{o.alias ? " AS #{visit o.alias}" : ''}"
       end
 
@@ -350,7 +455,12 @@ key on UpdateManager using UpdateManager#key=
       end
 
       def visit_Arel_Nodes_InnerJoin o
-        "INNER JOIN #{visit o.left} #{visit o.right if o.right}"
+        s = "INNER JOIN #{visit o.left}"
+        if o.right
+          s << SPACE
+          s << visit(o.right)
+        end
+        s
       end
 
       def visit_Arel_Nodes_On o
@@ -475,10 +585,11 @@ key on UpdateManager using UpdateManager#key=
       alias :visit_Arel_Nodes_Division       :visit_Arel_Nodes_InfixOperation
 
       def visit_Array o
-        o.empty? ? 'NULL' : o.map { |x| visit x }.join(', ')
+        o.map { |x| visit x }.join(', ')
       end
 
       def quote value, column = nil
+        return value if Arel::Nodes::SqlLiteral === value
         @connection.quote value, column
       end