arel_toolkit 0.2.0 → 0.4.3

data/lib/arel/extensions/distinct_from.rb

@@ -1,22 +1,9 @@
-# rubocop:disable Naming/MethodName
-# rubocop:disable Naming/UncommunicativeMethodParamName
-
 module Arel
   module Nodes
-    class DistinctFrom < Arel::Nodes::Binary
-    end
-  end
-
-  module Visitors
-    class ToSql
-      def visit_Arel_Nodes_DistinctFrom(o, collector)
-        visit o.left, collector
-        collector << ' IS DISTINCT FROM '
-        visit o.right, collector
+    class DistinctFrom < Arel::Nodes::InfixOperation
+      def initialize(left, right)
+        super(:'IS DISTINCT FROM', left, right)
       end
     end
   end
 end
-
-# rubocop:enable Naming/MethodName
-# rubocop:enable Naming/UncommunicativeMethodParamName

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

@@ -6,15 +6,13 @@ module Arel
     class ToSql
       def visit_Arel_Nodes_Equality(o, collector)
         right = o.right
-
         collector = visit o.left, collector
 
-        case right
-        when Arel::Nodes::Unknown, Arel::Nodes::False, Arel::Nodes::True
+        if [Arel::Nodes::Unknown, Arel::Nodes::False, Arel::Nodes::True].include?(right.class)
           collector << ' IS '
           visit right, collector
 
-        when NilClass
+        elsif right.nil?
           collector << ' IS NULL'
 
         else

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

@@ -0,0 +1,25 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Nodes
+    # https://www.postgresql.org/docs/9.1/functions-datetime.html#FUNCTIONS-DATETIME-EXTRACT
+    class ExtractFrom < Arel::Nodes::Binary
+    end
+  end
+
+  module Visitors
+    class ToSql
+      def visit_Arel_Nodes_ExtractFrom(o, collector)
+        collector << 'extract('
+        visit o.right, collector
+        collector << ' from '
+        visit o.left, collector
+        collector << ')'
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/factorial.rb

@@ -4,11 +4,12 @@
 module Arel
   module Nodes
     # https://www.postgresql.org/docs/9.4/functions-math.html
-    class Factorial < Arel::Nodes::Unary
+    class Factorial < Arel::Nodes::Node
       attr_accessor :prefix
+      attr_accessor :expr
 
       def initialize(expr, prefix)
-        super(expr)
+        @expr = expr
         @prefix = prefix
       end
     end
@@ -26,6 +27,13 @@ module Arel
         end
       end
     end
+
+    class Dot
+      def visit_Arel_Nodes_Factorial(o)
+        visit_edge o, 'expr'
+        visit_edge o, 'prefix'
+      end
+    end
   end
 end
 

data/lib/arel/extensions/false.rb

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

data/lib/arel/extensions/function.rb

@@ -3,20 +3,27 @@
 module Arel
   module Nodes
     # Postgres: https://www.postgresql.org/docs/9.1/functions-comparison.html
-    Arel::Nodes::Function.class_eval do
-      # postgres only: https://www.postgresql.org/docs/9.5/functions-aggregate.html
-      attr_accessor :orders
-      attr_accessor :filter
-      attr_accessor :within_group
-      attr_accessor :variardic
-
-      def initialize(expr, aliaz = nil)
-        super()
-        @expressions = expr
-        @alias       = aliaz && SqlLiteral.new(aliaz)
-        @distinct    = false
-        @orders      = []
+    class Function
+      module FunctionExtension
+        # postgres only: https://www.postgresql.org/docs/9.5/functions-aggregate.html
+        attr_accessor :orders
+        attr_accessor :filter
+        attr_accessor :within_group
+        attr_accessor :variardic
+        # postgres only: https://www.postgresql.org/docs/10/ddl-schemas.html
+        attr_accessor :schema_name
+
+        def initialize(expr, aliaz = nil)
+          super
+
+          @expressions = expr
+          @alias       = aliaz && SqlLiteral.new(aliaz)
+          @distinct    = false
+          @orders      = []
+        end
       end
+
+      prepend FunctionExtension
     end
   end
 
@@ -26,6 +33,7 @@ module Arel
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/AbcSize
       def aggregate(name, o, collector)
+        collector << "#{o.schema_name}." if o.schema_name
         collector << "#{name}("
         collector << 'DISTINCT ' if o.distinct
         collector << 'VARIADIC ' if o.variardic
