arel_toolkit 0.4.0 → 0.4.5

data/lib/arel/enhance/query.rb

@@ -27,6 +27,8 @@ module Arel
               matches? object_attribute_value, test_value
             end
           end
+        when Arel::Enhance::QueryMethods::QueryMethod
+          test.matches?(object)
         else
           object == test
         end

data/lib/arel/enhance/query_methods.rb

@@ -0,0 +1,23 @@
+module Arel
+  module Enhance
+    module QueryMethods
+      class QueryMethod
+        attr_reader :subject
+
+        def initialize(subject)
+          @subject = subject
+        end
+      end
+
+      class Ancestors < QueryMethod
+        def matches?(other)
+          other <= subject
+        end
+      end
+
+      def self.in_ancestors?(object)
+        Ancestors.new(object)
+      end
+    end
+  end
+end

data/lib/arel/enhance/visitor.rb

@@ -40,8 +40,10 @@ module Arel
       end
       alias visit_Arel_Nodes_And nary
 
-      def visit_Hash(_object)
-        raise 'Hash is not supported'
+      def visit_Hash(object)
+        object.each do |key, child|
+          process_node(child, Arel::Enhance::PathNode.new([:[], key], key))
+        end
       end
 
       def visit_Array(object)
@@ -61,9 +63,23 @@ module Arel
         end
       end
 
+      # rubocop:disable Metrics/AbcSize
+      # arel/lib/arel/visitors/visitor.rb:29
       def visit(object)
-        Arel::Visitors::Visitor.instance_method(:visit).bind(self).call(object)
+        dispatch_method = dispatch[object.class]
+        send dispatch_method, object
+      rescue NoMethodError => e
+        raise e if respond_to?(dispatch_method, true)
+
+        superklass = object.class.ancestors.find do |klass|
+          respond_to?(dispatch[klass], true)
+        end
+        raise(TypeError, "Cannot visit #{object.class}") unless superklass
+
+        dispatch[object.class] = dispatch[superklass]
+        retry
       end
+      # rubocop:enable Metrics/AbcSize
 
       def current_node
         @node_stack.last

data/lib/arel/extensions.rb

@@ -21,6 +21,7 @@ require 'arel/extensions/lateral'
 require 'arel/extensions/range_function'
 require 'arel/extensions/with_ordinality'
 require 'arel/extensions/table'
+require 'arel/extensions/attributes_attribute'
 require 'arel/extensions/row'
 require 'arel/extensions/ordering'
 require 'arel/extensions/all'
@@ -63,8 +64,6 @@ require 'arel/extensions/current_of_expression'
 require 'arel/extensions/delete_statement'
 require 'arel/extensions/least'
 require 'arel/extensions/greatest'
-require 'arel/extensions/generate_series'
-require 'arel/extensions/rank'
 require 'arel/extensions/coalesce'
 require 'arel/extensions/not_equal'
 require 'arel/extensions/equality'
@@ -110,6 +109,13 @@ require 'arel/extensions/to_sql'
 require 'arel/extensions/prepare'
 require 'arel/extensions/dealocate'
 require 'arel/extensions/active_record_type_caster_map'
+require 'arel/extensions/active_record_type_caster_connection'
+require 'arel/extensions/active_record_relation_query_attribute'
+require 'arel/extensions/active_model_attribute_with_cast_value'
+require 'arel/extensions/exists'
+require 'arel/extensions/bind_param'
+require 'arel/extensions/node'
+require 'arel/extensions/top'
 
 module Arel
   module Extensions

data/lib/arel/extensions/active_model_attribute_with_cast_value.rb

@@ -0,0 +1,22 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Visitors
+    class Dot
+      def visit_ActiveModel_Attribute_WithCastValue(o)
+        visit_edge o, 'name'
+        visit_edge o, 'value_before_type_cast'
+      end
+    end
+
+    class ToSql
+      def visit_ActiveModel_Attribute_WithCastValue(_o, collector)
+        collector
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/active_record_relation_query_attribute.rb

