arel 2.0.10 → 2.1.0

data/lib/arel/insert_manager.rb

@@ -27,8 +27,12 @@ module Arel
           @ast.columns << column
           values << value
         end
-        @ast.values = Nodes::Values.new values, @ast.columns
+        @ast.values = create_values values, @ast.columns
       end
     end
+
+    def create_values values, columns
+      Nodes::Values.new values, columns
+    end
   end
 end

data/lib/arel/math.rb

@@ -0,0 +1,19 @@
+module Arel
+  module Math
+    def *(other)
+      Arel::Nodes::Multiplication.new(self, other)
+    end
+
+    def +(other)
+      Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new(self, other))
+    end
+
+    def -(other)
+      Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+    end
+
+    def /(other)
+      Arel::Nodes::Division.new(self, other)
+    end
+  end
+end

data/lib/arel/nodes.rb

@@ -1,53 +1,43 @@
+# node
 require 'arel/nodes/node'
+require 'arel/nodes/select_statement'
+require 'arel/nodes/select_core'
+require 'arel/nodes/insert_statement'
+require 'arel/nodes/update_statement'
+
+# terminal
+
+require 'arel/nodes/terminal'
+
+# unary
 require 'arel/nodes/unary'
+require 'arel/nodes/unqualified_column'
+require 'arel/nodes/with'
+
+# binary
 require 'arel/nodes/binary'
 require 'arel/nodes/equality'
-require 'arel/nodes/between'
-require 'arel/nodes/not_equal'
-require 'arel/nodes/assignment'
-require 'arel/nodes/or'
-require 'arel/nodes/and'
-require 'arel/nodes/as'
-require 'arel/nodes/not'
-require 'arel/nodes/greater_than'
-require 'arel/nodes/greater_than_or_equal'
-require 'arel/nodes/less_than'
-require 'arel/nodes/less_than_or_equal'
-require 'arel/nodes/matches'
-require 'arel/nodes/does_not_match'
-
-require 'arel/nodes/in'
-require 'arel/nodes/not_in'
+require 'arel/nodes/in' # Why is this subclassed from equality?
+require 'arel/nodes/join_source'
 require 'arel/nodes/ordering'
-require 'arel/nodes/lock'
+require 'arel/nodes/delete_statement'
+require 'arel/nodes/table_alias'
+require 'arel/nodes/infix_operation'
+
+# nary
+require 'arel/nodes/and'
+
+# function
+# FIXME: Function + Alias can be rewritten as a Function and Alias node.
+# We should make Function a Unary node and deprecate the use of "aliaz"
 require 'arel/nodes/function'
 require 'arel/nodes/count'
 require 'arel/nodes/values'
-require 'arel/nodes/offset'
-require 'arel/nodes/limit'
-require 'arel/nodes/top'
-require 'arel/nodes/sum'
-require 'arel/nodes/exists'
-require 'arel/nodes/max'
-require 'arel/nodes/min'
-require 'arel/nodes/avg'
-require 'arel/nodes/having'
-require 'arel/nodes/sql_literal'
-require 'arel/nodes/select_core'
-require 'arel/nodes/select_statement'
-require 'arel/nodes/insert_statement'
-require 'arel/nodes/update_statement'
-require 'arel/nodes/delete_statement'
-require 'arel/nodes/unqualified_column'
-require 'arel/nodes/table_alias'
-require 'arel/nodes/join'
-require 'arel/nodes/group'
-require 'arel/nodes/grouping'
+require 'arel/nodes/named_function'
+
+# joins
 require 'arel/nodes/inner_join'
 require 'arel/nodes/outer_join'
 require 'arel/nodes/string_join'
-require 'arel/nodes/on'
-require 'arel/nodes/except'
-require 'arel/nodes/intersect'
-require 'arel/nodes/union'
-require 'arel/nodes/union_all'
+
+require 'arel/nodes/sql_literal'

data/lib/arel/nodes/and.rb