@@ -38,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
@@ -62,6 +70,28 @@ module Arel
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/AbcSize
     end
+
+    class Dot
+      module FunctionExtension
+        def function(o)
+          super
+
+          visit_edge o, 'orders'
+          visit_edge o, 'filter'
+          visit_edge o, 'within_group'
+          visit_edge o, 'variardic'
+          visit_edge o, 'schema_name'
+        end
+
+        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
+    end
   end
 end
 

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

@@ -3,25 +3,16 @@
 
 module Arel
   module Nodes
-    class Indirection < Arel::Nodes::Node
-      attr_reader :arg
-      attr_reader :indirection
-
-      def initialize(arg, indirection)
-        super()
-
-        @arg = arg
-        @indirection = indirection
-      end
+    class Indirection < Arel::Nodes::Binary
     end
   end
 
   module Visitors
     class ToSql
       def visit_Arel_Nodes_Indirection(o, collector)
-        visit(o.arg, collector)
+        visit(o.left, collector)
         collector << '['
-        visit(o.indirection, collector)
+        visit(o.right, collector)
         collector << ']'
       end
     end

data/lib/arel/extensions/infer.rb

@@ -4,9 +4,9 @@
 module Arel
   module Nodes
     # https://www.postgresql.org/docs/9.5/sql-insert.html
-    class Infer < Arel::Nodes::Node
-      attr_accessor :name
-      attr_accessor :indexes
+    class Infer < Arel::Nodes::Binary
+      alias name left
+      alias indexes right
     end
   end
 
@@ -15,13 +15,13 @@ module Arel
       def visit_Arel_Nodes_Infer(o, collector)
         if o.name
           collector << 'ON CONSTRAINT '
-          collector << o.name
-          collector << SPACE
+          collector << o.left
+          collector << ' '
         end
 
-        if o.indexes
+        if o.right
           collector << '('
-          inject_join o.indexes, collector, ', '
+          inject_join o.right, collector, ', '
           collector << ') '
         end
 

data/lib/arel/extensions/infix_operation.rb

@@ -0,0 +1,17 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Visitors
+    class Dot
+      def visit_Arel_Nodes_InfixOperation(o)
+        visit_edge o, 'operator'
+        visit_edge o, 'left'
+        visit_edge o, 'right'
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/insert_manager.rb

@@ -0,0 +1,21 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  class InsertManager < Arel::TreeManager
+    def ==(other)
+      other.is_a?(self.class) && @ast == other.ast
+    end
+  end
+
+  module Visitors
+    class Dot
+      def visit_Arel_InsertManager(o)
+        visit_edge o, 'ast'
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/insert_statement.rb

@@ -3,12 +3,22 @@
 
 module Arel
   module Nodes
-    # https://www.postgresql.org/docs/9.5/sql-insert.html
-    Arel::Nodes::InsertStatement.class_eval do
-      attr_accessor :with
-      attr_accessor :on_conflict
-      attr_accessor :override
-      attr_accessor :returning
+    class InsertStatement
+      # https://www.postgresql.org/docs/9.5/sql-insert.html
+      module InsertStatementExtension
+        attr_accessor :with
+        attr_accessor :conflict
+        attr_accessor :override
+        attr_accessor :returning
+
+        def initialize
+          super
+
+          @returning = []
+        end
+      end
+
+      prepend(InsertStatementExtension)
     end
   end
 
@@ -20,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 '
@@ -32,7 +42,7 @@ module Arel
         end
 
         case o.override
-        when 0
+        when nil, 0
           collector << ''
         when 1
           collector << ' OVERRIDING USER VALUE'
@@ -50,18 +60,34 @@ module Arel
                       collector
                     end
 
+        visit(o.conflict, collector) if o.conflict
+
         unless o.returning.empty?
           collector << ' RETURNING '
           collector = inject_join o.returning, collector, ', '
         end
 
-        visit(o.on_conflict, collector) if o.on_conflict
         collector
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/PerceivedComplexity
     end
+
+    class Dot
+      module InsertStatementExtension
+        def visit_Arel_Nodes_InsertStatement(o)
+          super
+
+          visit_edge o, 'with'
+          visit_edge o, 'conflict'
+          visit_edge o, 'override'
+          visit_edge o, 'returning'
+        end
+      end
+
+      prepend(InsertStatementExtension)
+    end
   end
 end