@@ -0,0 +1,22 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Visitors
+    class Dot
+      def visit_ActiveRecord_Relation_QueryAttribute(o)
+        visit_edge o, 'name'
+        visit_edge o, 'value_before_type_cast'
+      end
+    end
+
+    class ToSql
+      def visit_ActiveRecord_Relation_QueryAttribute(_o, collector)
+        collector
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/active_record_type_caster_connection.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Visitors
+    class Dot
+      alias visit_ActiveRecord_TypeCaster_Connection terminal
+    end
+  end
+end

data/lib/arel/extensions/attributes_attribute.rb

@@ -0,0 +1,47 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Attributes
+    class Attribute
+      module AttributeExtension
+        # postgres only: https://www.postgresql.org/docs/10/ddl-schemas.html
+        attr_accessor :schema_name
+        attr_accessor :database
+      end
+
+      prepend AttributeExtension
+    end
+  end
+
+  module Visitors
+    class ToSql
+      module AttributesAttributeExtension
+        def visit_Arel_Attributes_Attribute(o, collector)
+          collector << "#{quote_table_name(o.database)}." if o.database
+          collector << "#{quote_table_name(o.schema_name)}." if o.schema_name
+
+          super
+        end
+      end
+
+      prepend AttributesAttributeExtension
+    end
+
+    class Dot
+      module AttributesAttributeExtension
+        def visit_Arel_Attributes_Attribute(o)
+          super
+
+          visit_edge o, 'schema_name'
+          visit_edge o, 'database'
+        end
+      end
+
+      prepend AttributesAttributeExtension
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/bind_param.rb

@@ -0,0 +1,15 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Visitors
+    class Dot
+      def visit_Arel_Nodes_BindParam(o)
+        visit_edge o, 'value'
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/coalesce.rb

@@ -1,9 +1,23 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
 module Arel
   module Nodes
-    class Coalesce < Arel::Nodes::NamedFunction
-      def initialize(args)
-        super 'COALESCE', args
+    # https://www.postgresql.org/docs/10/functions-conditional.html
+    class Coalesce < Arel::Nodes::Unary
+    end
+  end
+
+  module Visitors
+    class ToSql
+      def visit_Arel_Nodes_Coalesce(o, collector)
+        collector << 'COALESCE('
+        collector = inject_join(o.expr, collector, ', ')
+        collector << ')'
       end
     end
   end
 end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/delete_statement.rb

@@ -9,11 +9,14 @@ module Arel
         attr_accessor :using
         attr_accessor :with
         attr_accessor :returning
+        attr_accessor :orders
 
         def initialize(relation = nil, wheres = [])
           super
 
           @returning = []
+          @orders = []
+          @using = []
         end
       end
 
@@ -27,27 +30,29 @@ module Arel
       def visit_Arel_Nodes_DeleteStatement(o, collector)
         if o.with
           collector = visit o.with, collector
-          collector << SPACE
+          collector << ' '
         end
 
-        collector << 'DELETE FROM '
-        collector = visit o.relation, collector
-
-        if o.using
-          collector << ' USING '
-          collector = inject_join o.using, collector, ', '
-        end
+        if Gem.loaded_specs['activerecord'].version >= Gem::Version.new('6.0.0')
+          o = prepare_delete_statement(o)
 
-        if o.wheres.any?
-          collector << WHERE
-          collector = inject_join o.wheres, collector, AND
+          if has_join_sources?(o)
+            collector << 'DELETE '
+            visit o.relation.left, collector
+            collector << ' FROM '
+          else
+            collector << 'DELETE FROM '
+          end
+        else
+          collector << 'DELETE FROM '
         end
 
-        unless o.returning.empty?
-          collector << ' RETURNING '
-          collector = inject_join o.returning, collector, ', '
-        end
+        collector = visit o.relation, collector
 
+        collect_nodes_for o.using, collector, ' USING ', ', '
+        collect_nodes_for o.wheres, collector, ' WHERE ', ' AND '
+        collect_nodes_for o.returning, collector, ' RETURNING ', ', '
+        collect_nodes_for o.orders, collector, ' ORDER BY '
         maybe_visit o.limit, collector
       end
       # rubocop:enable Metrics/AbcSize

data/lib/arel/extensions/exists.rb