@@ -1,6 +1,23 @@
 module Arel
   module Nodes
-    class And < Arel::Nodes::Binary
+    class And < Arel::Nodes::Node
+      attr_reader :children
+
+      def initialize children, right = nil
+        unless Array === children
+          warn "(#{caller.first}) AND nodes should be created with a list"
+          children = [children, right]
+        end
+        @children = children
+      end
+
+      def left
+        children.first
+      end
+
+      def right
+        children[1]
+      end
     end
   end
 end

data/lib/arel/nodes/binary.rb

@@ -7,6 +7,34 @@ module Arel
         @left  = left
         @right = right
       end
+
+      def initialize_copy other
+        super
+        @left  = @left.clone if @left
+        @right = @right.clone if @right
+      end
+    end
+
+    %w{
+      As
+      Assignment
+      Between
+      DoesNotMatch
+      GreaterThan
+      GreaterThanOrEqual
+      Join
+      LessThan
+      LessThanOrEqual
+      Matches
+      NotEqual
+      NotIn
+      Or
+      Union
+      UnionAll
+      Intersect
+      Except
+    }.each do |name|
+      const_set name, Class.new(Binary)
     end
   end
 end

data/lib/arel/nodes/count.rb

@@ -1,9 +1,6 @@
 module Arel
   module Nodes
     class Count < Arel::Nodes::Function
-
-      attr_accessor :distinct
-
       def initialize expr, distinct = false, aliaz = nil
         super(expr, aliaz)
         @distinct = distinct

data/lib/arel/nodes/function.rb

@@ -2,11 +2,12 @@ module Arel
   module Nodes
     class Function < Arel::Nodes::Node
       include Arel::Expression
-      attr_accessor :expressions, :alias
+      attr_accessor :expressions, :alias, :distinct
 
       def initialize expr, aliaz = nil
         @expressions = expr
-        @alias       = aliaz
+        @alias       = aliaz && SqlLiteral.new(aliaz)
+        @distinct    = false
       end
 
       def as aliaz
@@ -14,5 +15,15 @@ module Arel
         self
       end
     end
+
+    %w{
+      Sum
+      Exists
+      Max
+      Min
+      Avg
+    }.each do |name|
+      const_set(name, Class.new(Function))
+    end
   end
 end

data/lib/arel/nodes/infix_operation.rb

@@ -0,0 +1,43 @@
+module Arel
+  module Nodes
+
+    class InfixOperation < Binary
+      include Arel::Expressions
+      include Arel::Predications
+      include Arel::AliasPredication
+      include Arel::Math
+
+      attr_reader :operator
+
+      def initialize operator, left, right
+        super(left, right)
+        @operator = operator
+      end
+    end
+
+    class Multiplication < InfixOperation
+      def initialize left, right
+        super(:*, left, right)
+      end
+    end
+
+    class Division < InfixOperation
+      def initialize left, right
+        super(:/, left, right)
+      end
+    end
+
+    class Addition < InfixOperation
+      def initialize left, right
+        super(:+, left, right)
+      end
+    end
+
+    class Subtraction < InfixOperation
+      def initialize left, right
+        super(:-, left, right)
+      end
+    end
+
+  end
+end

data/lib/arel/nodes/join_source.rb

@@ -0,0 +1,14 @@
+module Arel
+  module Nodes
+    ###
+    # Class that represents a join source
+    #
+    #   http://www.sqlite.org/syntaxdiagrams.html#join-source
+
+    class JoinSource < Arel::Nodes::Binary
+      def initialize single_source, joinop = []
+        super
+      end
+    end
+  end
+end

data/lib/arel/nodes/named_function.rb

@@ -0,0 +1,14 @@
+module Arel
+  module Nodes
+    class NamedFunction < Arel::Nodes::Function
+      attr_accessor :name
+
+      include Arel::Predications
+
+      def initialize name, expr, aliaz = nil
+        super(expr, aliaz)
+        @name = name
+      end
+    end
+  end
+end

