arel 5.0.1.20140414130214 → 6.0.0.beta1

data/lib/arel/insert_manager.rb

@@ -13,11 +13,15 @@ module Arel
     def columns; @ast.columns end
     def values= val; @ast.values = val; end
 
+    def select select
+      @ast.select = select
+    end
+
     def insert fields
       return if fields.empty?
 
       if String === fields
-        @ast.values = SqlLiteral.new(fields)
+        @ast.values = Nodes::SqlLiteral.new(fields)
       else
         @ast.relation ||= fields.first.first.relation
 

data/lib/arel/nodes.rb

@@ -45,8 +45,49 @@ require 'arel/nodes/named_function'
 require 'arel/nodes/window'
 
 # joins
+require 'arel/nodes/full_outer_join'
 require 'arel/nodes/inner_join'
 require 'arel/nodes/outer_join'
+require 'arel/nodes/right_outer_join'
 require 'arel/nodes/string_join'
 
 require 'arel/nodes/sql_literal'
+
+module Arel
+  module Nodes
+    class Casted < Arel::Nodes::Node # :nodoc:
+      attr_reader :val, :attribute
+      def initialize val, attribute
+        @val       = val
+        @attribute = attribute
+        super()
+      end
+
+      def nil?; @val.nil?; end
+
+      def eql? other
+        self.class == other.class &&
+          self.val == other.val &&
+          self.attribute == other.attribute
+      end
+      alias :== :eql?
+    end
+
+    class Quoted < Arel::Nodes::Unary # :nodoc:
+    end
+
+    def self.build_quoted other, attribute = nil
+      case other
+      when Arel::Nodes::Node, Arel::Attributes::Attribute, Arel::Table, Arel::Nodes::BindParam, Arel::SelectManager
+        other
+      else
+        case attribute
+        when Arel::Attributes::Attribute
+          Casted.new other, attribute
+        else
+          Quoted.new other
+        end
+      end
+    end
+  end
+end

data/lib/arel/nodes/and.rb

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

data/lib/arel/nodes/binary.rb

@@ -40,7 +40,9 @@ module Arel
       Matches
       NotEqual
       NotIn
+      NotRegexp
       Or
+      Regexp
       Union
       UnionAll
       Intersect

data/lib/arel/nodes/extract.rb

@@ -1,8 +1,6 @@
 module Arel
   module Nodes
-
     class Extract < Arel::Nodes::Unary
-      include Arel::Expression
       include Arel::Predications
 
       attr_accessor :field

data/lib/arel/nodes/full_outer_join.rb

@@ -0,0 +1,6 @@
+module Arel
+  module Nodes
+    class FullOuterJoin < Arel::Nodes::Join
+    end
+  end
+end

data/lib/arel/nodes/function.rb

@@ -1,7 +1,6 @@
 module Arel
   module Nodes
     class Function < Arel::Nodes::Node
-      include Arel::Expression
       include Arel::Predications
       include Arel::WindowPredications
       attr_accessor :expressions, :alias, :distinct

data/lib/arel/nodes/insert_statement.rb

@@ -1,29 +1,32 @@
 module Arel
   module Nodes
     class InsertStatement < Arel::Nodes::Node
-      attr_accessor :relation, :columns, :values
+      attr_accessor :relation, :columns, :values, :select
 
       def initialize
         super()
         @relation = nil
         @columns  = []
         @values   = nil
+        @select   = nil
       end
 
       def initialize_copy other
         super
         @columns = @columns.clone
         @values =  @values.clone if @values
+        @select =  @select.clone if @select
       end
 
       def hash
-        [@relation, @columns, @values].hash
+        [@relation, @columns, @values, @select].hash
       end
 
       def eql? other
         self.class == other.class &&
           self.relation == other.relation &&
           self.columns == other.columns &&
+          self.select == other.select &&
           self.values == other.values
       end
       alias :== :eql?

data/lib/arel/nodes/node.rb

@@ -1,3 +1,5 @@
+require 'arel/collectors/sql_string'
+
 module Arel
   module Nodes
     ###
