arel 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 607f322b2e6662d91cbef8d1433904774af2584c
-  data.tar.gz: 7b45ade5c1572eb9b60ec5bc96b90cf307ddd470
+  metadata.gz: d7b8575f1877fe831a05c70632e7046c6ce384c9
+  data.tar.gz: ab4c6895e273c5ad2bd6456bdf2f0fd1b3f7e0a2
 SHA512:
-  metadata.gz: 9d3471ace631b643c589efca9461e4810a5db0b5f4a4f0126b56cd033c802d75a3cfb5b44771738869582bf651103679e4bfa7b3628328c5493f9992490bf627
-  data.tar.gz: 8e5a1949954982acc175e6bc1f6c3e15070245d5d2643c292ac47fdc56b9cd19a37ac7390ee97c3570dd4269d4b4ae886ee8b35fcdcfc29056b4840bb1ae225b
+  metadata.gz: 71feebe60212b48f1bce1fe0acc756728aff663f7e84836bc5888ed237bc6315b22d95993d9b9fce655dbccbf35c75652e9fd62c185d141c0c246084e3d70e68
+  data.tar.gz: 563e00ae3191b5d4be40b8ead9168ead202242593a9761a2a5e938454b13c3094542d83b2e3ca5706c572ca2d1551772a9bce80631e55be9aa3379435bfecb75

data/History.txt

@@ -1,3 +1,11 @@
+=== 7.0.0 / 2015-12-17
+
+* Enhancements
+
+  * Remove deprecated method `Table#primary_key`
+  * Remove engine from the constructor arguments `Arel::Table`
+  * Deprecate automatic type casting within Arel
+
 === 6.0.0 / 2014-11-25
 
 * Enhancements

data/MIT-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2010 Nick Kallen, Bryan Helmkamp, Emilio Tagua, Aaron Patterson
+Copyright (c) 2007-2015 Nick Kallen, Bryan Helmkamp, Emilio Tagua, Aaron Patterson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -18,3 +18,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/README.markdown

@@ -1,4 +1,4 @@
-# Arel [![Build Status](https://secure.travis-ci.org/rails/arel.svg?branch=master)](http://travis-ci.org/rails/arel) [![Dependency Status](https://gemnasium.com/rails/arel.svg)](https://gemnasium.com/rails/arel)
+# Arel
 
 * http://github.com/rails/arel
 