@@ -0,0 +1,59 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Nodes
+    # This is a copy of https://github.com/rails/arel/blob/v9.0.0/lib/arel/nodes/function.rb
+    # Only difference is the superclass, because EXISTS is not a function but a subquery expression.
+    # Semantic meaning is important when transforming the Arel using the enhanced AST,
+    # because EXISTS cannot be processed as a function. For example it does not have a schema
+    # like a normal function.
+    #
+    # To change the superclass we're removing the existing Exists class `Arel::Nodes::Exists`
+    # and recreating it extending from `Arel::Nodes::Unary`.
+    remove_const(:Exists)
+
+    # https://www.postgresql.org/docs/10/functions-subquery.html
+    class Exists < Arel::Nodes::Unary
+      include Arel::Predications
+      include Arel::WindowPredications
+      include Arel::OrderPredications
+      attr_accessor :expressions, :alias, :distinct
+
+      def initialize(expr, aliaz = nil)
+        @expressions = expr
+        @alias       = aliaz && SqlLiteral.new(aliaz)
+        @distinct    = false
+      end
+
+      def as(aliaz)
+        self.alias = SqlLiteral.new(aliaz)
+        self
+      end
+
+      def hash
+        [@expressions, @alias, @distinct].hash
+      end
+
+      def eql?(other)
+        self.class == other.class &&
+          expressions == other.expressions &&
+          self.alias == other.alias &&
+          distinct == other.distinct
+      end
+      alias == eql?
+    end
+  end
+
+  module Visitors
+    class Dot
+      def visit_Arel_Nodes_Exists(o)
+        visit_edge o, 'expressions'
+        visit_edge o, 'alias'
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/function.rb

@@ -46,7 +46,7 @@ module Arel
         end
 
         if o.orders.any?
-          collector << SPACE unless o.within_group
+          collector << ' ' unless o.within_group
           collector << 'ORDER BY '
           collector = inject_join o.orders, collector, ', '
         end
@@ -80,13 +80,14 @@ module Arel
           visit_edge o, 'filter'
           visit_edge o, 'within_group'
           visit_edge o, 'variardic'
+          visit_edge o, 'schema_name'
         end
 
-        alias visit_Arel_Nodes_Exists function
         alias visit_Arel_Nodes_Min    function
         alias visit_Arel_Nodes_Max    function
         alias visit_Arel_Nodes_Avg    function
         alias visit_Arel_Nodes_Sum    function
+        alias visit_Arel_Nodes_Count  function
       end
 
       prepend FunctionExtension

data/lib/arel/extensions/greatest.rb

@@ -1,9 +1,23 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
 module Arel
   module Nodes
-    class Greatest < Arel::Nodes::NamedFunction
-      def initialize(args)
-        super 'GREATEST', args
+    # https://www.postgresql.org/docs/10/functions-conditional.html
+    class Greatest < Arel::Nodes::Unary
+    end
+  end
+
+  module Visitors
+    class ToSql
+      def visit_Arel_Nodes_Greatest(o, collector)
+        collector << 'GREATEST('
+        collector = inject_join(o.expr, collector, ', ')
+        collector << ')'
       end
     end
   end
 end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/infer.rb

@@ -16,7 +16,7 @@ module Arel
         if o.name
           collector << 'ON CONSTRAINT '
           collector << o.left
-          collector << SPACE
+          collector << ' '
         end
 
         if o.right

data/lib/arel/extensions/insert_statement.rb

@@ -5,7 +5,7 @@ module Arel
   module Nodes
     class InsertStatement
       # https://www.postgresql.org/docs/9.5/sql-insert.html
-      module InsertStatementExtensions
+      module InsertStatementExtension
         attr_accessor :with
         attr_accessor :conflict
         attr_accessor :override
@@ -18,7 +18,7 @@ module Arel
         end
       end
 
-      prepend(InsertStatementExtensions)
+      prepend(InsertStatementExtension)
     end
   end
 
@@ -30,7 +30,7 @@ module Arel
       def visit_Arel_Nodes_InsertStatement(o, collector)
         if o.with
           collector = visit o.with, collector
-          collector << SPACE
+          collector << ' '
         end
 
         collector << 'INSERT INTO '