@@ -42,7 +44,9 @@ module Arel
       #
       # Maybe we should just use `Table.engine`?  :'(
       def to_sql engine = Table.engine
-        engine.connection.visitor.accept self
+        collector = Arel::Collectors::SQLString.new
+        collector = engine.connection.visitor.accept self, collector
+        collector.value
       end
 
       # Iterate through AST, nodes will be yielded depth-first

data/lib/arel/nodes/right_outer_join.rb

@@ -0,0 +1,6 @@
+module Arel
+  module Nodes
+    class RightOuterJoin < Arel::Nodes::Join
+    end
+  end
+end

data/lib/arel/nodes/window.rb

@@ -1,11 +1,12 @@
 module Arel
   module Nodes
     class Window < Arel::Nodes::Node
-      include Arel::Expression
-      attr_accessor :orders, :framing
+      attr_accessor :orders, :framing, :partitions
 
       def initialize
         @orders = []
+        @partitions = []
+        @framing = nil
       end
 
       def order *expr
@@ -16,16 +17,32 @@ module Arel
         self
       end
 
+      def partition *expr
+        # FIXME: We SHOULD NOT be converting these to SqlLiteral automatically
+        @partitions.concat expr.map { |x|
+          String === x || Symbol === x ? Nodes::SqlLiteral.new(x.to_s) : x
+        }
+        self
+      end
+
       def frame(expr)
         @framing = expr
       end
 
       def rows(expr = nil)
-        frame(Rows.new(expr))
+        if @framing
+          Rows.new(expr)
+        else
+          frame(Rows.new(expr))
+        end
       end
 
       def range(expr = nil)
-        frame(Range.new(expr))
+        if @framing
+          Range.new(expr)
+        else
+          frame(Range.new(expr))
+        end
       end
 
       def initialize_copy other
@@ -40,7 +57,8 @@ module Arel
       def eql? other
         self.class == other.class &&
           self.orders == other.orders &&
-          self.framing == other.framing
+          self.framing == other.framing &&
+          self.partitions == other.partitions
       end
       alias :== :eql?
     end

data/lib/arel/predications.rb

@@ -1,7 +1,7 @@
 module Arel
   module Predications
     def not_eq other
-      Nodes::NotEqual.new self, other
+      Nodes::NotEqual.new self, Nodes.build_quoted(other, self)
     end
 
     def not_eq_any others
@@ -13,7 +13,7 @@ module Arel
     end
 
     def eq other
-      Nodes::Equality.new self, other
+      Nodes::Equality.new self, Nodes.build_quoted(other, self)
     end
 
     def eq_any others
@@ -21,7 +21,7 @@ module Arel
     end
 
     def eq_all others
-      grouping_all :eq, others
+      grouping_all :eq, others.map { |x| Nodes.build_quoted(x, self) }
     end
 
     def in other
@@ -29,23 +29,27 @@ module Arel
       when Arel::SelectManager
         Arel::Nodes::In.new(self, other.ast)
       when Range
-        if other.begin == -Float::INFINITY && other.end == Float::INFINITY
-          Nodes::NotIn.new self, []
+        if other.begin == -Float::INFINITY
+          if other.end == Float::INFINITY
+            Nodes::NotIn.new self, [] 
+          elsif other.exclude_end?
+            Nodes::LessThan.new(self, Nodes.build_quoted(other.end, self))
+          else
+            Nodes::LessThanOrEqual.new(self, Nodes.build_quoted(other.end, self))
+          end
         elsif other.end == Float::INFINITY
-          Nodes::GreaterThanOrEqual.new(self, other.begin)
-        elsif other.begin == -Float::INFINITY && other.exclude_end?
-          Nodes::LessThan.new(self, other.end)
-        elsif other.begin == -Float::INFINITY
-          Nodes::LessThanOrEqual.new(self, other.end)
+          Nodes::GreaterThanOrEqual.new(self, Nodes.build_quoted(other.begin, self))
         elsif other.exclude_end?
