arel 2.0.10 → 2.1.0

data/lib/arel/nodes/unary.rb

@@ -2,10 +2,27 @@ module Arel
   module Nodes
     class Unary < Arel::Nodes::Node
       attr_accessor :expr
+      alias :value :expr
 
       def initialize expr
         @expr = expr
       end
     end
+
+    %w{
+      Bin
+      Group
+      Grouping
+      Having
+      Limit
+      Not
+      Offset
+      On
+      Top
+      Lock
+      DistinctOn
+    }.each do |name|
+      const_set(name, Class.new(Unary))
+    end
   end
 end

data/lib/arel/nodes/unqualified_column.rb

@@ -4,6 +4,10 @@ module Arel
       alias :attribute :expr
       alias :attribute= :expr=
 
+      def relation
+        @expr.relation
+      end
+
       def column
         @expr.column
       end

data/lib/arel/nodes/update_statement.rb

@@ -2,13 +2,15 @@ module Arel
   module Nodes
     class UpdateStatement < Arel::Nodes::Node
       attr_accessor :relation, :wheres, :values, :orders, :limit
+      attr_accessor :key
 
       def initialize
         @relation = nil
         @wheres   = []
         @values   = []
-        @orders = []
-        @limit  = nil
+        @orders   = []
+        @limit    = nil
+        @key      = nil
       end
 
       def initialize_copy other

data/lib/arel/nodes/with.rb

@@ -0,0 +1,10 @@
+module Arel
+  module Nodes
+    class With < Arel::Nodes::Unary
+      alias children expr
+    end
+
+    class WithRecursive < With; end
+  end
+end
+

data/lib/arel/order_predications.rb

@@ -0,0 +1,13 @@
+module Arel
+  module OrderPredications
+
+    def asc
+      Nodes::Ordering.new self, :asc
+    end
+
+    def desc
+      Nodes::Ordering.new self, :desc
+    end
+
+  end
+end

data/lib/arel/predications.rb

@@ -1,8 +1,5 @@
 module Arel
   module Predications
-    def as other
-      Nodes::As.new self, other
-    end
 
     def not_eq other
       Nodes::NotEqual.new self, other
@@ -36,9 +33,9 @@ module Arel
         if other.exclude_end?
           left  = Nodes::GreaterThanOrEqual.new(self, other.begin)
           right = Nodes::LessThan.new(self, other.end)
-          Nodes::And.new left, right
+          Nodes::And.new [left, right]
         else
-          Nodes::Between.new(self, Nodes::And.new(other.begin, other.end))
+          Nodes::Between.new(self, Nodes::And.new([other.begin, other.end]))
         end
       else
         Nodes::In.new self, other
@@ -152,32 +149,17 @@ module Arel
       grouping_all :lteq, others
     end
 
-    def asc
-      Nodes::Ordering.new self, :asc
-    end
-
-    def desc
-      Nodes::Ordering.new self, :desc
-    end
-
     private
 
     def grouping_any method_id, others
