arel_toolkit 0.4.0 → 0.4.5

data/gemfiles/arel_gems.gemfile.lock

@@ -31,11 +31,10 @@ GIT
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.0)
-      activerecord (~> 5.2.0)
-      arel (~> 9.0.0)
+    arel_toolkit (0.4.5)
+      activerecord
       pg (~> 1.1.4)
-      pg_query (~> 1.1.0)
+      pg_query (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
@@ -64,8 +63,8 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     appraisal (2.2.0)
       bundler
@@ -88,20 +87,20 @@ GEM
     docile (1.3.2)
     dpl (1.10.12)
     erubi (1.8.0)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
     ffi (1.11.1)
     formatador (0.2.5)
-    github_changelog_generator (1.14.3)
+    github_changelog_generator (1.15.0)
       activesupport
       faraday-http-cache
       multi_json
       octokit (~> 4.6)
-      rainbow (>= 2.1)
+      rainbow (>= 2.2.1)
       rake (>= 10.0)
-      retriable (~> 2.1)
+      retriable (~> 3.0)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -112,6 +111,9 @@ GEM
       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)
@@ -133,10 +135,11 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.13)
+    memory_profiler (0.9.14)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     multipart-post (2.1.1)
     nenv (0.3.0)
     nokogiri (1.10.3)
@@ -151,7 +154,7 @@ GEM
       ast (~> 2.4.0)
     pg (1.1.4)
     pg_array_parser (0.0.9)
-    pg_query (1.1.0)
+    pg_query (1.3.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -169,7 +172,7 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -185,11 +188,13 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
+    rake-compiler (1.0.7)
+      rake
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    retriable (2.1.0)
+    retriable (3.1.2)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -233,6 +238,7 @@ GEM
       hirb
       simplecov
     simplecov-html (0.10.2)
+    stackprof (0.2.13)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
@@ -251,10 +257,12 @@ DEPENDENCIES
   bundler (~> 2.0)
   database_cleaner (~> 1.7.0)
   dpl (~> 1.10.11)
-  github_changelog_generator (~> 1.14.3)
+  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)
   pg_search!
   postgres_ext!
   pry
@@ -263,12 +271,14 @@ DEPENDENCIES
   pry-nav
   pry-rescue
   pry-stack_explorer
-  rake (~> 10.0)
+  rake (~> 13.0)
+  rake-compiler (~> 1.0)
   rspec (~> 3.8)
   rspec-rails (~> 3.8.0)
   rubocop (= 0.71.0)
   simplecov (~> 0.16.1)
   simplecov-console (~> 0.4.2)
+  stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.0.1
+   2.2.19

data/gemfiles/default.gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.0)
-      activerecord (~> 5.2.0)
-      arel (~> 9.0.0)
+    arel_toolkit (0.4.5)
+      activerecord
       pg (~> 1.1.4)
-      pg_query (~> 1.1.0)
+      pg_query (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
@@ -21,8 +20,8 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     appraisal (2.2.0)
       bundler
@@ -42,20 +41,20 @@ GEM
     diff-lcs (1.3)
     docile (1.3.2)
     dpl (1.10.12)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
     ffi (1.11.1)
     formatador (0.2.5)
-    github_changelog_generator (1.14.3)
+    github_changelog_generator (1.15.0)
       activesupport
       faraday-http-cache
       multi_json
       octokit (~> 4.6)
-      rainbow (>= 2.1)
+      rainbow (>= 2.2.1)
       rake (>= 10.0)
-      retriable (~> 2.1)
+      retriable (~> 3.0)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -66,6 +65,9 @@ GEM
       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)
@@ -74,7 +76,7 @@ GEM
       guard (~> 2.0)
       rubocop (~> 0.20)
     hirb (0.7.3)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     interception (0.5)
     jaro_winkler (1.5.3)
@@ -84,10 +86,11 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
+    memory_profiler (0.9.14)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
+    minitest (5.13.0)
+    multi_json (1.14.1)
     multipart-post (2.1.1)
     nenv (0.3.0)
     nokogiri (1.10.3)