@@ -222,6 +222,12 @@ photos.project(photo_clicks.as("photo_clicks"))
  FROM "photos"
 ```
 
-### License
+## Contributing to Arel
 
-Arel is released under the [MIT License](http://opensource.org/licenses/MIT).
+Arel is work of many contributors. You're encouraged to submit pull requests, propose
+features and discuss issues.
+
+See [CONTRIBUTING](CONTRIBUTING.md).
+
+## License
+Arel is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/lib/arel/attributes/attribute.rb

@@ -12,6 +12,14 @@ module Arel
       def lower
         relation.lower self
       end
+
+      def type_cast_for_database(value)
+        relation.type_cast_for_database(name, value)
+      end
+
+      def able_to_type_cast?
+        relation.able_to_type_cast?
+      end
     end
 
     class String    < Attribute; end

data/lib/arel/crud.rb

@@ -3,7 +3,7 @@ module Arel
   # FIXME hopefully we can remove this
   module Crud
     def compile_update values, pk
-      um = UpdateManager.new @engine
+      um = UpdateManager.new
 
       if Nodes::SqlLiteral === values
         relation = @ctx.from
@@ -26,11 +26,12 @@ module Arel
     end
 
     def create_insert
-      InsertManager.new @engine
+      InsertManager.new
     end
 
     def compile_delete
-      dm = DeleteManager.new @engine
+      dm = DeleteManager.new
+      dm.take @ast.limit.expr if @ast.limit
       dm.wheres = @ctx.wheres
       dm.from @ctx.froms
       dm

data/lib/arel/delete_manager.rb

@@ -1,6 +1,6 @@
 module Arel
   class DeleteManager < Arel::TreeManager
-    def initialize engine
+    def initialize
       super
       @ast = Nodes::DeleteStatement.new
       @ctx = @ast
@@ -11,6 +11,11 @@ module Arel
       self
     end
 
+    def take limit
+      @ast.limit = Nodes::Limit.new(Nodes.build_quoted(limit)) if limit
+      self
+    end
+
     def wheres= list
       @ast.wheres = list
     end

data/lib/arel/insert_manager.rb

@@ -1,6 +1,6 @@
 module Arel
   class InsertManager < Arel::TreeManager
-    def initialize engine
+    def initialize
       super
       @ast = Nodes::InsertStatement.new
     end

data/lib/arel/nodes/binary.rb

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

data/lib/arel/nodes/bind_param.rb

@@ -1,6 +1,9 @@
 module Arel
   module Nodes
     class BindParam < Node
+      def ==(other)
+        other.is_a?(BindParam)
+      end
     end
   end
 end

data/lib/arel/nodes/casted.rb

@@ -0,0 +1,40 @@
+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:
+      alias :val :value
+      def nil?; val.nil?; end
+    end
+
+    def self.build_quoted other, attribute = nil
+      case other
+        when Arel::Nodes::Node, Arel::Attributes::Attribute, Arel::Table, Arel::Nodes::BindParam, Arel::SelectManager, Arel::Nodes::Quoted
+          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/delete_statement.rb

@@ -1,6 +1,8 @@
 module Arel
   module Nodes
     class DeleteStatement < Arel::Nodes::Binary
+      attr_accessor :limit
+
       alias :relation :left
       alias :relation= :left=
       alias :wheres :right

data/lib/arel/nodes/function.rb

@@ -3,6 +3,7 @@ module Arel
     class Function < Arel::Nodes::Node
       include Arel::Predications
       include Arel::WindowPredications
+      include Arel::OrderPredications
       attr_accessor :expressions, :alias, :distinct
 
       def initialize expr, aliaz = nil

data/lib/arel/nodes/matches.rb

@@ -2,10 +2,12 @@ module Arel
   module Nodes
     class Matches < Binary
       attr_reader :escape
+      attr_accessor :case_sensitive
 
-      def initialize(left, right, escape = nil)
+      def initialize(left, right, escape = nil, case_sensitive = false)
         super(left, right)
         @escape = escape && Nodes.build_quoted(escape)
+        @case_sensitive = case_sensitive
       end
     end
 

data/lib/arel/nodes/regexp.rb

@@ -0,0 +1,14 @@
+module Arel
+  module Nodes
+    class Regexp < Binary
+      attr_accessor :case_sensitive
+
+      def initialize(left, right, case_sensitive = true)
+        super(left, right)
+        @case_sensitive = case_sensitive
+      end
+    end
+
+    class NotRegexp < Regexp; end
+  end
+end

data/lib/arel/nodes/select_core.rb

@@ -2,7 +2,7 @@ module Arel
   module Nodes
     class SelectCore < Arel::Nodes::Node
       attr_accessor :top, :projections, :wheres, :groups, :windows
-      attr_accessor :having, :source, :set_quantifier
+      attr_accessor :havings, :source, :set_quantifier
 
       def initialize
         super()
@@ -14,7 +14,7 @@ module Arel
         @projections    = []
         @wheres         = []
         @groups         = []
-        @having         = nil
+        @havings        = []
         @windows        = []
       end
 
@@ -35,14 +35,14 @@ module Arel
         @projections = @projections.clone
         @wheres      = @wheres.clone
         @groups      = @groups.clone
-        @having      = @having.clone if @having
+        @havings     = @havings.clone
         @windows     = @windows.clone
       end
 
       def hash
         [
           @source, @top, @set_quantifier, @projections,
-          @wheres, @groups, @having, @windows
+          @wheres, @groups, @havings, @windows
         ].hash
       end
 
@@ -54,7 +54,7 @@ module Arel
           self.projections == other.projections &&
           self.wheres == other.wheres &&
           self.groups == other.groups &&
-          self.having == other.having &&
+          self.havings == other.havings &&
           self.windows == other.windows
       end
       alias :== :eql?

data/lib/arel/nodes/table_alias.rb

@@ -13,8 +13,12 @@ module Arel
         relation.respond_to?(:name) ? relation.name : name
       end
 
-      def engine
-        relation.engine
+      def type_cast_for_database(*args)
+        relation.type_cast_for_database(*args)
+      end
+
+      def able_to_type_cast?
+        relation.respond_to?(:able_to_type_cast?) && relation.able_to_type_cast?
       end
     end
   end

data/lib/arel/nodes/unary.rb

@@ -23,7 +23,6 @@ module Arel
     %w{
       Bin
       Group
-      Having
       Limit
       Not
       Offset

data/lib/arel/nodes.rb

@@ -30,6 +30,7 @@ require 'arel/nodes/table_alias'
 require 'arel/nodes/infix_operation'
 require 'arel/nodes/over'
 require 'arel/nodes/matches'
+require 'arel/nodes/regexp'
 
 # nary
 require 'arel/nodes/and'
@@ -55,41 +56,4 @@ 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
+require 'arel/nodes/casted'

data/lib/arel/predications.rb

@@ -25,15 +25,15 @@ module Arel
     end
 
     def between other
-      if other.begin == -Float::INFINITY
-        if other.end == Float::INFINITY
+      if equals_quoted?(other.begin, -Float::INFINITY)
+        if equals_quoted?(other.end, Float::INFINITY)
           not_in([])
         elsif other.exclude_end?
           lt(other.end)
         else
           lteq(other.end)
         end
-      elsif other.end == Float::INFINITY
+      elsif equals_quoted?(other.end, Float::INFINITY)
         gteq(other.begin)
       elsif other.exclude_end?
         gteq(other.begin).and(lt(other.end))
@@ -71,15 +71,15 @@ Passing a range to `#in` is deprecated. Call `#between`, instead.
     end
 
     def not_between other