-          left  = Nodes::GreaterThanOrEqual.new(self, other.begin)
-          right = Nodes::LessThan.new(self, other.end)
+          left  = Nodes::GreaterThanOrEqual.new(self, Nodes.build_quoted(other.begin, self))
+          right = Nodes::LessThan.new(self, Nodes.build_quoted(other.end, self))
           Nodes::And.new [left, right]
         else
-          Nodes::Between.new(self, Nodes::And.new([other.begin, other.end]))
+          Nodes::Between.new(self, Nodes::And.new([Nodes.build_quoted(other.begin, self), Nodes.build_quoted(other.end, self)]))
         end
+      when Array
+        Nodes::In.new self, other.map { |x| Nodes.build_quoted(x, self) }
       else
-        Nodes::In.new self, other
+        Nodes::In.new self, Nodes.build_quoted(other, self)
       end
     end
 
@@ -62,25 +66,29 @@ module Arel
       when Arel::SelectManager
         Arel::Nodes::NotIn.new(self, other.ast)
       when Range
-        if other.begin == -Float::INFINITY && other.end == Float::INFINITY
-          Nodes::In.new self, []
-        elsif other.end == Float::INFINITY
-          Nodes::LessThan.new(self, other.begin)
-        elsif other.begin == -Float::INFINITY && other.exclude_end?
-          Nodes::GreaterThanOrEqual.new(self, other.end)
-        elsif other.begin == -Float::INFINITY
-          Nodes::GreaterThan.new(self, other.end)
-        elsif other.exclude_end?
-          left  = Nodes::LessThan.new(self, other.begin)
-          right = Nodes::GreaterThanOrEqual.new(self, other.end)
-          Nodes::Or.new left, right
+        if other.begin == -Float::INFINITY # The range begins with negative infinity
+          if other.end == Float::INFINITY 
+            Nodes::In.new self, [] # The range is infinite, so return an empty range
+          elsif other.exclude_end?
+            Nodes::GreaterThanOrEqual.new(self, Nodes.build_quoted(other.end, self))
+          else
+            Nodes::GreaterThan.new(self, Nodes.build_quoted(other.end, self))
+          end
+        elsif other.end == Float::INFINITY 
+          Nodes::LessThan.new(self, Nodes.build_quoted(other.begin, self))
         else
-          left  = Nodes::LessThan.new(self, other.begin)
-          right = Nodes::GreaterThan.new(self, other.end)
+          left  = Nodes::LessThan.new(self, Nodes.build_quoted(other.begin, self))
+          if other.exclude_end?
+            right = Nodes::GreaterThanOrEqual.new(self, Nodes.build_quoted(other.end, self))
+          else 
+            right = Nodes::GreaterThan.new(self, Nodes.build_quoted(other.end, self))
+          end
           Nodes::Or.new left, right
         end
+      when Array
+        Nodes::NotIn.new self, other.map { |x| Nodes.build_quoted(x, self) }
       else
-        Nodes::NotIn.new self, other
+        Nodes::NotIn.new self, Nodes.build_quoted(other, self)
       end
     end
 
@@ -93,7 +101,7 @@ module Arel
     end
 
     def matches other
-      Nodes::Matches.new self, other
+      Nodes::Matches.new self, Nodes.build_quoted(other, self)
     end
 
     def matches_any others
@@ -105,7 +113,7 @@ module Arel
     end
 
     def does_not_match other
-      Nodes::DoesNotMatch.new self, other
+      Nodes::DoesNotMatch.new self, Nodes.build_quoted(other, self)
     end
 
     def does_not_match_any others
@@ -117,7 +125,7 @@ module Arel
     end
 
     def gteq right
-      Nodes::GreaterThanOrEqual.new self, right
+      Nodes::GreaterThanOrEqual.new self, Nodes.build_quoted(right, self)
     end
 
     def gteq_any others
@@ -129,7 +137,7 @@ module Arel
     end
 
     def gt right
-      Nodes::GreaterThan.new self, right
+      Nodes::GreaterThan.new self, Nodes.build_quoted(right, self)
     end
 
     def gt_any others

data/lib/arel/select_manager.rb

