arel_toolkit 0.4.3 → 0.4.7

data/lib/arel/extensions/insert_statement.rb

@@ -42,11 +42,11 @@ module Arel
         end
 
         case o.override
-        when nil, 0
+        when :OVERRIDING_KIND_UNDEFINED, :OVERRIDING_NOT_SET, nil
           collector << ''
-        when 1
+        when :OVERRIDING_USER_VALUE
           collector << ' OVERRIDING USER VALUE'
-        when 2
+        when :OVERRIDING_SYSTEM_VALUE
           collector << ' OVERRIDING SYSTEM VALUE'
         else
           raise "Unknown override `#{o.override}`"

data/lib/arel/extensions/overlaps.rb

@@ -4,7 +4,13 @@
 module Arel
   module Nodes
     # https://www.postgresql.org/docs/10/functions-string.html
-    class Overlaps < Arel::Nodes::Node
+    inheritance_class = if Gem.loaded_specs['activerecord'].version < Gem::Version.new('6.1.0')
+                          Arel::Nodes::Node
+                        else
+                          Arel::Nodes::InfixOperation
+                        end
+
+    class Overlaps < inheritance_class
       attr_reader :start1
       attr_reader :end1
       attr_reader :start2

data/lib/arel/extensions/table.rb

@@ -15,7 +15,8 @@ module Arel
       def initialize(
         name,
         as: nil,
-        type_caster: nil,
+        klass: nil,
+        type_caster: klass&.type_caster,
         only: false,
         schema_name: nil,
         relpersistence: 'p'
@@ -24,7 +25,11 @@ module Arel
         @schema_name = schema_name
         @relpersistence = relpersistence
 
-        super(name, as: as, type_caster: type_caster)
+        if Gem.loaded_specs['activerecord'].version < Gem::Version.new('6.1.0')
+          super(name, as: as, type_caster: type_caster)
+        else
+          super(name, klass: klass, as: as, type_caster: type_caster)
+        end
       end
     end
 

data/lib/arel/extensions/transaction.rb

@@ -16,21 +16,21 @@ module Arel
     class ToSql
       def visit_Arel_Nodes_Transaction(o, collector)
         case o.type
-        when 0
+        when 1
           collector << 'BEGIN'
-        when 2
-          collector << 'COMMIT'
         when 3
-          collector << 'ROLLBACK'
+          collector << 'COMMIT'
         when 4
-          collector << 'SAVEPOINT '
-          collector << o.options.join(' ')
+          collector << 'ROLLBACK'
         when 5
-          collector << 'RELEASE SAVEPOINT '
-          collector << o.options.join(' ')
+          collector << 'SAVEPOINT '
+          collector << o.right
         when 6
+          collector << 'RELEASE SAVEPOINT '
+          collector << o.right
+        when 7
           collector << 'ROLLBACK TO '
-          collector << o.options.join(' ')
+          collector << o.right
         else
           raise "Unknown transaction type `#{o.type}`"
         end

data/lib/arel/extensions/tree_manager.rb

@@ -1,11 +1,6 @@
 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
 
     def to_sql_and_binds(engine = Arel::Table.engine)
       collector = engine.connection.send(:collector)

data/lib/arel/extensions/update_statement.rb

@@ -24,16 +24,17 @@ module Arel
 
   module Visitors
     class ToSql
-      # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/PerceivedComplexity
       def visit_Arel_Nodes_UpdateStatement(o, collector)
         if o.with
           collector = visit o.with, collector
           collector << ' '
         end
 
-        wheres = if o.orders.empty? && o.limit.nil?
+        wheres = if Gem.loaded_specs['activerecord'].version >= Gem::Version.new('6.0.0')
+                   o = prepare_update_statement(o)
+                   o.wheres
+                 elsif o.orders.empty? && o.limit.nil?
                    o.wheres
                  else
                    [Nodes::In.new(o.key, [build_subselect(o.key, o)])]
@@ -41,31 +42,16 @@ module Arel
 
         collector << 'UPDATE '
         collector = visit o.relation, collector
-        unless o.values.empty?
-          collector << ' SET '
-          collector = inject_join o.values, collector, ', '
-        end
-
-        unless o.froms.empty?
-          collector << ' FROM '
-          collector = inject_join o.froms, collector, ', '
-        end
 
-        unless wheres.empty?
-          collector << ' WHERE '
-          collector = inject_join wheres, collector, ' AND '
-        end
+        collect_nodes_for o.values, collector, ' SET '
+        collect_nodes_for o.froms, collector, ' FROM ', ', '
 
-        unless o.returning.empty?
-          collector << ' RETURNING '
-          collector = inject_join o.returning, collector, ', '
-        end
+        collect_nodes_for wheres, collector, ' WHERE ', ' AND '
+        collect_nodes_for o.returning, collector, ' RETURNING ', ', '
 
         collector
       end
       # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/CyclomaticComplexity
-      # rubocop:enable Metrics/PerceivedComplexity
     end
 
     class Dot

data/lib/arel/sql_to_arel/pg_query_visitor/frame_options.rb

@@ -42,7 +42,7 @@ module Arel
           # RANGE only unbounded
           # ROWS all
           # https://github.com/postgres/postgres/blob/REL_10_1/src/include/nodes/parsenodes.h
-          FRAMEOPTIONS = {
+          FRAMEOPTIONS_V10 = {
             'FRAMEOPTION_NONDEFAULT' => 0x00001,
             'FRAMEOPTION_RANGE' => 0x00002,
             'FRAMEOPTION_ROWS' => 0x00004,
@@ -59,6 +59,38 @@ module Arel
             'FRAMEOPTION_END_VALUE_FOLLOWING' => 0x02000,
           }.freeze
 
+          FRAMEOPTIONS_V11_AND_UP = {
+            'FRAMEOPTION_NONDEFAULT' => 0x00001, # any specified? */
+            'FRAMEOPTION_RANGE' => 0x00002, # RANGE behavior */
+            'FRAMEOPTION_ROWS' => 0x00004, # ROWS behavior */
+            'FRAMEOPTION_GROUPS' => 0x00008,  # GROUPS behavior */
+            'FRAMEOPTION_BETWEEN' => 0x00010, # BETWEEN given? */
+            'FRAMEOPTION_START_UNBOUNDED_PRECEDING' => 0x00020, # start is U. P. */
+            'FRAMEOPTION_END_UNBOUNDED_PRECEDING' => 0x00040, # (disallowed) */
+            'FRAMEOPTION_START_UNBOUNDED_FOLLOWING' => 0x00080, # (disallowed) */
+            'FRAMEOPTION_END_UNBOUNDED_FOLLOWING' => 0x00100, # end is U. F. */
+            'FRAMEOPTION_START_CURRENT_ROW' => 0x00200, # start is C. R. */
+            'FRAMEOPTION_END_CURRENT_ROW' => 0x00400, # end is C. R. */
+            'FRAMEOPTION_START_OFFSET_PRECEDING' => 0x00800, # start is O. P. */
+            'FRAMEOPTION_END_OFFSET_PRECEDING' => 0x01000, # end is O. P. */
+            'FRAMEOPTION_START_OFFSET_FOLLOWING' => 0x02000, # start is O. F. */
+            'FRAMEOPTION_END_OFFSET_FOLLOWING' => 0x04000, # end is O. F. */
+            'FRAMEOPTION_EXCLUDE_CURRENT_ROW' => 0x08000, # omit C.R. */
+            'FRAMEOPTION_EXCLUDE_GROUP' => 0x10000, # omit C.R. & peers */
+            'FRAMEOPTION_EXCLUDE_TIES' => 0x20000, # omit C.R.'s peers */
+          }.freeze
+
+          def frameoptions
+            case PG.library_version.to_s[0, 2]
+            when '09', '10'
+              FRAMEOPTIONS_V10
+            when '11', '12', '13', '14'
+              FRAMEOPTIONS_V11_AND_UP
+            else
+              boom "Version #{PG.library_version.to_s[0, 2]} not supported"
+            end
+          end
+
           def biggest_detractable_number(number, candidates)
             high_to_low_candidates = candidates.sort { |a, b| b <=> a }
             high_to_low_candidates.find do |candidate|
@@ -69,8 +101,8 @@ module Arel
           def calculate_frame_option_names(frame_options, names = [])
             return names if frame_options.zero?
 
-            number = biggest_detractable_number(frame_options, FRAMEOPTIONS.values)
-            name = FRAMEOPTIONS.key(number)
+            number = biggest_detractable_number(frame_options, frameoptions.values)
+            name = frameoptions.key(number)
             calculate_frame_option_names(
               frame_options - number, names + [name]
             )
@@ -95,10 +127,10 @@ module Arel
             when 'CURRENT_ROW'
               Arel::Nodes::CurrentRow.new
 
-            when 'VALUE_PRECEDING'
+            when 'VALUE_PRECEDING', 'OFFSET_PRECEDING'
               Arel::Nodes::Preceding.new offset
 
-            when 'VALUE_FOLLOWING'
+            when 'VALUE_FOLLOWING', 'OFFSET_FOLLOWING'
               Arel::Nodes::Following.new offset
 
             else