arel_toolkit 0.4.3 → 0.4.7

data/gemfiles/active_record_6.gemfile

@@ -1,7 +1,7 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'activerecord', '~> 6.0.0'
+gem "activerecord", "~> 6.0.0"
 
-gemspec path: '../'
+gemspec path: "../"

data/gemfiles/active_record_6.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.2)
-      activerecord
+    arel_toolkit (0.4.7)
+      activerecord (>= 5.0.0)
       pg (~> 1.1.4)
-      pg_query (~> 1.2.0)
+      pg_query (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -23,7 +23,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
-    appraisal (2.2.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
@@ -55,6 +55,7 @@ GEM
       rainbow (>= 2.2.1)
       rake (>= 10.0)
       retriable (~> 3.0)
+    google-protobuf (3.19.4-x86_64-darwin)
     guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -104,7 +105,8 @@ GEM
     parser (2.7.2.0)
       ast (~> 2.4.1)
     pg (1.1.4)
-    pg_query (1.2.0)
+    pg_query (2.1.3)
+      google-protobuf (>= 3.19.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -180,7 +182,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 6.0.0)
-  appraisal (~> 2.2.0)
+  appraisal (~> 2.4.1)
   approvals (~> 0.0.24)
   arel_toolkit!
   bundler (~> 2.0)
@@ -207,4 +209,4 @@ DEPENDENCIES
   stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.0.2
+   2.3.6

data/gemfiles/active_record_6_1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/active_record_6_1.gemfile.lock

@@ -0,0 +1,263 @@
+PATH
+  remote: ..
+  specs:
+    arel_toolkit (0.4.7)
+      activerecord (>= 5.0.0)
+      pg (~> 1.1.4)
+      pg_query (~> 2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ansi (1.5.0)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    approvals (0.0.25)
+      nokogiri (~> 1.8)
+      thor (~> 1.0)
+    ast (2.4.2)
+    async (1.30.1)
+      console (~> 1.10)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-http (0.56.5)
+      async (>= 1.25)
+      async-io (>= 1.28)
+      async-pool (>= 0.2)
+      protocol-http (~> 0.22.0)
+      protocol-http1 (~> 0.14.0)
+      protocol-http2 (~> 0.14.0)
+    async-http-faraday (0.11.0)
+      async-http (~> 0.42)
+      faraday
+    async-io (1.32.2)
+      async
+    async-pool (0.3.8)
+      async (>= 1.25)
+    binding_of_caller (1.0.0)
+      debug_inspector (>= 0.0.1)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    console (1.13.1)
+      fiber-local
+    database_cleaner (1.7.0)
+    debug_inspector (1.1.0)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    dpl (1.10.16)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    ffi (1.15.4)
+    fiber-local (1.0.0)
+    formatador (0.3.0)
+    github_changelog_generator (1.16.4)
+      activesupport
+      async (>= 1.25.0)
+      async-http-faraday
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.2.1)
+      rake (>= 10.0)
+    google-protobuf (3.19.4-x86_64-darwin)
+    guard (2.17.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rake (1.0.0)
+      guard
+      rake
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    guard-rubocop (1.3.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
+    hirb (0.7.3)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    interception (0.5)
+    jaro_winkler (1.5.4)
+    json (2.5.1)
+    listen (3.7.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    memory_profiler (0.9.14)
+    method_source (0.9.2)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    nenv (0.3.0)
+    nio4r (2.5.8)
+    nokogiri (1.12.4)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    nokogiri (1.12.4-x86_64-darwin)
+      racc (~> 1.4)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    octokit (4.21.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pg (1.1.4)
+    pg_query (2.1.3)
+      google-protobuf (>= 3.19.2)
+    protocol-hpack (1.4.2)
+    protocol-http (0.22.5)
+    protocol-http1 (0.14.2)
+      protocol-http (~> 0.22)
+    protocol-http2 (0.14.2)
+      protocol-hpack (~> 1.4)
+      protocol-http (~> 0.18)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-alias (0.0.1)
+      binding_of_caller
+      pry
+    pry-doc (1.2.0)
+      pry (~> 0.11)
+      yard (~> 0.9.11)
+    pry-nav (0.3.0)
+      pry (>= 0.9.10, < 0.13.0)
+    pry-rescue (1.5.2)
+      interception (>= 0.5)
+      pry (>= 0.12.0)
+    pry-stack_explorer (0.4.9.3)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rainbow (3.0.0)
+    rake (13.0.6)
+    rake-compiler (1.1.1)
+      rake
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (0.71.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    shellany (0.0.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-console (0.4.2)
+      ansi
+      hirb
+      simplecov
+    simplecov-html (0.10.2)
+    stackprof (0.2.17)
+    thor (1.1.0)
+    timers (4.3.3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.6.1)
+    yard (0.9.26)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  aarch64-linux
+  x86_64-darwin-20
+  x86_64-darwin-21
+
+DEPENDENCIES
+  activerecord (~> 6.1.0)
+  appraisal (~> 2.4.1)
+  approvals (~> 0.0.24)
+  arel_toolkit!
+  bundler (~> 2.0)
+  database_cleaner (~> 1.7.0)
+  dpl (~> 1.10.11)
+  github_changelog_generator (~> 1.15)
+  guard (~> 2.15)
+  guard-rake (~> 1.0.0)
+  guard-rspec (~> 4.7)
+  guard-rubocop (~> 1.3.0)
+  memory_profiler (~> 0.9)
+  pry
+  pry-alias
+  pry-doc
+  pry-nav
+  pry-rescue
+  pry-stack_explorer
+  rake (~> 13.0)
+  rake-compiler (~> 1.0)
+  rspec (~> 3.8)
+  rubocop (= 0.71.0)
+  simplecov (~> 0.16.1)
+  simplecov-console (~> 0.4.2)
+  stackprof (~> 0.2)
+
+BUNDLED WITH
+   2.3.6

data/gemfiles/arel_gems.gemfile.lock

@@ -31,10 +31,10 @@ GIT
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.2)
-      activerecord
+    arel_toolkit (0.4.7)
+      activerecord (>= 5.0.0)
       pg (~> 1.1.4)
-      pg_query (~> 1.2.0)
+      pg_query (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -66,7 +66,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
-    appraisal (2.2.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
@@ -101,6 +101,7 @@ GEM
       rainbow (>= 2.2.1)
       rake (>= 10.0)
       retriable (~> 3.0)
+    google-protobuf (3.19.4-x86_64-darwin)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -154,7 +155,8 @@ GEM
       ast (~> 2.4.0)
     pg (1.1.4)
     pg_array_parser (0.0.9)
-    pg_query (1.2.0)
+    pg_query (2.1.3)
+      google-protobuf (>= 3.19.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -251,7 +253,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_record_upsert!
-  appraisal (~> 2.2.0)
+  appraisal (~> 2.4.1)
   approvals (~> 0.0.24)
   arel_toolkit!
   bundler (~> 2.0)
@@ -281,4 +283,4 @@ DEPENDENCIES
   stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.0.2
+   2.3.6

data/gemfiles/default.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.2)
-      activerecord
+    arel_toolkit (0.4.7)
+      activerecord (>= 5.0.0)
       pg (~> 1.1.4)
-      pg_query (~> 1.2.0)
+      pg_query (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -23,7 +23,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
-    appraisal (2.2.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
@@ -55,6 +55,7 @@ GEM
       rainbow (>= 2.2.1)
       rake (>= 10.0)
       retriable (~> 3.0)
+    google-protobuf (3.19.4-x86_64-darwin)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -104,7 +105,8 @@ GEM
     parser (2.6.3.0)
       ast (~> 2.4.0)
     pg (1.1.4)
-    pg_query (1.2.0)
+    pg_query (2.1.3)
+      google-protobuf (>= 3.19.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -178,7 +180,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (~> 2.2.0)
+  appraisal (~> 2.4.1)
   approvals (~> 0.0.24)
   arel_toolkit!
   bundler (~> 2.0)
@@ -205,4 +207,4 @@ DEPENDENCIES
   stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.0.2
+   2.3.6

data/lib/arel/enhance/context_enhancer/arel_table.rb

@@ -22,6 +22,10 @@ module Arel
                 node.parent.parent.object.is_a?(Arel::Nodes::JoinSource)
             context[:range_variable] = true
 
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.parent.parent.parent.object.is_a?(Arel::Nodes::JoinSource)
+            context[:range_variable] = true
+
           # Using Arel::Table as SELECT ... FROM [<table>]
           elsif parent_object.is_a?(Array) &&
                 node.parent.parent.object.is_a?(Arel::Nodes::JoinSource)
@@ -35,10 +39,26 @@ module Arel
                 node.parent.parent.parent.object.is_a?(Arel::Nodes::JoinSource)
             context[:range_variable] = true
 
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.parent.parent.object.is_a?(Arel::Attributes::Attribute)
+            context[:column_reference] = true
+
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.parent.parent.parent.object.is_a?(Arel::Attributes::Attribute)
+            context[:column_reference] = true
+
           # Using Arel::Table as SELECT ... INNER JOIN <table> ON TRUE
           elsif parent_object.is_a?(Arel::Nodes::Join)
             context[:range_variable] = true
 
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.parent.parent.object.is_a?(Arel::Nodes::Join)
+            context[:range_variable] = true
+
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.parent.parent.parent.object.is_a?(Arel::Nodes::Join)
+            context[:range_variable] = true
+
           # Using Arel::Table as an attribute SELECT <table>.id ...
           elsif parent_object.is_a?(Arel::Attributes::Attribute)
             context[:column_reference] = true

data/lib/arel/enhance/node.rb

@@ -1,21 +1,15 @@
 module Arel
   module Enhance
     class Node
+      attr_reader :local_path
       attr_reader :object
       attr_reader :parent
-      attr_reader :local_path
-      attr_reader :fields
-      attr_reader :children
       attr_reader :root_node
-      attr_reader :context
 
       def initialize(object)
         @object = object
         @root_node = self
-        @fields = []
-        @children = {}
         @dirty = false
-        @context = {}
       end
 
       def inspect
@@ -25,7 +19,7 @@ module Arel
       def value
         return unless value?
 
-        @fields.first
+        fields.first
       end
 
       def each(&block)
@@ -58,7 +52,7 @@ module Arel
         node.local_path = path_node
         node.parent = self
         node.root_node = root_node
-        @children[path_node.value.to_s] = node
+        children[path_node.value.to_s] = node
       end
 
       def to_sql(engine = Table.engine)
@@ -78,19 +72,19 @@ module Arel
       end
 
       def method_missing(name, *args, &block)
-        child = @children[name.to_s]
+        child = children[name.to_s]
         return super if child.nil?
 
         child
       end
 
       def respond_to_missing?(method, include_private = false)
-        child = @children[method.to_s]
+        child = children[method.to_s]
         child.present? || super
       end
 
       def [](key)
-        @children.fetch(key.to_s)
+        children.fetch(key.to_s)
       end
 
       def child_at_path(path_items)
@@ -118,6 +112,18 @@ module Arel
         the_path.compact
       end
 
+      def children
+        @children ||= {}
+      end
+
+      def fields
+        @fields ||= []
+      end
+
+      def context
+        @context ||= {}
+      end
+
       protected
 
       attr_writer :local_path
@@ -211,6 +217,8 @@ module Arel
           else
             parent_object[local_path.value] = new_arel_node
           end
+        elsif parent_object.is_a?(Arel::Nodes::TableAlias) && local_path.value == 'relation'
+          parent_object.instance_variable_set('@left', new_arel_node)
         else
           raise "Don't know how to replace `#{local_path.value}` in #{parent_object.inspect}"
         end

data/lib/arel/enhance/visitor.rb

@@ -14,7 +14,7 @@ module Arel
         @context_enhancers = context_enhancers
 
         root_node = Arel::Enhance::Node.new(object)
-        accept_with_root(object, root_node)
+        accept_with_root(object, root_node, context_enhancers)
       end
 
       def accept_with_root(object, root_node, context_enhancers = DEFAULT_CONTEXT_ENHANCERS)

data/lib/arel/enhance.rb

@@ -9,9 +9,9 @@ module Arel
   module Enhance
   end
 
-  def self.enhance(object)
+  def self.enhance(object, context_enhancers = Arel::Enhance::Visitor::DEFAULT_CONTEXT_ENHANCERS)
     return object if object.is_a?(Arel::Enhance::Node)
 
-    Arel::Enhance::Visitor.new.accept(object)
+    Arel::Enhance::Visitor.new.accept(object, context_enhancers)
   end
 end

data/lib/arel/extensions/conflict.rb

@@ -21,12 +21,12 @@ module Arel
         visit(o.infer, collector) if o.infer
 
         case o.action
-        when 1
+        when :ONCONFLICT_NOTHING
           collector << 'DO NOTHING'
-        when 2
+        when :ONCONFLICT_UPDATE
           collector << 'DO UPDATE SET '
         else
-          raise "Unknown conflict clause `#{action}`"
+          raise "Unknown conflict clause `#{o.action}`"
         end
 
         o.values.any? && (inject_join o.values, collector, ', ')

data/lib/arel/extensions/delete_statement.rb

@@ -9,11 +9,14 @@ module Arel
         attr_accessor :using
         attr_accessor :with
         attr_accessor :returning
+        attr_accessor :orders
 
         def initialize(relation = nil, wheres = [])
           super
 
           @returning = []
+          @orders = []
+          @using = []
         end
       end
 
@@ -30,24 +33,26 @@ module Arel
           collector << ' '
         end
 
-        collector << 'DELETE FROM '
-        collector = visit o.relation, collector
-
-        if o.using
-          collector << ' USING '
-          collector = inject_join o.using, collector, ', '
-        end
+        if Gem.loaded_specs['activerecord'].version >= Gem::Version.new('6.0.0')
+          o = prepare_delete_statement(o)
 
-        if o.wheres.any?
-          collector << ' WHERE '
-          collector = inject_join o.wheres, collector, ' AND '
+          if has_join_sources?(o)
+            collector << 'DELETE '
+            visit o.relation.left, collector
+            collector << ' FROM '
+          else
+            collector << 'DELETE FROM '
+          end
+        else
+          collector << 'DELETE FROM '
         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

data/lib/arel/extensions/infer.rb

@@ -13,13 +13,13 @@ module Arel
   module Visitors
     class ToSql
       def visit_Arel_Nodes_Infer(o, collector)
-        if o.name
+        if o.name.present?
           collector << 'ON CONSTRAINT '
           collector << o.left
           collector << ' '
         end
 
-        if o.right
+        if o.right.present?
           collector << '('
           inject_join o.right, collector, ', '
           collector << ') '