arel_toolkit 0.3.0 → 0.4.0

data/lib/arel/extensions/time_with_precision.rb

@@ -10,4 +10,10 @@ module Arel
       end
     end
   end
+
+  module Visitors
+    class Dot
+      alias visit_Arel_Nodes_TimeWithPrecision terminal
+    end
+  end
 end

data/lib/arel/extensions/to_sql.rb

@@ -0,0 +1,27 @@
+# rubocop:disable Naming/MethodName
+# rubocop:disable Naming/UncommunicativeMethodParamName
+
+module Arel
+  module Visitors
+    class ToSql
+      def visit_Arel_Attributes_Attribute(o, collector)
+        if o.relation
+          join_name = o.relation.table_alias || o.relation.name
+          collector << "#{quote_table_name join_name}.#{quote_column_name o.name}"
+        else
+          visit_Arel_Nodes_UnqualifiedColumn o, collector
+        end
+      end
+
+      alias visit_Arel_Attributes_Integer visit_Arel_Attributes_Attribute
+      alias visit_Arel_Attributes_Float visit_Arel_Attributes_Attribute
+      alias visit_Arel_Attributes_Decimal visit_Arel_Attributes_Attribute
+      alias visit_Arel_Attributes_String visit_Arel_Attributes_Attribute
+      alias visit_Arel_Attributes_Time visit_Arel_Attributes_Attribute
+      alias visit_Arel_Attributes_Boolean visit_Arel_Attributes_Attribute
+    end
+  end
+end
+
+# rubocop:enable Naming/MethodName
+# rubocop:enable Naming/UncommunicativeMethodParamName

data/lib/arel/extensions/transaction.rb

@@ -6,14 +6,9 @@
 module Arel
   module Nodes
     # https://www.postgresql.org/docs/8.3/tutorial-transactions.html
-    class Transaction < Arel::Nodes::Node
-      attr_reader :type
-      attr_reader :options
-
-      def initialize(type, options)
-        @type = type
-        @options = options
-      end
+    class Transaction < Arel::Nodes::Binary
+      alias type left
+      alias options right
     end
   end
 

data/lib/arel/extensions/tree_manager.rb

@@ -0,0 +1,10 @@
+module Arel
+  class TreeManager
+    # Iterate through AST, nodes will be yielded depth-first
+    def each(&block)
+      return enum_for(:each) unless block_given?
+
+      ::Arel::Visitors::DepthFirst.new(block).accept ast
+    end
+  end
+end

data/lib/arel/extensions/trim.rb

@@ -29,6 +29,14 @@ module Arel
         collector << ')'
       end
     end
+
+    class Dot
+      def visit_Arel_Nodes_Trim(o)
+        visit_edge o, 'type'
+        visit_edge o, 'substring'
+        visit_edge o, 'string'
+      end
+    end
   end
 end
 

data/lib/arel/extensions/true.rb

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

data/lib/arel/extensions/type_cast.rb

@@ -27,6 +27,13 @@ module Arel
         collector << o.type_name
       end
     end
+
+    class Dot
+      def visit_Arel_Nodes_TypeCast(o)
+        visit_edge(o, 'arg')
+        visit_edge(o, 'type_name')
+      end
+    end
   end
 end
 

data/lib/arel/extensions/unary.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Visitors
+    class Dot
+      alias visit_Arel_Nodes_Unary unary
+    end
+  end
+end

data/lib/arel/extensions/unary_operation.rb

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

data/lib/arel/extensions/unknown.rb

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

data/lib/arel/extensions/update_manager.rb

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

data/lib/arel/extensions/update_statement.rb

@@ -3,19 +3,22 @@
 
 module Arel
   module Nodes
-    # https://www.postgresql.org/docs/10/sql-update.html
-    Arel::Nodes::UpdateStatement.class_eval do
-      attr_accessor :with
-      attr_accessor :froms
-      attr_accessor :returning
+    class UpdateStatement
+      module UpdateStatementExtension
+        # https://www.postgresql.org/docs/10/sql-update.html
+        attr_accessor :with
+        attr_accessor :froms
+        attr_accessor :returning
 
-      alias_method :old_initialize, :initialize
-      def initialize
-        old_initialize
+        def initialize
+          super
 
