arel 7.0.0 → 9.0.0

data/lib/arel/visitors/oracle.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class Oracle < Arel::Visitors::ToSql
@@ -26,11 +27,22 @@ module Arel
                 FROM ("
 
           collector = super(o, collector)
-          collector << ") raw_sql_
+
+          if offset.expr.is_a? Nodes::BindParam
+            collector << ') raw_sql_ WHERE rownum <= ('
+            collector = visit offset.expr, collector
+            collector << ' + '
+            collector = visit limit, collector
+            collector << ") ) WHERE raw_rnum_ > "
+            collector = visit offset.expr, collector
+            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
@@ -125,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
@@ -133,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
@@ -6,10 +7,12 @@ module Arel
       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 = []
+          raise ArgumentError, <<-MSG
+            'Combination of limit and lock is not supported.
+            because generated SQL statements
+            `SELECT FOR UPDATE and FETCH FIRST n ROWS` generates ORA-02014.`
+          MSG
         end
-
         super
       end
 
@@ -48,6 +51,10 @@ module Arel
 
         super
       end
+
+      def visit_Arel_Nodes_BindParam o, collector
+        collector.add_bind(o.value) { |i| ":a#{i}" }
+      end
     end
   end
 end

data/lib/arel/visitors/postgresql.rb

@@ -1,6 +1,11 @@
+# frozen_string_literal: true
 module Arel
   module Visitors
     class PostgreSQL < Arel::Visitors::ToSql
+      CUBE = 'CUBE'
+      ROLLUP = 'ROLLUP'
+      GROUPING_SET = 'GROUPING SET'
+
       private
 
       def visit_Arel_Nodes_Matches o, collector
@@ -41,7 +46,39 @@ 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
+        collector << "( "
+        visit(o.expr, collector) << " )"
+      end
+
+      def visit_Arel_Nodes_Cube o, collector
+        collector << CUBE
+        grouping_array_or_grouping_element o, collector
+      end
+
+      def visit_Arel_Nodes_RollUp o, collector
+        collector << ROLLUP
+        grouping_array_or_grouping_element o, collector
+      end
+
+      def visit_Arel_Nodes_GroupingSet o, collector
+        collector << GROUPING_SET
+        grouping_array_or_grouping_element o, collector
+      end
+
+      # Utilized by GroupingSet, Cube & RollUp visitors to
+      # handle grouping aggregation semantics
+      def grouping_array_or_grouping_element o, collector
+        if o.expr.is_a? Array
+          collector << "( "
+          visit o.expr, collector
+          collector << " )"
+        else
+          visit o.expr, collector
+        end
       end
     end
   end

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
@@ -12,6 +13,15 @@ module Arel
         o.limit = Arel::Nodes::Limit.new(-1) if o.offset && !o.limit
         super
       end
+
+      def visit_Arel_Nodes_True o, collector
+        collector << "1"
+      end
+
+      def visit_Arel_Nodes_False o, collector
+        collector << "0"
+      end
+
     end
   end
 end

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,37 +166,41 @@ module Arel
         collector << "FALSE"
       end
 
-      def table_exists? name
-        schema_cache.table_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 << ', '
+            collector << COMMA
           end
         }
 
@@ -243,53 +244,33 @@ module Arel
 
         collector = maybe_visit o.set_quantifier, collector
 
-        unless o.projections.empty?
-          collector << SPACE
-          len = o.projections.length - 1
-          o.projections.each_with_index do |x, i|
-            collector = visit(x, collector)
-            collector << COMMA unless len == i
-          end
-        end
+        collect_nodes_for o.projections, collector, SPACE
 
         if o.source && !o.source.empty?
           collector << " FROM "
           collector = visit o.source, collector
         end
 
-        unless o.wheres.empty?
-          collector << WHERE
-          len = o.wheres.length - 1
-          o.wheres.each_with_index do |x, i|
-            collector = visit(x, collector)
-            collector << AND unless len == i
-          end
-        end
-
-        unless o.groups.empty?
-          collector << GROUP_BY
-          len = o.groups.length - 1
-          o.groups.each_with_index do |x, i|
-            collector = visit(x, collector)
-            collector << COMMA unless len == i
-          end
-        end
-
+        collect_nodes_for o.wheres, collector, WHERE, AND
+        collect_nodes_for o.groups, collector, GROUP_BY
         unless o.havings.empty?
           collector << " HAVING "
           inject_join o.havings, collector, AND
         end
+        collect_nodes_for o.windows, collector, WINDOW
+
+        collector
+      end
 
-        unless o.windows.empty?
-          collector << WINDOW
-          len = o.windows.length - 1
-          o.windows.each_with_index do |x, i|
+      def collect_nodes_for nodes, collector, spacer, connector = COMMA
+        unless nodes.empty?
+          collector << spacer
+          len = nodes.length - 1
+          nodes.each_with_index do |x, i|
             collector = visit(x, collector)
-            collector << COMMA unless len == i
+            collector << connector unless len == i
           end
         end
-
-        collector
       end
 
       def visit_Arel_Nodes_Bin o, collector
@@ -306,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
@@ -349,13 +330,13 @@ module Arel
         end
 
         if o.orders.any?
-          collector << ' ' if o.partitions.any?
+          collector << SPACE if o.partitions.any?
           collector << "ORDER BY "
           collector = inject_join o.orders, collector, ", "
         end
 
         if o.framing
-          collector << ' ' if o.partitions.any? or o.orders.any?
+          collector << SPACE if o.partitions.any? or o.orders.any?
           collector = visit o.framing, collector
         end
 
@@ -446,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
@@ -564,8 +546,8 @@ module Arel
           collector = visit o.left, collector
         end
         if o.right.any?
-          collector << " " if o.left
-          collector = inject_join o.right, collector, ' '
+          collector << SPACE if o.left
+          collector = inject_join o.right, collector, SPACE
         end
         collector
       end
@@ -672,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
 
@@ -708,6 +690,35 @@ module Arel
         visit o.right, collector
       end
 
+      def visit_Arel_Nodes_Case o, collector
+        collector << "CASE "
+        if o.case
+          visit o.case, collector
+          collector << " "
+        end
+        o.conditions.each do |condition|
+          visit condition, collector
+          collector << " "
+        end
+        if o.default
+          visit o.default, collector
+          collector << " "
+        end
+        collector << "END"
+      end
+
+      def visit_Arel_Nodes_When o, collector
+        collector << "WHEN "
+        visit o.left, collector
+        collector << " THEN "
+        visit o.right, collector
+      end
+
+      def visit_Arel_Nodes_Else o, collector
+        collector << "ELSE "
+        visit o.expr, collector
+      end
+
       def visit_Arel_Nodes_UnqualifiedColumn o, collector
         collector << "#{quote_column_name o.name}"
         collector
@@ -727,18 +738,19 @@ 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
       alias :visit_Bignum                :literal
       alias :visit_Fixnum                :literal
+      alias :visit_Integer               :literal
 
       def quoted o, a
         if a && a.able_to_type_cast?
           quote(a.type_cast_for_database(o))
         else
-          quote(o, column_for(a))
+          quote(o)
         end
       end
 
@@ -772,17 +784,19 @@ module Arel
       alias :visit_Arel_Nodes_Multiplication :visit_Arel_Nodes_InfixOperation
       alias :visit_Arel_Nodes_Division       :visit_Arel_Nodes_InfixOperation
 
+      def visit_Arel_Nodes_UnaryOperation o, collector
+        collector << " #{o.operator} "
+        visit o.expr, collector
+      end
+
       def visit_Array o, collector
         inject_join o, collector, ", "
       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
@@ -831,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'
@@ -14,28 +15,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/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.0.0'
+  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.0.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Aaron Patterson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 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
 
@@ -75,21 +89,24 @@ extensions: []
 extra_rdoc_files:
 - History.txt
 - MIT-LICENSE.txt
-- README.markdown
+- README.md
 files:
 - History.txt
 - MIT-LICENSE.txt
-- README.markdown
+- README.md
 - lib/arel.rb
 - lib/arel/alias_predication.rb
 - 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
@@ -99,6 +116,7 @@ files:
 - lib/arel/nodes/ascending.rb
 - lib/arel/nodes/binary.rb
 - lib/arel/nodes/bind_param.rb
+- lib/arel/nodes/case.rb
 - lib/arel/nodes/casted.rb
 - lib/arel/nodes/count.rb
 - lib/arel/nodes/delete_statement.rb
@@ -129,9 +147,11 @@ files:
 - lib/arel/nodes/terminal.rb
 - lib/arel/nodes/true.rb
 - lib/arel/nodes/unary.rb
+- lib/arel/nodes/unary_operation.rb
 - 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
@@ -141,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
@@ -165,14 +183,14 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--main"
-- README.markdown
+- README.md
 require_paths:
 - lib
 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:
   - - ">="
@@ -180,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.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