-      if other.begin == -Float::INFINITY # The range begins with negative infinity
-        if other.end == Float::INFINITY
+      if equals_quoted?(other.begin, -Float::INFINITY)
+        if equals_quoted?(other.end, Float::INFINITY)
           self.in([])
         elsif other.exclude_end?
           gteq(other.end)
         else
           gt(other.end)
         end
-      elsif other.end == Float::INFINITY
+      elsif equals_quoted?(other.end, Float::INFINITY)
         lt(other.begin)
       else
         left = lt(other.begin)
@@ -118,20 +118,28 @@ Passing a range to `#not_in` is deprecated. Call `#not_between`, instead.
       grouping_all :not_in, others
     end
 
-    def matches other, escape = nil
-      Nodes::Matches.new self, quoted_node(other), escape
+    def matches other, escape = nil, case_sensitive = false
+      Nodes::Matches.new self, quoted_node(other), escape, case_sensitive
     end
 
-    def matches_any others, escape = nil
-      grouping_any :matches, others, escape
+    def matches_regexp other, case_sensitive = true
+      Nodes::Regexp.new self, quoted_node(other), case_sensitive
     end
 
-    def matches_all others, escape = nil
-      grouping_all :matches, others, escape
+    def matches_any others, escape = nil, case_sensitive = false
+      grouping_any :matches, others, escape, case_sensitive
     end
 
-    def does_not_match other, escape = nil
-      Nodes::DoesNotMatch.new self, quoted_node(other), escape
+    def matches_all others, escape = nil, case_sensitive = false
+      grouping_all :matches, others, escape, case_sensitive
+    end
+
+    def does_not_match other, escape = nil, case_sensitive = false
+      Nodes::DoesNotMatch.new self, quoted_node(other), escape, case_sensitive
+    end
+
+    def does_not_match_regexp other, case_sensitive = true
+      Nodes::NotRegexp.new self, quoted_node(other), case_sensitive
     end
 
     def does_not_match_any others, escape = nil
@@ -211,5 +219,13 @@ Passing a range to `#not_in` is deprecated. Call `#not_between`, instead.
     def quoted_array(others)
       others.map { |v| quoted_node(v) }
     end