-        @froms = []
-        @returning = []
+          @froms = []
+          @returning = []
+        end
       end
+
+      prepend UpdateStatementExtension
     end
   end
 
@@ -64,6 +67,20 @@ module Arel
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
     end
+
+    class Dot
+      module UpdateStatementExtension
+        def visit_Arel_Nodes_UpdateStatement(o)
+          super
+
+          visit_edge o, 'with'
+          visit_edge o, 'froms'
+          visit_edge o, 'returning'
+        end
+      end
+
+      prepend UpdateStatementExtension
+    end
   end
 end
 

data/lib/arel/extensions/user.rb

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

data/lib/arel/extensions/values_list.rb

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

data/lib/arel/extensions/variable_set.rb

@@ -39,6 +39,15 @@ module Arel
         end
       end
     end
+
+    class Dot
+      def visit_Arel_Nodes_VariableSet(o)
+        visit_edge o, 'type'
+        visit_edge o, 'args'
+        visit_edge o, 'name'
+        visit_edge o, 'local'
+      end
+    end
   end
 end
 

data/lib/arel/extensions/variable_show.rb

@@ -4,12 +4,7 @@
 module Arel
   module Nodes
     # https://www.postgresql.org/docs/9.1/sql-show.html
-    class VariableShow < Arel::Nodes::Node
-      attr_reader :name
-
-      def initialize(name)
-        @name = name
-      end
+    class VariableShow < Arel::Nodes::Unary
     end
   end
 
@@ -17,10 +12,10 @@ module Arel
     class ToSql
       def visit_Arel_Nodes_VariableShow(o, collector)
         collector << 'SHOW '
-        collector << if o.name == 'timezone'
+        collector << if o.expr == 'timezone'
                        'TIME ZONE'
                      else
-                       o.name
+                       o.expr
                      end
       end
     end

data/lib/arel/middleware/chain.rb

@@ -14,7 +14,7 @@ module Arel
 
         internal_middleware.each do |middleware_item|
           result = result.map do |arel|
-            middleware_item.call(arel, updated_context)
+            middleware_item.call(arel, updated_context.dup)
           end
         end
 
@@ -88,10 +88,6 @@ module Arel
       ensure
         Arel::Middleware.current_chain = previous_chain
       end
-
-      def current_chain
-        Arel::Middleware.current_chain
-      end
     end
   end
 end

data/lib/arel/middleware/railtie.rb

@@ -1,5 +1,15 @@
 module Arel
   module Middleware