@@ -101,7 +104,7 @@ GEM
     parser (2.6.3.0)
       ast (~> 2.4.0)
     pg (1.1.4)
-    pg_query (1.1.0)
+    pg_query (1.3.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -119,13 +122,15 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
+    rake-compiler (1.0.7)
+      rake
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    retriable (2.1.0)
+    retriable (3.1.2)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -161,6 +166,7 @@ GEM
       hirb
       simplecov
     simplecov-html (0.10.2)
+    stackprof (0.2.13)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
@@ -178,21 +184,25 @@ DEPENDENCIES
   bundler (~> 2.0)
   database_cleaner (~> 1.7.0)
   dpl (~> 1.10.11)
-  github_changelog_generator (~> 1.14.3)
+  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 (~> 10.0)
+  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.0.1
+   2.2.19

data/lib/arel/enhance.rb

@@ -2,6 +2,7 @@ require_relative './enhance/node'
 require_relative './enhance/path'
 require_relative './enhance/path_node'
 require_relative './enhance/query'
+require_relative './enhance/query_methods'
 require_relative './enhance/visitor'
 
 module Arel

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

@@ -6,18 +6,35 @@ module Arel
         # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/AbcSize
         def self.call(node)
-          context = node.context.merge!(range_variable: false, column_reference: false)
+          context = node.context.merge!(
+            range_variable: false, column_reference: false, alias: false,
+          )
           parent_object = node.parent.object
 
           # Using Arel::Table as SELECT ... FROM <table>
           if parent_object.is_a?(Arel::Nodes::JoinSource)
             context[:range_variable] = true
 
+          # NOTE: only applies to ActiveRecord generated Arel
+          # which does not use Arel::Table#alias but Arel::TableAlias instead
+          # Using Arel::Table as SELECT ... FROM <table> AS alias
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.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)
             context[:range_variable] = true
 
+          # NOTE: only applies to ActiveRecord generated Arel
+          # which does not use Arel::Table#alias but Arel::TableAlias instead
+          # Using Arel::Table as SELECT ... FROM [<table> AS alias]
+          elsif parent_object.is_a?(Arel::Nodes::TableAlias) &&
+                node.parent.parent.object.is_a?(Array) &&
+                node.parent.parent.parent.object.is_a?(Arel::Nodes::JoinSource)
+            context[:range_variable] = true
+
           # Using Arel::Table as SELECT ... INNER JOIN <table> ON TRUE
           elsif parent_object.is_a?(Arel::Nodes::Join)
             context[:range_variable] = true

data/lib/arel/enhance/node.rb

@@ -3,7 +3,7 @@ module Arel
     class Node
       attr_reader :object
       attr_reader :parent
-      attr_reader :path
+      attr_reader :local_path
       attr_reader :fields
       attr_reader :children
       attr_reader :root_node
@@ -11,7 +11,6 @@ module Arel
 
       def initialize(object)
         @object = object
-        @path = Path.new
         @root_node = self
         @fields = []
         @children = {}
@@ -51,28 +50,47 @@ module Arel
         mutate(nil, remove: true)
       end
 
-      def replace(new_node)
-        mutate(new_node)
+      def replace(new_arel_node)
+        mutate(new_arel_node)
       end
 
       def add(path_node, node)
-        node.path = path.append(path_node)
+        node.local_path = path_node
         node.parent = self
         node.root_node = root_node
-        @children[path_node.value] = node
+        @children[path_node.value.to_s] = node
       end
 
       def to_sql(engine = Table.engine)
         return nil if children.empty?
 
-        target_object = object.is_a?(Arel::TreeManager) ? object.ast : object
-        collector = Arel::Collectors::SQLString.new
-        collector = engine.connection.visitor.accept target_object, collector
-        collector.value
+        if object.respond_to?(:to_sql)
+          object.to_sql(engine)
+        else
+          collector = Arel::Collectors::SQLString.new
+          collector = engine.connection.visitor.accept object, collector
+          collector.value
+        end
+      end
+
+      def to_sql_and_binds(engine = Table.engine)
+        object.to_sql_and_binds(engine)
+      end
+
+      def method_missing(name, *args, &block)
+        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.present? || super
       end
 
       def [](key)
