arel 7.1.4 → 9.0.0

data/lib/arel/nodes/window.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Nodes
     class Window < Arel::Nodes::Node
@@ -106,6 +107,7 @@ module Arel
       def eql? other
         self.class == other.class
       end
+      alias :== :eql?
     end
 
     class Preceding < Unary

data/lib/arel/nodes/with.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Nodes
     class With < Arel::Nodes::Unary

data/lib/arel/nodes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # node
 require 'arel/nodes/node'
 require 'arel/nodes/select_statement'
@@ -43,6 +44,7 @@ require 'arel/nodes/function'
 require 'arel/nodes/count'
 require 'arel/nodes/extract'
 require 'arel/nodes/values'
+require 'arel/nodes/values_list'
 require 'arel/nodes/named_function'
 
 # windows

data/lib/arel/order_predications.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module OrderPredications
 

data/lib/arel/predications.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Predications
     def not_eq other

data/lib/arel/select_manager.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'arel/collectors/sql_string'
 
 module Arel
@@ -106,7 +107,7 @@ module Arel
 
       case relation
       when String, Nodes::SqlLiteral
-        raise if relation.empty?
+        raise EmptyJoinError if relation.empty?
         klass = Nodes::StringJoin
       end
 

data/lib/arel/table.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   class Table
     include Arel::Crud
@@ -13,7 +14,6 @@ module Arel
 
     def initialize(name, as: nil, type_caster: nil)
       @name    = name.to_s
-      @columns = nil
       @type_caster = type_caster
 
       # Sometime AR sends an :as parameter to table, to let the table know
@@ -38,7 +38,7 @@ module Arel
 
       case relation
       when String, Nodes::SqlLiteral
-        raise if relation.empty?
+        raise EmptyJoinError if relation.empty?
         klass = Nodes::StringJoin
       end
 
@@ -106,16 +106,5 @@ module Arel
     protected
 
     attr_reader :type_caster
-
-    private
-
-    def attributes_for columns
-      return nil unless columns
-
-      columns.map do |column|
-        Attributes.for(column).new self, column.name.to_sym
-      end
-    end
-
   end
 end

data/lib/arel/tree_manager.rb

@@ -1,16 +1,14 @@
+# frozen_string_literal: true
 require 'arel/collectors/sql_string'
 
 module Arel
   class TreeManager
     include Arel::FactoryMethods
 
-    attr_reader :ast, :engine
-
-    attr_accessor :bind_values
+    attr_reader :ast
 
     def initialize
-      @ctx    = nil
-      @bind_values = []
+      @ctx = nil
     end
 
     def to_dot

data/lib/arel/update_manager.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   class UpdateManager < Arel::TreeManager
     def initialize

data/lib/arel/visitors/depth_first.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class DepthFirst < Arel::Visitors::Visitor

data/lib/arel/visitors/dot.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class Dot < Arel::Visitors::Visitor
@@ -277,7 +278,7 @@ module Arel
             label = "<f0>#{node.name}"
 
             node.fields.each_with_index do |field, i|
-              label << "|<f#{i + 1}>#{quote field}"
+              label += "|<f#{i + 1}>#{quote field}"
             end
 
             "#{node.id} [label=\"#{label}\"];"

data/lib/arel/visitors/ibm_db.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class IBM_DB < Arel::Visitors::ToSql

data/lib/arel/visitors/informix.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class Informix < Arel::Visitors::ToSql
@@ -17,9 +18,7 @@ module Arel
       end
       def visit_Arel_Nodes_SelectCore o, collector
         collector = inject_join o.projections, collector, ", "
-        froms = false
         if o.source && !o.source.empty?
-          froms = true
           collector << " FROM "
           collector = visit o.source, collector
         end

data/lib/arel/visitors/mssql.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class MSSQL < Arel::Visitors::ToSql

data/lib/arel/visitors/mysql.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class MySQL < Arel::Visitors::ToSql

data/lib/arel/visitors/oracle.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class Oracle < Arel::Visitors::ToSql
@@ -28,12 +29,12 @@ module Arel
           collector = super(o, collector)
 
           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 = visit offset.expr, collector
             collector << ' + '
-            collector.add_bind(limit) { |i| ":a#{i}" }
-            collector << ") ) WHERE raw_rnum_ > #{offset_bind}"
+            collector = visit limit, collector
+            collector << ") ) WHERE raw_rnum_ > "
+            collector = visit offset.expr, collector
             return collector
           else
             collector << ") raw_sql_
@@ -136,7 +137,7 @@ module Arel
             array[i] << ',' << part
           else
             # to ensure that array[i] will be String and not Arel::Nodes::SqlLiteral
-            array[i] = '' << part
+            array[i] = part.to_s
           end
           i += 1 if array[i].count('(') == array[i].count(')')
         end
