arel_toolkit 0.3.0 → 0.4.4

data/lib/arel/extensions/binary.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Visitors
+    class Dot
+      alias visit_Arel_Nodes_Binary binary
+    end
+  end
+end

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/bit_string.rb

@@ -3,21 +3,14 @@
 
 module Arel
   module Nodes
-    class BitString < Arel::Nodes::Node
-      attr_reader :str
-
-      def initialize(str)
-        super()
-
-        @str = str
-      end
+    class BitString < Arel::Nodes::Unary
     end
   end
 
   module Visitors
     class ToSql
       def visit_Arel_Nodes_BitString(o, collector)
-        collector << "B'#{o.str[1..-1]}'"
+        collector << "B'#{o.expr[1..-1]}'"
       end
     end
   end

data/lib/arel/extensions/case.rb

@@ -0,0 +1,17 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Visitors
+    class Dot
+      def visit_Arel_Nodes_Case(o)
+        visit_edge o, 'case'
+        visit_edge o, 'conditions'
+        visit_edge o, 'default'
+      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/conflict.rb

@@ -40,6 +40,15 @@ module Arel
       end
       # rubocop:enable Metrics/AbcSize
     end
+
+    class Dot
+      def visit_Arel_Nodes_Conflict(o)
+        visit_edge o, 'action'
+        visit_edge o, 'infer'
+        visit_edge o, 'values'
+        visit_edge o, 'wheres'
+      end
+    end
   end
 end
 

data/lib/arel/extensions/contains.rb

@@ -1,10 +1,32 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
 module Arel
-  module Nodes
-    # https://www.postgresql.org/docs/9.1/functions-array.html
-    class Contains < Arel::Nodes::InfixOperation
-      def initialize(left, right)
-        super(:'@>', left, right)
+  if Gem.loaded_specs.key?('postgres_ext')
+    module Visitors
+      module ContainsPatch
+        def visit_Arel_Nodes_Contains(o, collector)
+          if o.left.is_a?(Arel::Attribute)
+            super
+          else
+            infix_value o, collector, ' @> '
+          end
+        end
+      end
+
+      PostgreSQL.prepend(ContainsPatch)
+    end
+  else
+    module Nodes
+      # https://www.postgresql.org/docs/9.1/functions-array.html
+      class Contains < Arel::Nodes::InfixOperation
+        def initialize(left, right)
+          super(:'@>', left, right)
+        end
       end
     end
   end
 end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/current_catalog.rb

@@ -13,6 +13,10 @@ module Arel
         collector << 'current_catalog'
       end
     end
+
+    class Dot
+      alias visit_Arel_Nodes_CurrentCatalog terminal
+    end
   end
 end
 

data/lib/arel/extensions/current_date.rb

@@ -13,6 +13,10 @@ module Arel
         collector << 'current_date'
       end
     end
+
+    class Dot
+      alias visit_Arel_Nodes_CurrentDate terminal
+    end
   end
 end
 

data/lib/arel/extensions/current_of_expression.rb

@@ -4,14 +4,7 @@
 module Arel
   module Nodes
     # https://www.postgresql.org/docs/10/sql-update.html
-    class CurrentOfExpression < Arel::Nodes::Node
-      attr_accessor :cursor_name
-
-      def initialize(cursor_name)
-        super()
-
-        @cursor_name = cursor_name
-      end
+    class CurrentOfExpression < Arel::Nodes::Unary
     end
   end
 
@@ -19,7 +12,7 @@ module Arel
     class ToSql
       def visit_Arel_Nodes_CurrentOfExpression(o, collector)
         collector << 'CURRENT OF '
-        collector << o.cursor_name
+        collector << o.expr
       end
     end
   end

data/lib/arel/extensions/current_role.rb

@@ -13,6 +13,10 @@ module Arel
         collector << 'current_role'
       end
     end
+
+    class Dot
+      alias visit_Arel_Nodes_CurrentRole terminal
+    end
   end
 end
 

data/lib/arel/extensions/current_row.rb

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

data/lib/arel/extensions/current_schema.rb

@@ -13,6 +13,10 @@ module Arel
         collector << 'current_schema'
       end
     end
