arel 6.0.4 → 7.1.4

data/lib/arel/table.rb

@@ -6,54 +6,35 @@ module Arel
     @engine = nil
     class << self; attr_accessor :engine; end
 
-    attr_accessor :name, :engine, :aliases, :table_alias
+    attr_accessor :name, :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"
-      Nodes::TableAlias.new(self, name).tap do |node|
-        @aliases << node
-      end
+      Nodes::TableAlias.new(self, name)
     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 +42,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 +50,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 +91,22 @@ 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.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'
@@ -13,28 +14,5 @@ require 'arel/visitors/informix'
 
 module Arel
   module Visitors
-    VISITORS = {
-      'postgresql'      => Arel::Visitors::PostgreSQL,
-      'mysql'           => Arel::Visitors::MySQL,
-      'mysql2'          => Arel::Visitors::MySQL,
-      'mssql'           => Arel::Visitors::MSSQL,
-      'sqlserver'       => Arel::Visitors::MSSQL,
-      'oracle_enhanced' => Arel::Visitors::Oracle,
-      'sqlite'          => Arel::Visitors::SQLite,
-      'sqlite3'         => Arel::Visitors::SQLite,
-      'ibm_db'          => Arel::Visitors::IBM_DB,
-      'informix'        => Arel::Visitors::Informix,
-    }
-
-    ENGINE_VISITORS = Hash.new do |hash, engine|
-      pool         = engine.connection_pool
-      adapter      = pool.spec.config[:adapter]
-      hash[engine] = (VISITORS[adapter] || Visitors::ToSql).new(engine)
-    end
-
-    def self.visitor_for engine
-      ENGINE_VISITORS[engine]
-    end
-    class << self; alias :for :visitor_for; end
   end
 end

data/lib/arel/visitors/depth_first.rb

@@ -16,7 +16,12 @@ module Arel
       def unary o
         visit o.expr
       end
+      alias :visit_Arel_Nodes_Else              :unary
       alias :visit_Arel_Nodes_Group             :unary
+      alias :visit_Arel_Nodes_Cube              :unary
+      alias :visit_Arel_Nodes_RollUp            :unary
+      alias :visit_Arel_Nodes_GroupingSet       :unary
+      alias :visit_Arel_Nodes_GroupingElement   :unary
       alias :visit_Arel_Nodes_Grouping          :unary
       alias :visit_Arel_Nodes_Having            :unary
       alias :visit_Arel_Nodes_Limit             :unary
@@ -53,6 +58,12 @@ module Arel
         visit o.distinct
       end
 
+      def visit_Arel_Nodes_Case o
+        visit o.case
+        visit o.conditions
+        visit o.default
+      end
+
       def nary o
         o.children.each { |child| visit child}
       end
@@ -65,6 +76,7 @@ module Arel
       alias :visit_Arel_Nodes_As                 :binary
       alias :visit_Arel_Nodes_Assignment         :binary
       alias :visit_Arel_Nodes_Between            :binary
+      alias :visit_Arel_Nodes_Concat             :binary
       alias :visit_Arel_Nodes_DeleteStatement    :binary
       alias :visit_Arel_Nodes_DoesNotMatch       :binary
       alias :visit_Arel_Nodes_Equality           :binary
@@ -87,7 +99,7 @@ module Arel
       alias :visit_Arel_Nodes_RightOuterJoin     :binary
       alias :visit_Arel_Nodes_TableAlias         :binary
       alias :visit_Arel_Nodes_Values             :binary
-      alias :visit_Arel_Nodes_Union              :binary
+      alias :visit_Arel_Nodes_When               :binary
 
       def visit_Arel_Nodes_StringJoin o
         visit o.left
@@ -147,7 +159,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/dot.rb

@@ -69,6 +69,10 @@ module Arel
         visit_edge o, "expr"
       end
       alias :visit_Arel_Nodes_Group             :unary
+      alias :visit_Arel_Nodes_Cube              :unary
+      alias :visit_Arel_Nodes_RollUp            :unary
+      alias :visit_Arel_Nodes_GroupingSet       :unary
+      alias :visit_Arel_Nodes_GroupingElement   :unary
       alias :visit_Arel_Nodes_Grouping          :unary
       alias :visit_Arel_Nodes_Having            :unary
       alias :visit_Arel_Nodes_Limit             :unary
@@ -151,6 +155,11 @@ module Arel
         visit_edge o, "name"
       end
 
+      def visit_Arel_Nodes_Casted o
+        visit_edge o, 'val'
+        visit_edge o, 'attribute'
+      end
+
       def visit_Arel_Attribute o
         visit_edge o, "relation"
         visit_edge o, "name"
@@ -176,6 +185,7 @@ module Arel
       alias :visit_Arel_Nodes_As                 :binary
       alias :visit_Arel_Nodes_Assignment         :binary
       alias :visit_Arel_Nodes_Between            :binary
+      alias :visit_Arel_Nodes_Concat             :binary
       alias :visit_Arel_Nodes_DoesNotMatch       :binary
       alias :visit_Arel_Nodes_Equality           :binary
       alias :visit_Arel_Nodes_GreaterThan        :binary
@@ -199,7 +209,6 @@ module Arel
       alias :visit_NilClass :visit_String
       alias :visit_TrueClass :visit_String
       alias :visit_FalseClass :visit_String
-      alias :visit_Arel_Nodes_BindParam :visit_String
       alias :visit_Integer :visit_String
       alias :visit_Fixnum :visit_String
       alias :visit_BigDecimal :visit_String
@@ -207,6 +216,8 @@ module Arel
       alias :visit_Symbol :visit_String
       alias :visit_Arel_Nodes_SqlLiteral :visit_String
 
+      def visit_Arel_Nodes_BindParam o; end
+
       def visit_Hash o
         o.each_with_index do |pair, i|
           edge("pair_#{i}")   { visit pair }

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

@@ -72,6 +72,14 @@ module Arel
         maybe_visit o.limit, collector
       end
 
+      def visit_Arel_Nodes_Concat o, collector
+        collector << " CONCAT("
+        visit o.left, collector
+        collector << ", "
+        visit o.right, collector
+        collector << ") "
+        collector
+      end
     end
   end
 end

data/lib/arel/visitors/oracle.rb

@@ -26,11 +26,22 @@ module Arel
                 FROM ("
 
           collector = super(o, collector)
-          collector << ") raw_sql_
+
+          if offset.expr.is_a? Nodes::BindParam
+            offset_bind = nil
+            collector << ') raw_sql_ WHERE rownum <= ('
+            collector.add_bind(offset.expr) { |i| offset_bind = ":a#{i}" }
+            collector << ' + '
+            collector.add_bind(limit) { |i| ":a#{i}" }
+            collector << ") ) WHERE raw_rnum_ > #{offset_bind}"
+            return collector
+          else
+            collector << ") raw_sql_
                 WHERE rownum <= #{offset.expr.to_i + limit}
               )
               WHERE "
-          return visit(offset, collector)
+            return visit(offset, collector)
+          end
         end
 
         if o.limit