@@ -144,7 +145,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_BindParam o, collector
-        collector.add_bind(o) { |i| ":a#{i}" }
+        collector.add_bind(o.value) { |i| ":a#{i}" }
       end
 
     end

data/lib/arel/visitors/oracle12.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class Oracle12 < Arel::Visitors::ToSql
@@ -52,7 +53,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_BindParam o, collector
-        collector.add_bind(o) { |i| ":a#{i}" }
+        collector.add_bind(o.value) { |i| ":a#{i}" }
       end
     end
   end

data/lib/arel/visitors/postgresql.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class PostgreSQL < Arel::Visitors::ToSql
@@ -45,7 +46,7 @@ module Arel
       end
 
       def visit_Arel_Nodes_BindParam o, collector
-        collector.add_bind(o) { |i| "$#{i}" }
+        collector.add_bind(o.value) { |i| "$#{i}" }
       end
 
       def visit_Arel_Nodes_GroupingElement o, collector

data/lib/arel/visitors/reduce.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'arel/visitors/visitor'
 
 module Arel
@@ -10,9 +11,10 @@ module Arel
       private
 
       def visit object, collector
-        send dispatch[object.class], object, collector
+        dispatch_method = dispatch[object.class]
+        send dispatch_method, object, collector
       rescue NoMethodError => e
-        raise e if respond_to?(dispatch[object.class], true)
+        raise e if respond_to?(dispatch_method, true)
         superklass = object.class.ancestors.find { |klass|
           respond_to?(dispatch[klass], true)
         }

data/lib/arel/visitors/sqlite.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class SQLite < Arel::Visitors::ToSql

data/lib/arel/visitors/to_sql.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bigdecimal'
 require 'date'
 require 'arel/visitors/reduce'
@@ -75,15 +76,11 @@ module Arel
 
       private
 
-      def schema_cache
-        @connection.schema_cache
-      end
-
       def visit_Arel_Nodes_DeleteStatement o, collector
         collector << 'DELETE FROM '
         collector = visit o.relation, collector
         if o.wheres.any?
-          collector << ' WHERE '
+          collector << WHERE
           collector = inject_join o.wheres, collector, AND
         end
 
@@ -169,34 +166,38 @@ module Arel
         collector << "FALSE"
       end
 
-      def table_exists? name
-        schema_cache.data_source_exists?(name)
-      end
-
-      def column_for attr
-        return unless attr
-        name    = attr.name.to_s
-        table   = attr.relation.table_name
-
-        return nil unless table_exists? table
-
-        column_cache(table)[name]
-      end
-
-      def column_cache(table)
-        schema_cache.columns_hash(table)
+      def visit_Arel_Nodes_ValuesList o, collector
+        collector << "VALUES "
+
+        len = o.rows.length - 1
+        o.rows.each_with_index { |row, i|
+          collector << '('
+          row_len = row.length - 1
+          row.each_with_index do |value, k|
+            case value
+            when Nodes::SqlLiteral, Nodes::BindParam
+              collector = visit(value, collector)
+            else
+              collector << quote(value)
+            end
+            collector << COMMA unless k == row_len
+          end
+          collector << ')'
+          collector << COMMA unless i == len
+        }
+        collector
       end
 
       def visit_Arel_Nodes_Values o, collector
         collector << "VALUES ("
 
         len = o.expressions.length - 1