+
+    class Dot
+      alias visit_Arel_Nodes_CurrentSchema terminal
+    end
   end
 end
 

data/lib/arel/extensions/current_user.rb

@@ -13,6 +13,10 @@ module Arel
         collector << 'current_user'
       end
     end
+
+    class Dot
+      alias visit_Arel_Nodes_CurrentUser terminal
+    end
   end
 end
 

data/lib/arel/extensions/dealocate.rb

@@ -0,0 +1,31 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Visitors
+    class Dot
+      def visit_Arel_Nodes_Dealocate(o)
+        visit_edge o, 'name'
+      end
+    end
+
+    class ToSql
+      def visit_Arel_Nodes_Dealocate(o, collector)
+        collector << 'DEALLOCATE ' << (o.name || 'ALL')
+      end
+    end
+  end
+
+  module Nodes
+    class Dealocate < Node
+      attr_reader :name
+
+      def initialize(name)
+        @name = name
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/default_values.rb

@@ -14,6 +14,10 @@ module Arel
         collector << 'DEFAULT VALUES'
       end
     end
+
+    class Dot
+      alias visit_Arel_Nodes_DefaultValues terminal
+    end
   end
 end
 

data/lib/arel/extensions/delete_manager.rb

@@ -1,9 +1,25 @@
-Arel::DeleteManager.class_eval do
-  def ==(other)
-    @ast == other.ast && @ctx == other.ctx
-  end
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  class DeleteManager < Arel::TreeManager
+    def ==(other)
+      other.is_a?(self.class) && @ast == other.ast && @ctx == other.ctx
+    end
+
+    protected
 
-  protected
+    attr_reader :ctx
+  end
 
-  attr_reader :ctx
+  module Visitors
+    class Dot
+      def visit_Arel_DeleteManager(o)
+        visit_edge o, 'ast'
+      end
+    end
+  end
 end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/delete_statement.rb

@@ -3,18 +3,24 @@
 
 module Arel
   module Nodes
-    # https://www.postgresql.org/docs/9.5/sql-insert.html
-    Arel::Nodes::DeleteStatement.class_eval do
-      attr_accessor :using
-      attr_accessor :with
-      attr_accessor :returning
+    # https://www.postgresql.org/docs/10/sql-delete.html
+    class DeleteStatement
+      module DeleteStatementExtension
+        attr_accessor :using
+        attr_accessor :with
+        attr_accessor :returning
+        attr_accessor :orders
 
-      alias_method :old_initialize, :initialize
-      def initialize(relation = nil, wheres = [])
-        old_initialize(relation, wheres)
+        def initialize(relation = nil, wheres = [])
+          super
 
-        @returning = []
+          @returning = []
+          @orders = []
+          @using = []
+        end
       end
+
+      prepend DeleteStatementExtension
     end
   end
 
@@ -24,31 +30,47 @@ 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 Gem.loaded_specs['activerecord'].version >= Gem::Version.new('6.0.0')
+          o = prepare_delete_statement(o)
 
-        if o.using
-          collector << ' USING '
-          collector = inject_join o.using, collector, ', '
+          if has_join_sources?(o)
+            collector << 'DELETE '
+            visit o.relation.left, collector
+            collector << ' FROM '
+          else
+            collector << 'DELETE FROM '
+          end
+        else
+          collector << 'DELETE FROM '
         end
 
-        if o.wheres.any?
-          collector << WHERE
-          collector = inject_join o.wheres, collector, AND
-        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
     end
+
+    class Dot
+      module DeleteStatementExtension
+        def visit_Arel_Nodes_DeleteStatement(o)
+          super
+
+          visit_edge o, 'using'
+          visit_edge o, 'with'
+          visit_edge o, 'returning'
+        end
+      end
+
+      prepend(DeleteStatementExtension)
+    end
   end
 end
 

data/lib/arel/extensions/dot.rb

@@ -0,0 +1,11 @@
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Visitors
+    class Dot
+      def terminal(_o); end
+    end
+  end
+end
+
+# rubocop:enable Naming/UncommunicativeMethodParamName

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