arel_toolkit 0.3.0 → 0.4.4

data/lib/arel/extensions/node.rb

@@ -0,0 +1,10 @@
+module Arel
+  module Nodes
+    class Node
+      def to_sql_and_binds(engine = Arel::Table.engine)
+        collector = engine.connection.send(:collector)
+        engine.connection.visitor.accept(self, collector).value
+      end
+    end
+  end
+end

data/lib/arel/extensions/ordering.rb

@@ -3,15 +3,19 @@
 
 module Arel
   module Nodes
-    Arel::Nodes::Ordering.class_eval do
-      # Postgres: https://www.postgresql.org/docs/9.4/queries-order.html
-      attr_accessor :nulls
+    class Ordering
+      module OrderingExtension
+        # Postgres: https://www.postgresql.org/docs/9.4/queries-order.html
+        attr_accessor :nulls
 
-      def initialize(expr, nulls = 0)
-        super(expr)
+        def initialize(expr, nulls = 0)
+          super(expr)
 
-        @nulls = nulls
+          @nulls = nulls
+        end
       end
+
+      prepend OrderingExtension
     end
   end
 
@@ -40,6 +44,17 @@ module Arel
         end
       end
     end
+
+    class Dot
+      module OrderingExtension
+        def visit_Arel_Nodes_Ordering(o)
+          super
+          visit_edge o, 'nulls'
+        end
+      end
+
+      prepend OrderingExtension
+    end
   end
 end
 

data/lib/arel/extensions/overlaps.rb

@@ -33,6 +33,15 @@ module Arel
         collector << ')'
       end
     end
+
+    class Dot
+      def visit_Arel_Nodes_Overlaps(o)
+        visit_edge o, 'start1'
+        visit_edge o, 'end1'
+        visit_edge o, 'start2'
+        visit_edge o, 'end2'
+      end
+    end
   end
 end
 

data/lib/arel/extensions/overlay.rb

@@ -36,6 +36,15 @@ module Arel
         collector << ')'
       end
     end
+
+    class Dot
+      def visit_Arel_Nodes_Overlay(o)
+        visit_edge o, 'string'
+        visit_edge o, 'substring'
+        visit_edge o, 'start'
+        visit_edge o, 'length'
+      end
+    end
   end
 end
 

data/lib/arel/extensions/position.rb

@@ -4,14 +4,9 @@
 module Arel
   module Nodes
     # https://www.postgresql.org/docs/9.1/functions-string.html#FUNCTIONS-STRING-SQL
-    class Position < Arel::Nodes::Node
-      attr_reader :substring
-      attr_reader :string
-
-      def initialize(substring, string)
-        @substring = substring
-        @string = string
-      end
+    class Position < Arel::Nodes::Binary
+      alias substring left
+      alias string right
     end
   end
 

data/lib/arel/extensions/prepare.rb

@@ -0,0 +1,39 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Visitors
+    class Dot
+      def visit_Arel_Nodes_Prepare(o)
+        visit_edge o, 'name'
+        visit_edge o, 'argtypes'
+        visit_edge o, 'query'
+      end
+    end
+
+    class ToSql
+      def visit_Arel_Nodes_Prepare(o, collector)
+        collector << "PREPARE #{o.name}"
+        collector << " (#{o.argtypes.join(', ')})" if o.argtypes
+        collector << ' AS ('
+        visit(o.query, collector)
+        collector << ')'
+      end
+    end
+  end
+
+  module Nodes
+    class Prepare < Node
+      attr_reader :name, :query, :argtypes
+
+      def initialize(name, argtypes, query)
+        @name = name
+        @query = query
+        @argtypes = argtypes
+      end
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/range_function.rb

@@ -5,15 +5,23 @@ module Arel
   module Nodes
     # Postgres: https://www.postgresql.org/docs/9.4/sql-select.html
     class RangeFunction < Arel::Nodes::Unary
+      attr_reader :is_rowsfrom
+
+      def initialize(*args, is_rowsfrom:, **kwargs)
+        @is_rowsfrom = is_rowsfrom
+        super(*args, **kwargs)
+      end
     end
   end
 
   module Visitors
     class ToSql
       def visit_Arel_Nodes_RangeFunction(o, collector)
-        collector << 'ROWS FROM ('
+        collector << 'ROWS FROM (' if o.is_rowsfrom
         visit o.expr, collector
-        collector << ')'
+        collector << ')' if o.is_rowsfrom
+
+        collector
       end
     end
   end

data/lib/arel/extensions/row.rb

@@ -4,14 +4,9 @@
 module Arel
   module Nodes
     # Postgres: https://www.postgresql.org/docs/9.2/sql-expressions.html
-    class Row < Arel::Nodes::Unary
-      attr_reader :row_format
-
-      def initialize(args, row_format)
-        super(args)
-
-        @row_format = row_format
-      end
+    class Row < Arel::Nodes::Binary
+      alias expr left
+      alias row_format right
     end
   end
 

data/lib/arel/extensions/select_core.rb