-      others = others.dup
-      first = send method_id, others.shift
-
-      Nodes::Grouping.new others.inject(first) { |memo,expr|
-        Nodes::Or.new(memo, send(method_id, expr))
+      nodes = others.map {|expr| send(method_id, expr)}
+      Nodes::Grouping.new nodes.inject { |memo,node|
+        Nodes::Or.new(memo, node)
       }
     end
 
     def grouping_all method_id, others
-      others = others.dup
-      first = send method_id, others.shift
-
-      Nodes::Grouping.new others.inject(first) { |memo,expr|
-        Nodes::And.new(memo, send(method_id, expr))
-      }
+      Nodes::Grouping.new Nodes::And.new(others.map {|expr| send(method_id, expr)})
     end
   end
 end

data/lib/arel/select_manager.rb

@@ -9,18 +9,33 @@ module Arel
       from table
     end
 
-    def taken
+    def initialize_copy other
+      super
+      @ctx = @ast.cores.last
+    end
+
+    def limit
       @ast.limit && @ast.limit.expr
     end
+    alias :taken :limit
 
     def constraints
       @ctx.wheres
     end
 
+    def offset
+      @ast.offset && @ast.offset.expr
+    end
+
     def skip amount
-      @ast.offset = Nodes::Offset.new(amount)
+      if amount
+        @ast.offset = Nodes::Offset.new(amount)
+      else
+        @ast.offset = nil
+      end
       self
     end
+    alias :offset= :skip
 
     ###
     # Produces an Arel::Nodes::Exists node
@@ -28,8 +43,14 @@ module Arel
       Arel::Nodes::Exists.new @ast
     end
 
+    def as other
+      create_table_alias grouping(@ast), Nodes::SqlLiteral.new(other)
+    end
+
     def where_clauses
-      #warn "where_clauses is deprecated" if $VERBOSE
+      if $VERBOSE
+        warn "(#{caller.first}) where_clauses is deprecated and will be removed in arel 3.0.0 with no replacement"
+      end
       to_sql = Visitors::ToSql.new @engine
       @ctx.wheres.map { |c| to_sql.accept c }
     end
@@ -52,7 +73,7 @@ module Arel
     end
 
     def on *exprs
-      @ctx.froms.constraint = Nodes::On.new(collapse(exprs))
+      @ctx.source.right.last.right = Nodes::On.new(collapse(exprs))
       self
     end
 
@@ -72,35 +93,36 @@ module Arel
       # FIXME: this is a hack to support
       # test_with_two_tables_in_from_without_getting_double_quoted
       # from the AR tests.
-      if @ctx.froms
-        source = @ctx.froms
 
-        if Nodes::SqlLiteral === table && Nodes::Join === source
-          source.left = table
-          table = source
-        end
+      case table
+      when Nodes::Join
+        @ctx.source.right << table
+      else
+        @ctx.source.left = table
       end
 
-      @ctx.froms = table
       self
     end
 
+    def froms
+      @ast.cores.map { |x| x.from }.compact
+    end
+
     def join relation, klass = Nodes::InnerJoin
       return self unless relation
 
       case relation
       when String, Nodes::SqlLiteral
         raise if relation.blank?
-        from Nodes::StringJoin.new(@ctx.froms, relation)
-      else
-        from klass.new(@ctx.froms, relation, nil)
+        klass = Nodes::StringJoin
       end
-    end
 
-    def having expr
-      expr = Nodes::SqlLiteral.new(expr) if String === expr
+      @ctx.source.right << create_join(relation, nil, klass)
+      self
+    end
 
-      @ctx.having = Nodes::Having.new(expr)
+    def having *exprs
+      @ctx.having = Nodes::Having.new(collapse(exprs, @ctx.having))
       self
     end
 
@@ -126,6 +148,7 @@ module Arel
     end
 
     def wheres
+      warn "#{caller[0]}: SelectManager#wheres is deprecated and will be removed in ARel 3.0.0 with no replacement"
       Compatibility::Wheres.new @engine, @ctx.wheres
     end
 
@@ -156,17 +179,34 @@ module Arel
     end
     alias :minus :except
 
+    def with *subqueries
+      if subqueries.first.is_a? Symbol
+        node_class = Nodes.const_get("With#{subqueries.shift.to_s.capitalize}")
+      else
+        node_class = Nodes::With
+      end
+      @ast.with = node_class.new(subqueries.flatten)
+
+      self
+    end
+
     def take limit
-      @ast.limit = Nodes::Limit.new(limit)
-      @ctx.top   = Nodes::Top.new(limit)
+      if limit
+        @ast.limit = Nodes::Limit.new(limit)
+        @ctx.top   = Nodes::Top.new(limit)
+      else
+        @ast.limit = nil
+        @ctx.top   = nil
+      end
       self
     end
+    alias limit= take
 
     def join_sql
-      return nil unless @ctx.froms
+      return nil if @ctx.source.right.empty?
 
-      viz = Visitors::JoinSql.new @engine
-      Nodes::SqlLiteral.new viz.accept @ctx
+      sql = @visitor.dup.extend(Visitors::JoinSql).accept @ctx
+      Nodes::SqlLiteral.new sql
     end
 
     def order_clauses
@@ -175,9 +215,13 @@ module Arel
       }
     end
 
+    def join_sources
+      @ctx.source.right
+    end
+
     def joins manager
       if $VERBOSE
-        warn "joins is deprecated and will be removed in 2.2"
+        warn "joins is deprecated and will be removed in 3.0.0"
         warn "please remove your call to joins from #{caller.first}"
       end
       manager.join_sql
@@ -203,13 +247,22 @@ module Arel
 
     # FIXME: this method should go away
     def insert values