+
+    def equals_quoted?(maybe_quoted, value)
+      if maybe_quoted.is_a?(Nodes::Quoted)
+        maybe_quoted.val == value
+      else
+        maybe_quoted == value
+      end
+    end
   end
 end

data/lib/arel/select_manager.rb

@@ -6,8 +6,8 @@ module Arel
 
     STRING_OR_SYMBOL_CLASS = [Symbol, String]
 
-    def initialize engine, table = nil
-      super(engine)
+    def initialize table = nil
+      super()
       @ast   = Nodes::SelectStatement.new
       @ctx    = @ast.cores.last
       from table
@@ -19,7 +19,7 @@ module Arel
     end
 
     def limit
-      @ast.limit && @ast.limit.expr.expr
+      @ast.limit && @ast.limit.expr
     end
     alias :taken :limit
 
@@ -118,8 +118,8 @@ module Arel
       join(relation, Nodes::OuterJoin)
     end
 
-    def having *exprs
-      @ctx.having = Nodes::Having.new(collapse(exprs, @ctx.having))
+    def having expr
+      @ctx.havings << expr
       self
     end
 
@@ -176,10 +176,10 @@ module Arel
       @ast.orders
     end
 
-    def where_sql
+    def where_sql engine = Table.engine
       return if @ctx.wheres.empty?
 
-      viz = Visitors::WhereSql.new @engine.connection
+      viz = Visitors::WhereSql.new(engine.connection.visitor, engine.connection)
       Nodes::SqlLiteral.new viz.accept(@ctx, Collectors::SQLString.new).value
     end
 
@@ -216,8 +216,8 @@ module Arel
 
     def take limit
       if limit
-        @ast.limit = Nodes::Limit.new(Nodes.build_quoted(limit))
-        @ctx.top   = Nodes::Top.new(Nodes.build_quoted(limit))
+        @ast.limit = Nodes::Limit.new(limit)
+        @ctx.top   = Nodes::Top.new(limit)
       else
         @ast.limit = nil
         @ctx.top   = nil

data/lib/arel/table.rb

@@ -6,40 +6,24 @@ module Arel
     @engine = nil
     class << self; attr_accessor :engine; end
 
-    attr_accessor :name, :engine, :aliases, :table_alias
+    attr_accessor :name, :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
+    def initialize(name, as: nil, type_caster: nil)
       @name    = name.to_s
-      @engine  = engine
       @columns = nil
       @aliases = []
-      @table_alias = nil
-      @primary_key = nil
+      @type_caster = type_caster
 