@@ -1,3 +1,5 @@
+require 'arel/collectors/sql_string'
+
 module Arel
   class SelectManager < Arel::TreeManager
     include Arel::Crud
@@ -17,7 +19,7 @@ module Arel
     end
 
     def limit
-      @ast.limit && @ast.limit.expr
+      @ast.limit && @ast.limit.expr.expr
     end
     alias :taken :limit
 
@@ -84,9 +86,6 @@ module Arel
 
     def from table
       table = Nodes::SqlLiteral.new(table) if String === table
-      # FIXME: this is a hack to support
-      # test_with_two_tables_in_from_without_getting_double_quoted
-      # from the AR tests.
 
       case table
       when Nodes::Join
@@ -107,7 +106,7 @@ module Arel
 
       case relation
       when String, Nodes::SqlLiteral
-        raise if relation.blank?
+        raise if relation.empty?
         klass = Nodes::StringJoin
       end
 
@@ -115,6 +114,10 @@ module Arel
       self
     end
 
+    def outer_join relation
+      join(relation, Nodes::OuterJoin)
+    end
+
     def having *exprs
       @ctx.having = Nodes::Having.new(collapse(exprs, @ctx.having))
       self
@@ -130,7 +133,7 @@ module Arel
       # FIXME: converting these to SQLLiterals is probably not good, but
       # rails tests require it.
       @ctx.projections.concat projections.map { |x|
-        STRING_OR_SYMBOL_CLASS.include?(x.class) ? SqlLiteral.new(x.to_s) : x
+        STRING_OR_SYMBOL_CLASS.include?(x.class) ? Nodes::SqlLiteral.new(x.to_s) : x
       }
       self
     end
@@ -149,6 +152,7 @@ module Arel
       else
         @ctx.set_quantifier = nil
       end
+      self
     end
 
     def order *expr
@@ -167,7 +171,7 @@ module Arel
       return if @ctx.wheres.empty?
 
       viz = Visitors::WhereSql.new @engine.connection
-      Nodes::SqlLiteral.new viz.accept @ctx
+      Nodes::SqlLiteral.new viz.accept(@ctx, Collectors::SQLString.new).value
     end
 
     def union operation, other = nil
@@ -203,8 +207,8 @@ module Arel
 
     def take limit
       if limit
-        @ast.limit = Nodes::Limit.new(limit)
-        @ctx.top   = Nodes::Top.new(limit)
+        @ast.limit = Nodes::Limit.new(Nodes.build_quoted(limit))
+        @ctx.top   = Nodes::Top.new(Nodes.build_quoted(limit))
       else
         @ast.limit = nil
         @ctx.top   = nil
@@ -213,20 +217,6 @@ module Arel
     end
     alias limit= take
 
-    def join_sql
-      return nil if @ctx.source.right.empty?
-
-      sql = visitor.dup.extend(Visitors::JoinSql).accept @ctx
-      Nodes::SqlLiteral.new sql
-    end
-
-    def order_clauses
-      visitor = Visitors::OrderClauses.new(@engine.connection)
-      visitor.accept(@ast).map { |x|
-        Nodes::SqlLiteral.new x
-      }
-    end
-
     def join_sources
       @ctx.source.right
     end
@@ -235,14 +225,6 @@ module Arel
       @ctx.source
     end
 
-    def joins manager
-      if $VERBOSE
-        warn "joins is deprecated and will be removed in 4.0.0"
-        warn "please remove your call to joins from #{caller.first}"
-      end
-      manager.join_sql
-    end
-
     class Row < Struct.new(:data) # :nodoc:
       def id
         data['id']
@@ -255,12 +237,6 @@ module Arel
       end
     end
 
-    def to_a # :nodoc:
-      warn "to_a is deprecated. Please remove it from #{caller[0]}"
-      # FIXME: I think `select` should be made public...
-      @engine.connection.send(:select, to_sql, 'AREL').map { |x| Row.new(x) }
-    end
-
     private
     def collapse exprs, existing = nil
       exprs = exprs.unshift(existing.expr) if existing