data/lib/arel/nodes/node.rb

@@ -3,11 +3,14 @@ module Arel
     ###
     # Abstract base class for all AST nodes
     class Node
+      include Arel::FactoryMethods
+      include Enumerable
+
       ###
       # Factory method to create a Nodes::Not node that has the recipient of
       # the caller as a child.
       def not
-        Nodes::Not.new Nodes::Grouping.new self
+        Nodes::Not.new self
       end
 
       ###
@@ -20,7 +23,7 @@ module Arel
       ###
       # Factory method to create an Nodes::And node.
       def and right
-        Nodes::And.new self, right
+        Nodes::And.new [self, right]
       end
 
       # FIXME: this method should go away.  I don't like people calling

data/lib/arel/nodes/select_core.rb

@@ -1,24 +1,38 @@
 module Arel
   module Nodes
     class SelectCore < Arel::Nodes::Node
-      attr_accessor :top, :froms, :projections, :wheres, :groups
-      attr_accessor :having
+      attr_accessor :top, :projections, :wheres, :groups
+      attr_accessor :having, :source, :set_quantifier
 
       def initialize
-        @top         = nil
-        @froms       = nil
-        @projections = []
-        @wheres      = []
-        @groups      = []
-        @having      = nil
+        @source         = JoinSource.new nil
+        @top            = nil
+
+        # http://savage.net.au/SQL/sql-92.bnf.html#set%20quantifier
+        @set_quantifier = nil
+        @projections    = []
+        @wheres         = []
+        @groups         = []
+        @having         = nil
+      end
+
+      def from
+        @source.left
       end
 
+      def from= value
+        @source.left = value
+      end
+
+      alias :froms= :from=
+      alias :froms :from
+
       def initialize_copy other
         super
-        @froms       = @froms.clone if @froms
+        @source      = @source.clone if @source
         @projections = @projections.clone
         @wheres      = @wheres.clone
-        @group       = @groups.clone
+        @groups      = @groups.clone
         @having      = @having.clone if @having
       end
     end

data/lib/arel/nodes/select_statement.rb

@@ -2,14 +2,16 @@ module Arel
   module Nodes
     class SelectStatement < Arel::Nodes::Node
       attr_reader :cores
-      attr_accessor :limit, :orders, :lock, :offset
+      attr_accessor :limit, :orders, :lock, :offset, :with
 
       def initialize cores = [SelectCore.new]
-        @cores  = cores
-        @orders = []
-        @limit  = nil
-        @lock   = nil
-        @offset = nil
+        #puts caller
+        @cores          = cores
+        @orders         = []
+        @limit          = nil
+        @lock           = nil
+        @offset         = nil
+        @with           = nil
       end
 
       def initialize_copy other

data/lib/arel/nodes/sql_literal.rb

@@ -3,6 +3,8 @@ module Arel
     class SqlLiteral < String
       include Arel::Expressions
       include Arel::Predications
+      include Arel::AliasPredication
+      include Arel::OrderPredications
     end
   end
 end

data/lib/arel/nodes/string_join.rb

@@ -1,10 +1,8 @@
 module Arel
   module Nodes
     class StringJoin < Arel::Nodes::Join
-      undef :constraint
-
-      def initialize left, right
-        super(left, right, nil)
+      def initialize left, right = nil
+        super
       end
     end
   end

data/lib/arel/nodes/table_alias.rb

@@ -1,12 +1,16 @@
 module Arel
   module Nodes
     class TableAlias < Arel::Nodes::Binary
-      alias :name :left
-      alias :relation :right
+      alias :name :right
+      alias :relation :left
       alias :table_alias :name
 
       def [] name
-        Attribute.new self, name
+        Attribute.new(self, name)
+      end
+
+      def table_name
+        relation.name
       end
     end
   end

data/lib/arel/nodes/{as.rb → terminal.rb}

@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class As < Arel::Nodes::Binary
+    class Distinct < Arel::Nodes::Node
     end
   end
 end