-      if Hash === engine
-        @engine  = engine[:engine] || Table.engine
-
-        # 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
-        # TableAlias node?
-        @table_alias = engine[:as] unless engine[:as].to_s == @name
-      end
-    end
-
-    def primary_key
-      if $VERBOSE
-        warn <<-eowarn
-primary_key (#{caller.first}) is deprecated and will be removed in Arel 4.0.0
-        eowarn
-      end
-      @primary_key ||= begin
-        primary_key_name = @engine.connection.primary_key(name)
-        # some tables might be without primary key
-        primary_key_name && self[primary_key_name]
+      # 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
+      # TableAlias node?
+      if as.to_s == @name
+        as = nil
       end
+      @table_alias = as
     end
 
     def alias name = "#{self.name}_2"
@@ -48,12 +32,12 @@ primary_key (#{caller.first}) is deprecated and will be removed in Arel 4.0.0
       end
     end
 
-    def from table
-      SelectManager.new(@engine, table)
+    def from
+      SelectManager.new(self)
     end
 
     def join relation, klass = Nodes::InnerJoin
-      return from(self) unless relation
+      return from unless relation
 
       case relation
       when String, Nodes::SqlLiteral
@@ -61,7 +45,7 @@ primary_key (#{caller.first}) is deprecated and will be removed in Arel 4.0.0
         klass = Nodes::StringJoin
       end
 
-      from(self).join(relation, klass)
+      from.join(relation, klass)
     end
 
     def outer_join relation
@@ -69,55 +53,39 @@ primary_key (#{caller.first}) is deprecated and will be removed in Arel 4.0.0
     end
 
     def group *columns
-      from(self).group(*columns)
+      from.group(*columns)
     end
 
     def order *expr
-      from(self).order(*expr)
+      from.order(*expr)
     end
 
     def where condition
-      from(self).where condition
+      from.where condition
     end
 
     def project *things
-      from(self).project(*things)
+      from.project(*things)
     end
 
     def take amount
-      from(self).take amount
+      from.take amount
     end
 
     def skip amount
-      from(self).skip amount
+      from.skip amount
     end
 
     def having expr
-      from(self).having expr
+      from.having expr
     end
 
     def [] name
       ::Arel::Attribute.new self, name
     end
 
-    def select_manager
-      SelectManager.new(@engine)
-    end
-
-    def insert_manager
-      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
+      # Perf note: aliases and table alias is excluded from the hash
       #  aliases can have a loop back to this table breaking hashes in parent
       #  relations, for the vast majority of cases @name is unique to a query
       @name.hash
@@ -126,12 +94,23 @@ primary_key (#{caller.first}) is deprecated and will be removed in Arel 4.0.0
     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?
 
+    def type_cast_for_database(attribute_name, value)
+      type_caster.type_cast_for_database(attribute_name, value)
+    end
+
+    def able_to_type_cast?
+      !type_caster.nil?
+    end
+
+    protected
+
+    attr_reader :type_caster
+
     private
 
     def attributes_for columns

data/lib/arel/tree_manager.rb

@@ -8,8 +8,7 @@ module Arel
 
     attr_accessor :bind_values
 
-    def initialize engine
-      @engine = engine
+    def initialize
       @ctx    = nil
       @bind_values = []
     end
@@ -20,13 +19,9 @@ module Arel
       collector.value
     end
 
-    def visitor
-      engine.connection.visitor
-    end
-
-    def to_sql
+    def to_sql engine = Table.engine
       collector = Arel::Collectors::SQLString.new
-      collector = visitor.accept @ast, collector
+      collector = engine.connection.visitor.accept @ast, collector
       collector.value
     end
 

data/lib/arel/update_manager.rb

@@ -1,6 +1,6 @@
 module Arel
   class UpdateManager < Arel::TreeManager
-    def initialize engine
+    def initialize
       super
       @ast = Nodes::UpdateStatement.new
       @ctx = @ast

data/lib/arel/visitors/depth_first.rb

@@ -146,7 +146,7 @@ module Arel
         visit o.wheres
         visit o.groups
         visit o.windows
-        visit o.having
+        visit o.havings
       end
 
       def visit_Arel_Nodes_SelectStatement o

data/lib/arel/visitors/informix.rb

@@ -34,8 +34,13 @@ module Arel
           collector = inject_join o.groups, collector, ", "
         end
 
-        maybe_visit o.having, collector
+        if o.havings.any?
+          collector << " HAVING "
+          collector = inject_join o.havings, collector, " AND "
+        end
+        collector
       end
+
       def visit_Arel_Nodes_Offset o, collector
         collector << "SKIP "
         visit o.expr, collector

data/lib/arel/visitors/mssql.rb

@@ -3,6 +3,11 @@ module Arel
     class MSSQL < Arel::Visitors::ToSql
       RowNumber = Struct.new :children
 
+      def initialize(*)
+        @primary_keys = {}
+        super
+      end
+
       private
 
       # `top` wouldn't really work here. I.e. User.select("distinct first_name").limit(10) would generate
@@ -61,6 +66,23 @@ module Arel
         end
       end
 
+      def visit_Arel_Nodes_DeleteStatement o, collector
+        collector << 'DELETE '
+        if o.limit
+          collector << 'TOP ('
+          visit o.limit.expr, collector
+          collector << ') '
+        end
+        collector << 'FROM '
+        collector = visit o.relation, collector
+        if o.wheres.any?
+          collector << ' WHERE '
+          inject_join o.wheres, collector, AND
+        else
+          collector
+        end
+      end
+
       def determine_order_by orders, x
         if orders.any?
           orders
@@ -81,10 +103,20 @@ module Arel
       end
 
       # FIXME raise exception of there is no pk?
-      # FIXME!! Table.primary_key will be deprecated. What is the replacement??
       def find_left_table_pk o
-        return o.primary_key if o.instance_of? Arel::Table
-        find_left_table_pk o.left if o.kind_of? Arel::Nodes::Join
+        if o.kind_of?(Arel::Nodes::Join)
+          find_left_table_pk(o.left)
+        elsif o.instance_of?(Arel::Table)
+          find_primary_key(o)
+        end
+      end
+
+      def find_primary_key(o)
+        @primary_keys[o.name] ||= begin
+          primary_key_name = @connection.primary_key(o.name)
+          # some tables might be without primary key
+          primary_key_name && o[primary_key_name]
+        end
       end
     end
   end

data/lib/arel/visitors/mysql.rb

@@ -40,7 +40,7 @@ module Arel
       # http://dev.mysql.com/doc/refman/5.0/en/select.html#id3482214
       def visit_Arel_Nodes_SelectStatement o, collector
         if o.offset && !o.limit
-          o.limit = Arel::Nodes::Limit.new(Nodes.build_quoted(18446744073709551615))
+          o.limit = Arel::Nodes::Limit.new(18446744073709551615)
         end
         super
       end

data/lib/arel/visitors/oracle.rb

@@ -17,7 +17,7 @@ module Arel
 
         if o.limit && o.offset
           o        = o.dup
-          limit    = o.limit.expr.expr
+          limit    = o.limit.expr
           offset   = o.offset
           o.offset = nil
           collector << "

data/lib/arel/visitors/oracle12.rb

@@ -0,0 +1,53 @@
+module Arel
+  module Visitors
+    class Oracle12 < Arel::Visitors::ToSql
+      private
+
+      def visit_Arel_Nodes_SelectStatement o, collector
+        # Oracle does not allow LIMIT clause with select for update
+        if o.limit && o.lock
+          o = o.dup
+          o.limit = []
+        end
+
+        super
+      end
+
+      def visit_Arel_Nodes_SelectOptions o, collector
+        collector = maybe_visit o.offset, collector
+        collector = maybe_visit o.limit, collector
+        collector = maybe_visit o.lock, collector
+      end
+
+      def visit_Arel_Nodes_Limit o, collector
+        collector << "FETCH FIRST "
+        collector = visit o.expr, collector
+        collector << " ROWS ONLY"
+      end
+
+      def visit_Arel_Nodes_Offset o, collector
+        collector << "OFFSET "
+        visit o.expr, collector
+        collector << " ROWS"
+      end
+
+      def visit_Arel_Nodes_Except o, collector
+        collector << "( "
+        collector = infix_value o, collector, " MINUS "
+        collector << " )"
+      end
+
+      def visit_Arel_Nodes_UpdateStatement o, collector
+        # Oracle does not allow ORDER BY/LIMIT in UPDATEs.
+        if o.orders.any? && o.limit.nil?
+          # However, there is no harm in silently eating the ORDER BY clause if no LIMIT has been provided,
+          # otherwise let the user deal with the error
+          o = o.dup
+          o.orders = []
+        end
+
+        super
+      end
+    end
+  end
+end

data/lib/arel/visitors/postgresql.rb

@@ -4,19 +4,35 @@ module Arel
       private
 
       def visit_Arel_Nodes_Matches o, collector
-        infix_value o, collector, ' ILIKE '
+        op = o.case_sensitive ? ' LIKE ' : ' ILIKE '
+        collector = infix_value o, collector, op
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
       end
 
       def visit_Arel_Nodes_DoesNotMatch o, collector
-        infix_value o, collector, ' NOT ILIKE '
+        op = o.case_sensitive ? ' NOT LIKE ' : ' NOT ILIKE '
+        collector = infix_value o, collector, op
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
       end
 
       def visit_Arel_Nodes_Regexp o, collector
-        infix_value o, collector, ' ~ '
+        op = o.case_sensitive ? ' ~ ' : ' ~* '
+        infix_value o, collector, op
       end
 
       def visit_Arel_Nodes_NotRegexp o, collector
-        infix_value o, collector, ' !~ '
+        op = o.case_sensitive ? ' !~ ' : ' !~* '
+        infix_value o, collector, op
       end
 
       def visit_Arel_Nodes_DistinctOn o, collector

data/lib/arel/visitors/to_sql.rb

@@ -4,6 +4,12 @@ require 'arel/visitors/reduce'
 
 module Arel
   module Visitors
+    class UnsupportedVisitError < StandardError
+      def initialize(object)
+        super "Unsupported argument type: #{object.class.name}. Construct an Arel node instead."
+      end
+    end
+
     class ToSql < Arel::Visitors::Reduce
       ##
       # This is some roflscale crazy stuff.  I'm roflscaling this because
@@ -74,14 +80,14 @@ module Arel
       end
 
       def visit_Arel_Nodes_DeleteStatement o, collector
-        collector << "DELETE FROM "
+        collector << 'DELETE FROM '
         collector = visit o.relation, collector
         if o.wheres.any?
-          collector << " WHERE "
-          inject_join o.wheres, collector, AND
-        else
-          collector
+          collector << ' WHERE '
+          collector = inject_join o.wheres, collector, AND
         end
+
+        maybe_visit o.limit, collector
       end
 
       # FIXME: we should probably have a 2-pass visitor for this
@@ -211,7 +217,6 @@ module Arel
         }
 
         unless o.orders.empty?
-          collector << SPACE
           collector << ORDER_BY
           len = o.orders.length - 1
           o.orders.each_with_index { |x, i|
@@ -220,11 +225,15 @@ module Arel
           }
         end
 
+        visit_Arel_Nodes_SelectOptions(o, collector)
+
+        collector
+      end
+
+      def visit_Arel_Nodes_SelectOptions o, collector
         collector = maybe_visit o.limit, collector
         collector = maybe_visit o.offset, collector
         collector = maybe_visit o.lock, collector
-
-        collector
       end
 
       def visit_Arel_Nodes_SelectCore o, collector
@@ -266,7 +275,10 @@ module Arel
           end
         end
 
-        collector = maybe_visit o.having, collector
+        unless o.havings.empty?
+          collector << " HAVING "
+          inject_join o.havings, collector, AND
+        end
 
         unless o.windows.empty?
           collector << WINDOW
@@ -405,11 +417,6 @@ module Arel
         end
       end
 
-      def visit_Arel_Nodes_Having o, collector
-        collector << "HAVING "
-        visit o.expr, collector
-      end
-
       def visit_Arel_Nodes_Offset o, collector
         collector << "OFFSET "
         visit o.expr, collector
@@ -575,8 +582,11 @@ module Arel
         visit o.left, collector
       end
 
-      def visit_Arel_Nodes_FullOuterJoin o
-        "FULL OUTER JOIN #{visit o.left} #{visit o.right}"
+      def visit_Arel_Nodes_FullOuterJoin o, collector
+        collector << "FULL OUTER JOIN "
+        collector = visit o.left, collector
+        collector << SPACE
+        visit o.right, collector
       end
 
       def visit_Arel_Nodes_OuterJoin o, collector
@@ -586,8 +596,11 @@ module Arel
         visit o.right, collector
       end
 
-      def visit_Arel_Nodes_RightOuterJoin o
-        "RIGHT OUTER JOIN #{visit o.left} #{visit o.right}"
+      def visit_Arel_Nodes_RightOuterJoin o, collector
+        collector << "RIGHT OUTER JOIN "
+        collector = visit o.left, collector
+        collector << SPACE
+        visit o.right, collector
       end
 
       def visit_Arel_Nodes_InnerJoin o, collector
@@ -722,11 +735,15 @@ module Arel
       alias :visit_Fixnum                :literal
 
       def quoted o, a
-        quote(o, column_for(a))
+        if a && a.able_to_type_cast?
+          quote(a.type_cast_for_database(o))
+        else
+          quote(o, column_for(a))
+        end
       end
 
       def unsupported o, collector
-        raise "unsupported: #{o.class.name}"
+        raise UnsupportedVisitError.new(o)
       end
 
       alias :visit_ActiveSupport_Multibyte_Chars :unsupported
@@ -762,6 +779,9 @@ module Arel
 
       def quote value, column = nil
         return value if Arel::Nodes::SqlLiteral === value
+        if column
+          print_type_cast_deprecation
+        end
         @connection.quote value, column
       end
 
@@ -811,6 +831,20 @@ module Arel
           collector
         end
       end
+
+      def print_type_cast_deprecation
+        unless defined?($arel_silence_type_casting_deprecation) && $arel_silence_type_casting_deprecation
+          warn <<-eowarn
+Arel performing automatic type casting is deprecated, and will be removed in Arel 8.0. If you are seeing this, it is because you are manually passing a value to an Arel predicate, and the `Arel::Table` object was constructed manually. The easiest way to remove this warning is to use an `Arel::Table` object returned from calling `arel_table` on an ActiveRecord::Base subclass.
+
+If you're certain the value is already of the right type, change `attribute.eq(value)` to `attribute.eq(Arel::Nodes::Quoted.new(value))` (you will be able to remove that in Arel 8.0, it is only required to silence this deprecation warning).
+
+You can also silence this warning globally by setting `$arel_silence_type_casting_deprecation` to `true`. (Do NOT do this if you are a library author)
+
+If you are passing user input to a predicate, you must either give an appropriate type caster object to the `Arel::Table`, or manually cast the value before passing it to Arel.
+          eowarn
+        end
+      end
     end
   end
 end

data/lib/arel/visitors/where_sql.rb

@@ -1,11 +1,20 @@
 module Arel
   module Visitors
     class WhereSql < Arel::Visitors::ToSql
+      def initialize(inner_visitor, *args, &block)
+        @inner_visitor = inner_visitor
+        super(*args, &block)
+      end
+
       private
 
       def visit_Arel_Nodes_SelectCore o, collector
         collector << "WHERE "
-        inject_join o.wheres, collector, ' AND '
+        wheres = o.wheres.map do |where|
+          Nodes::SqlLiteral.new(@inner_visitor.accept(where, collector.class.new).value)
+        end
+
+        inject_join wheres, collector, ' AND '
       end
     end
   end

data/lib/arel/visitors.rb

@@ -6,6 +6,7 @@ require 'arel/visitors/postgresql'
 require 'arel/visitors/mysql'
 require 'arel/visitors/mssql'
 require 'arel/visitors/oracle'
+require 'arel/visitors/oracle12'
 require 'arel/visitors/where_sql'
 require 'arel/visitors/dot'
 require 'arel/visitors/ibm_db'

data/lib/arel.rb

@@ -21,7 +21,7 @@ require 'arel/delete_manager'
 require 'arel/nodes'
 
 module Arel
-  VERSION = '6.0.0'
+  VERSION = '7.0.0'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Aaron Patterson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -99,6 +99,7 @@ files:
 - lib/arel/nodes/ascending.rb
 - lib/arel/nodes/binary.rb
 - lib/arel/nodes/bind_param.rb
+- lib/arel/nodes/casted.rb
 - lib/arel/nodes/count.rb
 - lib/arel/nodes/delete_statement.rb
 - lib/arel/nodes/descending.rb
@@ -118,6 +119,7 @@ files:
 - lib/arel/nodes/node.rb
 - lib/arel/nodes/outer_join.rb
 - lib/arel/nodes/over.rb
+- lib/arel/nodes/regexp.rb
 - lib/arel/nodes/right_outer_join.rb
 - lib/arel/nodes/select_core.rb
 - lib/arel/nodes/select_statement.rb
@@ -148,6 +150,7 @@ files:
 - lib/arel/visitors/mssql.rb
 - lib/arel/visitors/mysql.rb
 - lib/arel/visitors/oracle.rb
+- lib/arel/visitors/oracle12.rb
 - lib/arel/visitors/postgresql.rb
 - lib/arel/visitors/reduce.rb
 - lib/arel/visitors/sqlite.rb
@@ -177,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Arel Really Exasperates Logicians  Arel is a SQL AST manager for Ruby