+    if defined? Rails::Railtie
+      class Railtie < Rails::Railtie
+        initializer 'arel.middleware.insert' do
+          ActiveSupport.on_load :active_record do
+            Arel::Middleware::Railtie.insert_postgresql
+          end
+        end
+      end
+    end
+
     class Railtie
       def self.insert_postgresql
         ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(

data/lib/arel/sql_to_arel.rb

@@ -1,8 +1,11 @@
-require 'arel/sql_to_arel/result'
-require 'arel/sql_to_arel/error'
-require 'arel/sql_to_arel/pg_query_visitor'
+require_relative './sql_to_arel/result'
+require_relative './sql_to_arel/error'
+require_relative './sql_to_arel/pg_query_visitor'
 
 module Arel
+  module SqlToArel
+  end
+
   def self.sql_to_arel(sql, binds: [])
     SqlToArel::PgQueryVisitor.new.accept(sql, binds)
   end

data/lib/arel/sql_to_arel/pg_query_visitor.rb

@@ -278,17 +278,21 @@ module Arel
       end
 
       def visit_ColumnRef(fields:)
-        visited_fields = visit(fields)
+        case fields.length
+        when 1
+          visited_field = visit(fields[0], :operator)
+          Arel::Nodes::UnqualifiedColumn.new Arel::Attribute.new(nil, visited_field)
 
-        if fields.length == 2
+        when 2
           table_reference, column_reference = fields
           table_reference = visit(table_reference, :operator)
           table = Arel::Table.new(table_reference)
 
           column_reference = visit(column_reference, :operator)
           table[column_reference]
+
         else
-          Arel::Nodes::UnboundColumnReference.new visited_fields.join('.')
+          raise 'Can\'t deal with column refs that have more than 2 fields'
         end
       end
 
@@ -423,11 +427,20 @@ module Arel
                  [Arel::Nodes::Overlaps.new(start1, end1, start2, end2)]
 
                else
-                 if function_names.length > 1
-                   boom "Don't know how to handle function names `#{function_names}`"
-                 end
+                 case function_names.length
+                 when 2
+                   if function_names.first == PG_CATALOG
+                     boom "Missing postgres function `#{function_names.last}`"
+                   end
 
-                 Arel::Nodes::NamedFunction.new(function_names.first, args)
+                   func = Arel::Nodes::NamedFunction.new(function_names.last, args)
+                   func.schema_name = function_names.first
+                   func
+                 when 1
+                   Arel::Nodes::NamedFunction.new(function_names.first, args)
+                 else
+                   boom "Don't know how to handle function names length `#{function_names.length}`"
+                 end
                end
 
         func.distinct = (agg_distinct.nil? ? false : true) unless func.is_a?(::Array)
@@ -444,17 +457,16 @@ module Arel
       end
 
       def visit_InferClause(conname: nil, index_elems: nil)
-        infer = Arel::Nodes::Infer.new
-        infer.name = Arel.sql(conname) if conname
-        infer.indexes = visit(index_elems) if index_elems
-        infer
+        left = Arel.sql(conname) if conname
+        right = visit(index_elems) if index_elems
+        Arel::Nodes::Infer.new left, right
       end
 
       def visit_IndexElem(name:, ordering:, nulls_ordering:)
         boom "Unknown ordering `#{ordering}`" unless ordering.zero?
         boom "Unknown nulls ordering `#{ordering}`" unless nulls_ordering.zero?
 
-        Arel.sql(name)
+        Arel.sql visit_String(str: name)
       end
 
       def visit_InsertStmt(
@@ -494,6 +506,12 @@ module Arel
         ival
       end
 
+      def visit_IntoClause(rel:, on_commit:)
+        raise "Unknown on_commit `#{on_commit}`" unless on_commit.zero?
+
+        Arel::Nodes::Into.new(visit(rel))
+      end
+
       def visit_JoinExpr(jointype:, is_natural: nil, larg:, rarg:, quals: nil)
         join_class = case jointype
                      when 0
@@ -531,12 +549,12 @@ module Arel
           1 => 'FOR KEY SHARE',
           2 => 'FOR SHARE',
           3 => 'FOR NO KEY UPDATE',
-          4 => 'FOR UPDATE'
+          4 => 'FOR UPDATE',
         }.fetch(strength)
         wait_policy_clause = {
           0 => '',
           1 => ' SKIP LOCKED',
-          2 => ' NOWAIT'
+          2 => ' NOWAIT',
         }.fetch(wait_policy)
 
         Arel::Nodes::Lock.new Arel.sql("#{strength_clause}#{wait_policy_clause}")
@@ -669,6 +687,7 @@ module Arel
         op:,
         window_clause: nil,
         values_lists: nil,
+        into_clause: nil,
         all: nil,
         larg: nil,
         rarg: nil
@@ -702,6 +721,7 @@ module Arel
         select_core.groups = visit(group_clause) if group_clause
         select_core.havings = [visit(having_clause)] if having_clause
         select_core.windows = visit(window_clause) if window_clause
+        select_core.into = visit(into_clause) if into_clause
 
         if distinct_clause == [nil]
           select_core.set_quantifier = Arel::Nodes::Distinct.new
@@ -726,7 +746,7 @@ module Arel
                 value
               when Integer
                 Arel.sql(value.to_s)
-              when Arel::Nodes::TypeCast
+              when Arel::Nodes::TypeCast, Arel::Nodes::UnqualifiedColumn
                 Arel.sql(value.to_sql)
               when Arel::Nodes::BindParam
                 value
@@ -1077,6 +1097,14 @@ module Arel
         end
       end
 
+      def visit_DeallocateStmt(name: nil)
+        Arel::Nodes::Dealocate.new name
+      end
+
+      def visit_PrepareStmt(name:, argtypes: nil, query:)
+        Arel::Nodes::Prepare.new name, argtypes && visit(argtypes), visit(query)
+      end
+
       def visit(attribute, context = nil)
         return attribute.map { |attr| visit(attr, context) } if attribute.is_a? Array