-        @children.fetch(key)
+        @children.fetch(key.to_s)
       end
 
       def child_at_path(path_items)
@@ -88,9 +106,21 @@ module Arel
         Arel::Enhance::Query.call(self, kwargs)
       end
 
+      def full_path
+        the_path = [local_path]
+        current_parent = parent
+
+        while current_parent
+          the_path.unshift current_parent.local_path
+          current_parent = current_parent.parent
+        end
+
+        the_path.compact
+      end
+
       protected
 
-      attr_writer :path
+      attr_writer :local_path
       attr_writer :parent
       attr_writer :root_node
 
@@ -98,7 +128,7 @@ module Arel
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
       def recursive_inspect(string, indent = 1)
-        string << "<#{inspect_name} #{path.inspect}\n"
+        string << "<#{inspect_name} #{full_path.inspect}\n"
         string << "#{spacing(indent)}sql = #{to_sql}\n" unless to_sql.nil?
         string << "#{spacing(indent)}parent = #{parent.nil? ? nil.inspect : parent.inspect_name}"
         string << "\n" unless children.length.zero?
@@ -116,6 +146,7 @@ module Arel
                     "#{spacing(indent - 1)}>\n"
                   end
       end
+
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
@@ -135,10 +166,16 @@ module Arel
       def deep_copy_object
         # https://github.com/mvgijssel/arel_toolkit/issues/97
         new_object = Marshal.load(Marshal.dump(object))
+        self.object = new_object
 
-        each do |node|
-          selected_object = node.path.dig_send(new_object)
-          node.object = selected_object
+        recursive_update_object(new_object)
+      end
+
+      def recursive_update_object(arel_tree)
+        children.each_value do |child|
+          tree_child = arel_tree.send(*child.local_path.method)
+          child.object = tree_child
+          child.recursive_update_object(tree_child)
         end
       end
 
@@ -158,28 +195,34 @@ module Arel
         root_node.mark_as_dirty
 
         parent_object = parent.object
-        new_node = [] if remove && object.is_a?(Array)
+        new_arel_node = new_node.is_a?(Arel::Enhance::Node) ? new_node.object : new_node
+        new_arel_node = [] if remove && object.is_a?(Array)
 
-        if parent_object.respond_to?("#{path.current.value}=")
-          parent_object.send("#{path.current.value}=", new_node)
+        if parent_object.respond_to?("#{local_path.value}=")
+          parent_object.send("#{local_path.value}=", new_arel_node)
 
-        elsif parent_object.instance_values.key?(path.current.value)
-          parent_object.instance_variable_set("@#{path.current.value}", new_node)
+        elsif parent_object.instance_values.key?(local_path.value)
+          parent_object.instance_variable_set("@#{local_path.value}", new_arel_node)
 
-        elsif path.current.arguments? && parent_object.respond_to?(path.current.method[0])
+        elsif local_path.arguments? && parent_object.respond_to?(local_path.method[0])
           if remove
-            parent_object.delete_at(path.current.value)
+            parent_object.delete_at(local_path.value)
 
           else
-            parent_object[path.current.value] = new_node
+            parent_object[local_path.value] = new_arel_node
           end
         else
-          raise "Don't know how to replace `#{path.current.value}` in #{parent_object.inspect}"
+          raise "Don't know how to replace `#{local_path.value}` in #{parent_object.inspect}"
         end
 
-        new_parent_tree = Visitor.new.accept_with_root(parent_object, parent)
-        parent.parent.add(parent.path.current, new_parent_tree)
-        new_parent_tree[path.current.value]
+        if new_node.is_a?(Arel::Enhance::Node)
+          parent.add(local_path, new_node)
+          parent[local_path.value]
+        else
+          new_parent_tree = Visitor.new.accept_with_root(parent_object, parent)
+          parent.parent.add(parent.local_path, new_parent_tree)
+          new_parent_tree[local_path.value]
+        end
       end
       # rubocop:enable Metrics/PerceivedComplexity
       # rubocop:enable Metrics/CyclomaticComplexity