-      im = InsertManager.new @engine
+      if $VERBOSE
+        warn <<-eowarn
+insert (#{caller.first}) is deprecated and will be removed in ARel 3.0.0. Please
+switch to `compile_insert`
+        eowarn
+      end
+
+      im = compile_insert(values)
       table = @ctx.froms
-      primary_key_name = (primary_key = table.primary_key) && primary_key.name
+
+      primary_key      = table.primary_key
+      primary_key_name = primary_key.name if primary_key
+
       # FIXME: in AR tests values sometimes were Array and not Hash therefore is_a?(Hash) check is added
       primary_key_value = primary_key && values.is_a?(Hash) && values[primary_key]
       im.into table
-      im.insert values
       # Oracle adapter needs primary key name to generate RETURNING ... INTO ... clause
       # for tables which assign primary key value using trigger.
       # RETURNING ... INTO ... clause will be added only if primary_key_value is nil
@@ -218,20 +271,22 @@ module Arel
     end
 
     private
-    def collapse exprs
-      exprs.map! { |x| x.class == ::String ? Arel.sql(x) : x }
-
-      return exprs.first if exprs.length == 1
-
-      right = exprs.pop
-      left  = exprs.pop
-
-      right = Nodes::SqlLiteral.new(right) if String === right
-
-      right = Nodes::And.new left, right
-      exprs.reverse.inject(right) { |memo,expr|
-        Nodes::And.new(expr, memo)
+    def collapse exprs, existing = nil
+      exprs = exprs.unshift(existing.expr) if existing
+      exprs = exprs.compact.map { |expr|
+        if String === expr
+          # FIXME: Don't do this automatically
+          Arel.sql(expr)
+        else
+          expr
+        end
       }
+
+      if exprs.length == 1
+        exprs.first
+      else
+        create_and exprs
+      end
     end
   end
 end

data/lib/arel/table.rb

@@ -1,12 +1,16 @@
 module Arel
   class Table
     include Arel::Crud
+    include Arel::FactoryMethods
 
     @engine = nil
     class << self; attr_accessor :engine; end
 
     attr_accessor :name, :engine, :aliases, :table_alias
 
+    # TableAlias and Table both have a #table_name which is the name of the underlying table
+    alias :table_name :name
+
     def initialize name, engine = Table.engine
       @name    = name.to_s
       @engine  = engine
@@ -17,7 +21,6 @@ module Arel
 
       if Hash === engine
         @engine  = engine[:engine] || Table.engine
-        @columns = attributes_for engine[:columns]
 
         # Sometime AR sends an :as parameter to table, to let the table know
         # that it is an Alias.  We may want to override new, and return a
@@ -27,6 +30,11 @@ module Arel
     end
 
     def primary_key
+      if $VERBOSE
+        warn <<-eowarn
+primary_key (#{caller.first}) is deprecated and will be removed in ARel 3.0.0
+        eowarn
+      end
       @primary_key ||= begin
         primary_key_name = @engine.connection.primary_key(name)
         # some tables might be without primary key
@@ -35,7 +43,7 @@ module Arel
     end
 
     def alias name = "#{self.name}_2"
-      Nodes::TableAlias.new(name, self).tap do |node|
+      Nodes::TableAlias.new(self, name).tap do |node|
         @aliases << node
       end
     end
@@ -46,7 +54,7 @@ module Arel
 
     def joins manager
       if $VERBOSE
-        warn "joins is deprecated and will be removed in 2.2"
+        warn "joins is deprecated and will be removed in 3.0.0"
         warn "please remove your call to joins from #{caller.first}"
       end
       nil
@@ -58,10 +66,10 @@ module Arel
       case relation
       when String, Nodes::SqlLiteral
         raise if relation.blank?
-        from Nodes::StringJoin.new(self, relation)
-      else
-        from klass.new(self, relation, nil)
+        klass = Nodes::StringJoin
       end
+
+      from(self).join(relation, klass)
     end
 
     def group *columns
@@ -93,41 +101,46 @@ module Arel
     end
 
     def columns
+      if $VERBOSE
+        warn <<-eowarn
+(#{caller.first}) Arel::Table#columns is deprecated and will be removed in
+Arel 3.0.0 with no replacement.  PEW PEW PEW!!!
+        eowarn
+      end
       @columns ||=
         attributes_for @engine.connection.columns(@name, "#{@name} Columns")
     end
 
     def [] name
-      return nil unless table_exists?
-
-      name = name.to_sym
-      columns.find { |column| column.name == name }
+      ::Arel::Attribute.new self, name
     end
 
     def select_manager
       SelectManager.new(@engine)
     end
 
+    def insert_manager
+      InsertManager.new(@engine)
+    end
+
     private
 
     def attributes_for columns
       return nil unless columns
 
       columns.map do |column|
-        Attributes.for(column).new self, column.name.to_sym, column
+        Attributes.for(column).new self, column.name.to_sym
       end
     end
 
-    def table_exists?
-      @table_exists ||= tables.key?(@name) || engine.connection.table_exists?(name)
-    end
-
-    def tables
-      self.class.table_cache(@engine)
-    end
-
     @@table_cache = nil
     def self.table_cache engine # :nodoc:
+      if $VERBOSE
+        warn <<-eowarn
+(#{caller.first}) Arel::Table.table_cache is deprecated and will be removed in
+Arel 3.0.0 with no replacement.  PEW PEW PEW!!!
+        eowarn
+      end
       @@table_cache ||= Hash[engine.connection.tables.map { |x| [x,true] }]
     end
   end