arel 5.0.1.20140414130214 → 6.0.0.beta1

data/lib/arel/table.rb

@@ -52,26 +52,22 @@ primary_key (#{caller.first}) is deprecated and will be removed in Arel 4.0.0
       SelectManager.new(@engine, table)
     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
-      nil
-    end
-
     def join relation, klass = Nodes::InnerJoin
       return from(self) unless relation
 
       case relation
       when String, Nodes::SqlLiteral
-        raise if relation.blank?
+        raise if relation.empty?
         klass = Nodes::StringJoin
       end
 
       from(self).join(relation, klass)
     end
 
+    def outer_join relation
+      join(relation, Nodes::OuterJoin)
+    end
+
     def group *columns
       from(self).group(*columns)
     end
@@ -112,6 +108,14 @@ primary_key (#{caller.first}) is deprecated and will be removed in Arel 4.0.0
       InsertManager.new(@engine)
     end
 
+    def update_manager
+      UpdateManager.new(@engine)
+    end
+
+    def delete_manager
+      DeleteManager.new(@engine)
+    end
+
     def hash
       # Perf note: aliases, table alias and engine is excluded from the hash
       #  aliases can have a loop back to this table breaking hashes in parent

data/lib/arel/tree_manager.rb

@@ -1,3 +1,5 @@
+require 'arel/collectors/sql_string'
+
 module Arel
   class TreeManager
     include Arel::FactoryMethods
@@ -13,7 +15,9 @@ module Arel
     end
 
     def to_dot
-      Visitors::Dot.new.accept @ast
+      collector = Arel::Collectors::PlainString.new
+      collector = Visitors::Dot.new.accept @ast, collector
+      collector.value
     end
 
     def visitor
@@ -21,7 +25,9 @@ module Arel
     end
 
     def to_sql
-      visitor.accept @ast
+      collector = Arel::Collectors::SQLString.new
+      collector = visitor.accept @ast, collector
+      collector.value
     end
 
     def initialize_copy other

data/lib/arel/update_manager.rb

@@ -7,12 +7,12 @@ module Arel
     end
 
     def take limit
-      @ast.limit = Nodes::Limit.new(limit) if limit
+      @ast.limit = Nodes::Limit.new(Nodes.build_quoted(limit)) if limit
       self
     end
 
     def key= key
-      @ast.key = key
+      @ast.key = Nodes.build_quoted(key)
     end
 
     def key

data/lib/arel/visitors.rb

@@ -6,9 +6,7 @@ require 'arel/visitors/postgresql'
 require 'arel/visitors/mysql'
 require 'arel/visitors/mssql'
 require 'arel/visitors/oracle'
-require 'arel/visitors/join_sql'
 require 'arel/visitors/where_sql'
-require 'arel/visitors/order_clauses'
 require 'arel/visitors/dot'
 require 'arel/visitors/ibm_db'
 require 'arel/visitors/informix'

data/lib/arel/visitors/bind_substitute.rb

@@ -0,0 +1,9 @@
+module Arel
+  module Visitors
+    class BindSubstitute
+      def initialize delegate
+        @delegate = delegate
+      end
+    end
+  end
+end

data/lib/arel/visitors/bind_visitor.rb

@@ -6,24 +6,29 @@ module Arel
         super
       end
 
-      def accept node, &block
+      def accept node, collector, &block
         @block = block if block_given?
         super
       end
 
       private
 
-      def visit_Arel_Nodes_Assignment o, a
+      def visit_Arel_Nodes_Assignment o, collector
         if o.right.is_a? Arel::Nodes::BindParam
-          "#{visit o.left, a} = #{visit o.right, a}"
+          collector = visit o.left, collector
+          collector << " = "
+          visit o.right, collector
         else
           super
         end
       end
 
-      def visit_Arel_Nodes_BindParam o, a
+      def visit_Arel_Nodes_BindParam o, collector
         if @block
-          @block.call
+          val = @block.call
+          if String === val
+            collector << val
+          end
         else
           super
         end

data/lib/arel/visitors/depth_first.rb

@@ -7,13 +7,13 @@ module Arel
 
       private
 
-      def visit o, a = nil
+      def visit o
         super
         @block.call o
       end
 
-      def unary o, a
-        visit o.expr, a
+      def unary o
+        visit o.expr
       end
       alias :visit_Arel_Nodes_Group             :unary
       alias :visit_Arel_Nodes_Grouping          :unary
@@ -28,10 +28,10 @@ module Arel
       alias :visit_Arel_Nodes_Top               :unary
       alias :visit_Arel_Nodes_UnqualifiedColumn :unary
 
-      def function o, a
-        visit o.expressions, a
-        visit o.alias, a
-        visit o.distinct, a
+      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
@@ -39,27 +39,27 @@ module Arel
       alias :visit_Arel_Nodes_Min    :function
       alias :visit_Arel_Nodes_Sum    :function
 
-      def visit_Arel_Nodes_NamedFunction o, a
-        visit o.name, a
-        visit o.expressions, a
-        visit o.distinct, a
-        visit o.alias, a
+      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, a
-        visit o.expressions, a
-        visit o.alias, a
-        visit o.distinct, a
+      def visit_Arel_Nodes_Count o
+        visit o.expressions
+        visit o.alias
+        visit o.distinct
       end
 
-      def nary o, a
-        o.children.each { |child| visit child, a }
+      def nary o
+        o.children.each { |child| visit child}
       end
       alias :visit_Arel_Nodes_And :nary
 
-      def binary o, a
-        visit o.left, a
-        visit o.right, a
+      def binary o
+        visit o.left
+        visit o.right
       end
       alias :visit_Arel_Nodes_As                 :binary
       alias :visit_Arel_Nodes_Assignment         :binary
@@ -67,6 +67,7 @@ module Arel
       alias :visit_Arel_Nodes_DeleteStatement    :binary
       alias :visit_Arel_Nodes_DoesNotMatch       :binary
       alias :visit_Arel_Nodes_Equality           :binary
+      alias :visit_Arel_Nodes_FullOuterJoin      :binary
       alias :visit_Arel_Nodes_GreaterThan        :binary
       alias :visit_Arel_Nodes_GreaterThanOrEqual :binary
       alias :visit_Arel_Nodes_In                 :binary
@@ -78,18 +79,21 @@ module Arel
       alias :visit_Arel_Nodes_Matches            :binary
       alias :visit_Arel_Nodes_NotEqual           :binary
       alias :visit_Arel_Nodes_NotIn              :binary
+      alias :visit_Arel_Nodes_NotRegexp          :binary
       alias :visit_Arel_Nodes_Or                 :binary
       alias :visit_Arel_Nodes_OuterJoin          :binary
+      alias :visit_Arel_Nodes_Regexp             :binary
+      alias :visit_Arel_Nodes_RightOuterJoin     :binary
       alias :visit_Arel_Nodes_TableAlias         :binary
       alias :visit_Arel_Nodes_Values             :binary
 
-      def visit_Arel_Nodes_StringJoin o, a
-        visit o.left, a
+      def visit_Arel_Nodes_StringJoin o
+        visit o.left
       end
 
-      def visit_Arel_Attribute o, a
-        visit o.relation, a
-        visit o.name, a
+      def visit_Arel_Attribute o
+        visit o.relation
+        visit o.name
       end
       alias :visit_Arel_Attributes_Integer :visit_Arel_Attribute
       alias :visit_Arel_Attributes_Float :visit_Arel_Attribute
@@ -99,11 +103,11 @@ module Arel
       alias :visit_Arel_Attributes_Attribute :visit_Arel_Attribute
       alias :visit_Arel_Attributes_Decimal :visit_Arel_Attribute
 
-      def visit_Arel_Table o, a
-        visit o.name, a
+      def visit_Arel_Table o
+        visit o.name
       end
 
-      def terminal o, a
+      def terminal o
       end
       alias :visit_ActiveSupport_Multibyte_Chars :terminal
       alias :visit_ActiveSupport_StringInquirer  :terminal
@@ -112,7 +116,6 @@ module Arel
       alias :visit_Arel_Nodes_SqlLiteral         :terminal
       alias :visit_Arel_Nodes_BindParam          :terminal
       alias :visit_Arel_Nodes_Window             :terminal
-      alias :visit_Arel_SqlLiteral               :terminal
       alias :visit_BigDecimal                    :terminal
       alias :visit_Bignum                        :terminal
       alias :visit_Class                         :terminal
@@ -127,43 +130,43 @@ module Arel
       alias :visit_Time                          :terminal
       alias :visit_TrueClass                     :terminal
 
-      def visit_Arel_Nodes_InsertStatement o, a
-        visit o.relation, a
-        visit o.columns, a
-        visit o.values, a
+      def visit_Arel_Nodes_InsertStatement o
+        visit o.relation
+        visit o.columns
+        visit o.values
       end
 
-      def visit_Arel_Nodes_SelectCore o, a
-        visit o.projections, a
-        visit o.source, a
-        visit o.wheres, a
-        visit o.groups, a
-        visit o.windows, a
-        visit o.having, a
+      def visit_Arel_Nodes_SelectCore o
+        visit o.projections
+        visit o.source
+        visit o.wheres
+        visit o.groups
+        visit o.windows
+        visit o.having
       end
 
-      def visit_Arel_Nodes_SelectStatement o, a
-        visit o.cores, a
-        visit o.orders, a
-        visit o.limit, a
-        visit o.lock, a
-        visit o.offset, a
+      def visit_Arel_Nodes_SelectStatement o
+        visit o.cores
+        visit o.orders
+        visit o.limit
+        visit o.lock
+        visit o.offset
       end
 
-      def visit_Arel_Nodes_UpdateStatement o, a
-        visit o.relation, a
-        visit o.values, a
-        visit o.wheres, a
-        visit o.orders, a
-        visit o.limit, a
+      def visit_Arel_Nodes_UpdateStatement o
+        visit o.relation
+        visit o.values
+        visit o.wheres
+        visit o.orders
+        visit o.limit
       end
 
-      def visit_Array o, a
-        o.each { |i| visit i, a }
+      def visit_Array o
+        o.each { |i| visit i }
       end
 
-      def visit_Hash o, a
-        o.each { |k,v| visit(k, a); visit(v, a) }
+      def visit_Hash o
+        o.each { |k,v| visit(k); visit(v) }
       end
     end
   end

data/lib/arel/visitors/dot.rb

@@ -22,47 +22,50 @@ module Arel
         @seen       = {}
       end
 
-      def accept object
-        super
-        to_dot
+      def accept object, collector
+        visit object
+        collector << to_dot
       end
 
       private
-      def visit_Arel_Nodes_Ordering o, a
-        visit_edge o, a, "expr"
+
+      def visit_Arel_Nodes_Ordering o
+        visit_edge o, "expr"
       end
 
-      def visit_Arel_Nodes_TableAlias o, a
-        visit_edge o, a, "name"
-        visit_edge o, a, "relation"
+      def visit_Arel_Nodes_TableAlias o
+        visit_edge o, "name"
+        visit_edge o, "relation"
       end
 
-      def visit_Arel_Nodes_Count o, a
-        visit_edge o, a, "expressions"
-        visit_edge o, a, "distinct"
+      def visit_Arel_Nodes_Count o
+        visit_edge o, "expressions"
+        visit_edge o, "distinct"
       end
 
-      def visit_Arel_Nodes_Values o, a
-        visit_edge o, a, "expressions"
+      def visit_Arel_Nodes_Values o
+        visit_edge o, "expressions"
       end
 
-      def visit_Arel_Nodes_StringJoin o, a
-        visit_edge o, a, "left"
+      def visit_Arel_Nodes_StringJoin o
+        visit_edge o, "left"
       end
 
-      def visit_Arel_Nodes_InnerJoin o, a
-        visit_edge o, a, "left"
-        visit_edge o, a, "right"
+      def visit_Arel_Nodes_InnerJoin o
+        visit_edge o, "left"
+        visit_edge o, "right"
       end
-      alias :visit_Arel_Nodes_OuterJoin :visit_Arel_Nodes_InnerJoin
+      alias :visit_Arel_Nodes_FullOuterJoin  :visit_Arel_Nodes_InnerJoin
+      alias :visit_Arel_Nodes_OuterJoin      :visit_Arel_Nodes_InnerJoin
+      alias :visit_Arel_Nodes_RightOuterJoin :visit_Arel_Nodes_InnerJoin
 
-      def visit_Arel_Nodes_DeleteStatement o, a
-        visit_edge o, a, "relation"
-        visit_edge o, a, "wheres"
+      def visit_Arel_Nodes_DeleteStatement o
+        visit_edge o, "relation"
+        visit_edge o, "wheres"
       end
 
-      def unary o, a
-        visit_edge o, a, "expr"
+      def unary o
+        visit_edge o, "expr"
       end
       alias :visit_Arel_Nodes_Group             :unary
       alias :visit_Arel_Nodes_Grouping          :unary
@@ -78,23 +81,25 @@ module Arel
       alias :visit_Arel_Nodes_Rows              :unary
       alias :visit_Arel_Nodes_Range             :unary
 
-      def window o, a
-        visit_edge o, a, "orders"
-        visit_edge o, a, "framing"
+      def window o
+        visit_edge o, "partitions"
+        visit_edge o, "orders"
+        visit_edge o, "framing"
       end
       alias :visit_Arel_Nodes_Window            :window
 
-      def named_window o, a
-        visit_edge o, a, "orders"
-        visit_edge o, a, "framing"
-        visit_edge o, a, "name"
+      def named_window o
+        visit_edge o, "partitions"
+        visit_edge o, "orders"
+        visit_edge o, "framing"
+        visit_edge o, "name"
       end
       alias :visit_Arel_Nodes_NamedWindow       :named_window
 
-      def function o, a
-        visit_edge o, a, "expressions"
-        visit_edge o, a, "distinct"
-        visit_edge o, a, "alias"
+      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
@@ -102,52 +107,52 @@ module Arel
       alias :visit_Arel_Nodes_Avg    :function
       alias :visit_Arel_Nodes_Sum    :function
 
-      def extract o, a
-        visit_edge o, a, "expressions"
-        visit_edge o, a, "alias"
+      def extract o
+        visit_edge o, "expressions"
+        visit_edge o, "alias"
       end
       alias :visit_Arel_Nodes_Extract :extract
 
-      def visit_Arel_Nodes_NamedFunction o, a
-        visit_edge o, a, "name"
-        visit_edge o, a, "expressions"
-        visit_edge o, a, "distinct"
-        visit_edge o, a, "alias"
+      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, a
-        visit_edge o, a, "relation"
-        visit_edge o, a, "columns"
-        visit_edge o, a, "values"
+      def visit_Arel_Nodes_InsertStatement o
+        visit_edge o, "relation"
+        visit_edge o, "columns"
+        visit_edge o, "values"
       end
 
-      def visit_Arel_Nodes_SelectCore o, a
-        visit_edge o, a, "source"
-        visit_edge o, a, "projections"
-        visit_edge o, a, "wheres"
-        visit_edge o, a, "windows"
+      def visit_Arel_Nodes_SelectCore o
+        visit_edge o, "source"
+        visit_edge o, "projections"
+        visit_edge o, "wheres"
+        visit_edge o,  "windows"
       end
 
-      def visit_Arel_Nodes_SelectStatement o, a
-        visit_edge o, a, "cores"
-        visit_edge o, a, "limit"
-        visit_edge o, a, "orders"
-        visit_edge o, a, "offset"
+      def visit_Arel_Nodes_SelectStatement o
+        visit_edge o, "cores"
+        visit_edge o, "limit"
+        visit_edge o, "orders"
+        visit_edge o, "offset"
       end
 
-      def visit_Arel_Nodes_UpdateStatement o, a
-        visit_edge o, a, "relation"
-        visit_edge o, a, "wheres"
-        visit_edge o, a, "values"
+      def visit_Arel_Nodes_UpdateStatement o
+        visit_edge o, "relation"
+        visit_edge o, "wheres"
+        visit_edge o, "values"
       end
 
-      def visit_Arel_Table o, a
-        visit_edge o, a, "name"
+      def visit_Arel_Table o
+        visit_edge o, "name"
       end
 
-      def visit_Arel_Attribute o, a
-        visit_edge o, a, "relation"
-        visit_edge o, a, "name"
+      def visit_Arel_Attribute o
+        visit_edge o, "relation"
+        visit_edge o, "name"
       end
       alias :visit_Arel_Attributes_Integer :visit_Arel_Attribute
       alias :visit_Arel_Attributes_Float :visit_Arel_Attribute
@@ -156,16 +161,16 @@ module Arel
       alias :visit_Arel_Attributes_Boolean :visit_Arel_Attribute
       alias :visit_Arel_Attributes_Attribute :visit_Arel_Attribute
 
-      def nary o, a
+      def nary o
         o.children.each_with_index do |x,i|
-          edge(i) { visit x, a }
+          edge(i) { visit x }
         end
       end
       alias :visit_Arel_Nodes_And :nary
 
-      def binary o, a
-        visit_edge o, a, "left"
-        visit_edge o, a, "right"
+      def binary o
+        visit_edge o, "left"
+        visit_edge o, "right"
       end
       alias :visit_Arel_Nodes_As                 :binary
       alias :visit_Arel_Nodes_Assignment         :binary
@@ -184,7 +189,7 @@ module Arel
       alias :visit_Arel_Nodes_Or                 :binary
       alias :visit_Arel_Nodes_Over               :binary
 
-      def visit_String o, a
+      def visit_String o
         @node_stack.last.fields << o
       end
       alias :visit_Time :visit_String
@@ -193,7 +198,6 @@ module Arel
       alias :visit_NilClass :visit_String
       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
@@ -201,23 +205,23 @@ module Arel
       alias :visit_Symbol :visit_String
       alias :visit_Arel_Nodes_SqlLiteral :visit_String
 
-      def visit_Hash o, a
+      def visit_Hash o
         o.each_with_index do |pair, i|
-          edge("pair_#{i}")   { visit pair, a }
+          edge("pair_#{i}")   { visit pair }
         end
       end
 
-      def visit_Array o, a
+      def visit_Array o
         o.each_with_index do |x,i|
-          edge(i) { visit x, a }
+          edge(i) { visit x }
         end
       end
 
-      def visit_edge o, a, method
-        edge(method) { visit o.send(method), a }
+      def visit_edge o, method
+        edge(method) { visit o.send(method) }
       end
 
-      def visit o, a = nil
+      def visit o
         if node = @seen[o.object_id]
           @edge_stack.last.to = node
           return