@@ -0,0 +1,73 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+# rubocop:disable Metrics/AbcSize
+
+module Arel
+  module Nodes
+    class SelectCore < Arel::Nodes::Node
+      attr_accessor :into
+      attr_accessor :top
+
+      private
+
+      def hash
+        [
+          @source, @set_quantifier, @projections, @optimizer_hints,
+          @wheres, @groups, @havings, @windows, @comment, @top, @into
+        ].hash
+      end
+
+      def eql?(other)
+        super &&
+          top == other.top &&
+          into == other.into
+      end
+    end
+  end
+
+  module Visitors
+    class ToSql
+      def visit_Arel_Nodes_SelectCore(o, collector)
+        collector << 'SELECT'
+
+        collector = maybe_visit o.set_quantifier, collector
+
+        collect_nodes_for o.projections, collector, ' '
+
+        maybe_visit o.into, collector
+
+        if o.source && !o.source.empty?
+          collector << ' FROM '
+          collector = visit o.source, collector
+        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
+    end
+
+    class Dot
+      module SelectCoreExtension
+        def visit_Arel_Nodes_SelectCore(o)
+          super
+
+          visit_edge o, 'into'
+          visit_edge o, 'top'
+        end
+      end
+
+      prepend SelectCoreExtension
+    end
+  end
+end
+
+# rubocop:enable Metrics/AbcSize
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/select_manager.rb

@@ -1,9 +1,25 @@
-Arel::SelectManager.class_eval do
-  def ==(other)
-    @ast == other.ast && @ctx == other.ctx
-  end
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  class SelectManager
+    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_SelectManager(o)
+        visit_edge(o, 'ast')
+      end
+    end
+  end
 end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/select_statement.rb

@@ -3,21 +3,43 @@
 
 module Arel
   module Nodes
-    Arel::Nodes::SelectStatement.class_eval do
-      # For INSERT statements
-      attr_accessor :values_lists
-      attr_accessor :union
-      attr_writer :cores
+    class SelectStatement
+      module SelectStatementExtension
+        # For INSERT statements
+        attr_accessor :values_lists
+        attr_accessor :union
+        attr_writer :cores
+      end
+
+      prepend SelectStatementExtension
     end
   end
 
   module Visitors
     class ToSql
-      alias old_visit_Nodes_SelectStatement visit_Arel_Nodes_SelectStatement
-      def visit_Arel_Nodes_SelectStatement(o, collector)
-        visit(o.union, collector) if o.union
-        old_visit_Nodes_SelectStatement(o, collector)
+      module SelectStatementExtension
+        def visit_Arel_Nodes_SelectStatement(o, collector)
+          visit(o.union, collector) if o.union
+          super
+        end
+      end
+
+      prepend SelectStatementExtension
+    end
+
+    class Dot
+      module SelectStatementExtension
+        def visit_Arel_Nodes_SelectStatement(o)
+          super
+
+          visit_edge o, 'lock'
+          visit_edge o, 'with'
+          visit_edge o, 'union'
+          visit_edge o, 'values_lists'
+        end
       end
+
+      prepend SelectStatementExtension
     end
   end
 end

data/lib/arel/extensions/session_user.rb

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

data/lib/arel/extensions/set_to_default.rb

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

data/lib/arel/extensions/substring.rb

@@ -31,6 +31,14 @@ module Arel
         collector << ')'
       end
     end
+
+    class Dot
+      def visit_Arel_Nodes_Substring(o)
+        visit_edge o, 'string'
+        visit_edge o, 'pattern'
+        visit_edge o, 'escape'
+      end
+    end
   end
 end
 

data/lib/arel/extensions/table.rb

@@ -3,16 +3,15 @@
 # rubocop:disable Metrics/ParameterLists
 
 module Arel
-  module Nodes
-    Arel::Table.class_eval do
+  class Table
+    module TableExtension
       # postgres only: https://www.postgresql.org/docs/9.5/sql-select.html
       attr_accessor :only
-      # postgres only: https://www.postgresql.org/docs/9.5/ddl-schemas.html
+      # postgres only: https://www.postgresql.org/docs/10/ddl-schemas.html
       attr_accessor :schema_name
       # postgres only: https://www.postgresql.org/docs/9.1/catalog-pg-class.html
       attr_accessor :relpersistence
 
-      alias_method :old_initialize, :initialize
       def initialize(
         name,
         as: nil,
@@ -25,21 +24,55 @@ module Arel
         @schema_name = schema_name
         @relpersistence = relpersistence
 
-        old_initialize(name, as: as, type_caster: type_caster)
+        super(name, as: as, type_caster: type_caster)
       end
     end
+
+    prepend TableExtension
   end
 
   module Visitors
     class ToSql
-      alias old_visit_Arel_Table visit_Arel_Table
-      def visit_Arel_Table(o, collector)
-        collector << 'ONLY ' if o.only
+      module TableExtension
+        def visit_Arel_Table(o, collector)
+          collector << 'ONLY ' if o.only
+
+          case o.relpersistence
+          when 'p'
+            collector << ''
+
+          when 'u'
+            collector << 'UNLOGGED '
 
-        collector << "\"#{o.schema_name}\"." if o.schema_name
+          when 't'
+            collector << 'TEMPORARY '
 
-        old_visit_Arel_Table(o, collector)
+          else
+            raise "Unknown relpersistence `#{o.relpersistence}`"
+          end
+
+          collector << "\"#{o.schema_name}\"." if o.schema_name
+
+          super
+        end
       end
+
+      prepend TableExtension
+    end
+
+    class Dot
+      module TableExtension
+        def visit_Arel_Table(o)
+          super
+
+          visit_edge o, 'only'
+          visit_edge o, 'schema_name'
+          visit_edge o, 'relpersistence'
+          visit_edge o, 'type_caster'
+        end
+      end
+
+      prepend TableExtension
     end
   end
 end