-        o.expressions.zip(o.columns).each_with_index { |(value, attr), i|
+        o.expressions.each_with_index { |value, i|
           case value
           when Nodes::SqlLiteral, Nodes::BindParam
             collector = visit value, collector
           else
-            collector << quote(value, attr && column_for(attr)).to_s
+            collector << quote(value).to_s
           end
           unless i == len
             collector << COMMA
@@ -286,12 +287,12 @@ module Arel
 
       def visit_Arel_Nodes_With o, collector
         collector << "WITH "
-        inject_join o.children, collector, ', '
+        inject_join o.children, collector, COMMA
       end
 
       def visit_Arel_Nodes_WithRecursive o, collector
         collector << "WITH RECURSIVE "
-        inject_join o.children, collector, ', '
+        inject_join o.children, collector, COMMA
       end
 
       def visit_Arel_Nodes_Union o, collector
@@ -426,7 +427,8 @@ module Arel
       end
 
       def visit_Arel_SelectManager o, collector
-        collector << "(#{o.to_sql.rstrip})"
+        collector << '('
+        visit(o.ast, collector) << ')'
       end
 
       def visit_Arel_Nodes_Ascending o, collector
@@ -545,7 +547,7 @@ module Arel
         end
         if o.right.any?
           collector << SPACE if o.left
-          collector = inject_join o.right, collector, ' '
+          collector = inject_join o.right, collector, SPACE
         end
         collector
       end
@@ -652,7 +654,7 @@ module Arel
         else
           collector = visit o.left, collector
           collector << " = "
-          collector << quote(o.right, column_for(o.left)).to_s
+          collector << quote(o.right).to_s
         end
       end
 
@@ -736,7 +738,7 @@ module Arel
       def literal o, collector; collector << o.to_s; end
 
       def visit_Arel_Nodes_BindParam o, collector
-        collector.add_bind(o) { "?" }
+        collector.add_bind(o.value) { "?" }
       end
 
       alias :visit_Arel_Nodes_SqlLiteral :literal
@@ -748,7 +750,7 @@ module Arel
         if a && a.able_to_type_cast?
           quote(a.type_cast_for_database(o))
         else
-          quote(o, column_for(a))
+          quote(o)
         end
       end
 
@@ -792,12 +794,9 @@ module Arel
       end
       alias :visit_Set :visit_Array
 
-      def quote value, column = nil
+      def quote value
         return value if Arel::Nodes::SqlLiteral === value
-        if column
-          print_type_cast_deprecation
-        end
-        @connection.quote value, column
+        @connection.quote value
       end
 
       def quote_table_name name
@@ -846,20 +845,6 @@ 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/visitor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class Visitor
@@ -26,9 +27,10 @@ module Arel
       end
 
       def visit object
-        send dispatch[object.class], object
+        dispatch_method = dispatch[object.class]
+        send dispatch_method, object
       rescue NoMethodError => e
-        raise e if respond_to?(dispatch[object.class], true)
+        raise e if respond_to?(dispatch_method, true)
         superklass = object.class.ancestors.find { |klass|
           respond_to?(dispatch[klass], true)
         }

data/lib/arel/visitors/where_sql.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class WhereSql < Arel::Visitors::ToSql

data/lib/arel/visitors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'arel/visitors/visitor'
 require 'arel/visitors/depth_first'
 require 'arel/visitors/to_sql'

data/lib/arel/window_predications.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module WindowPredications
 

data/lib/arel.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+require 'arel/errors'
+
 require 'arel/crud'
 require 'arel/factory_methods'
 
@@ -21,7 +24,7 @@ require 'arel/delete_manager'
 require 'arel/nodes'
 
 module Arel
-  VERSION = '7.1.4'
+  VERSION = '9.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: 7.1.4
+  version: 9.0.0
 platform: ruby
 authors:
 - Aaron Patterson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -55,6 +55,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: |-
   Arel Really Exasperates Logicians
 
@@ -85,11 +99,14 @@ files:
 - lib/arel/attributes.rb
 - lib/arel/attributes/attribute.rb
 - lib/arel/collectors/bind.rb
+- lib/arel/collectors/composite.rb
 - lib/arel/collectors/plain_string.rb
 - lib/arel/collectors/sql_string.rb
+- lib/arel/collectors/substitute_binds.rb
 - lib/arel/compatibility/wheres.rb
 - lib/arel/crud.rb
 - lib/arel/delete_manager.rb
+- lib/arel/errors.rb
 - lib/arel/expressions.rb
 - lib/arel/factory_methods.rb
 - lib/arel/insert_manager.rb
@@ -134,6 +151,7 @@ files:
 - lib/arel/nodes/unqualified_column.rb
 - lib/arel/nodes/update_statement.rb
 - lib/arel/nodes/values.rb
+- lib/arel/nodes/values_list.rb
 - lib/arel/nodes/window.rb
 - lib/arel/nodes/with.rb
 - lib/arel/order_predications.rb
@@ -143,8 +161,6 @@ files:
 - lib/arel/tree_manager.rb
 - lib/arel/update_manager.rb
 - lib/arel/visitors.rb
-- lib/arel/visitors/bind_substitute.rb
-- lib/arel/visitors/bind_visitor.rb
 - lib/arel/visitors/depth_first.rb
 - lib/arel/visitors/dot.rb
 - lib/arel/visitors/ibm_db.rb
@@ -174,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -182,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Arel Really Exasperates Logicians  Arel is a SQL AST manager for Ruby

data/lib/arel/visitors/bind_substitute.rb

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

data/lib/arel/visitors/bind_visitor.rb

@@ -1,39 +0,0 @@
-module Arel
-  module Visitors
-    module BindVisitor
-      def initialize target
-        @block = nil
-        super
-      end
-
-      def accept node, collector, &block
-        @block = block if block_given?
-        super
-      end
-
-      private
-
-      def visit_Arel_Nodes_Assignment o, collector
-        if o.right.is_a? Arel::Nodes::BindParam
-          collector = visit o.left, collector
-          collector << " = "
-          visit o.right, collector
-        else
-          super
-        end
-      end
-
-      def visit_Arel_Nodes_BindParam o, collector
-        if @block
-          val = @block.call
-          if String === val
-            collector << val
-          end
-        else
-          super
-        end
-      end
-
-    end
-  end
-end