activerecord-hierarchical_query 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08cdf36d6fb182dd4b149bfd278ce346b775f707b81759801cd29b2e2e413eb3'
-  data.tar.gz: 05a716bc7921c28157eef8ea8f894a0b27fdfb84275c755ac7e3e5637c6e8dd0
+  metadata.gz: b5166c41ef62af29c1883f5b6e3f3447ba422bf76bae1bf5672f1f4991bbda08
+  data.tar.gz: 519b6c33c67c1b3e69578ca7abf693f1076a69f9d7f45cec5b800b954f17c7a2
 SHA512:
-  metadata.gz: 714bdb7948f223ccfdb8f3a7c7b8188bd8b972a2c63bdbe35c0a5857970d806b3876e7ea7a539b7790866ca5e8e985d20080cff7162a6e927b2ebaa1b274bd3a
-  data.tar.gz: 281f8ec47b4bbeec77ea2931130a1707997cd3f190b0242e63c6ef7d5096d6e1f4d9df6590beff9b9a029741a3d4e55ede05dcc6535bd80dc0c30406dd077676
+  metadata.gz: 21208d283a34594e442d19023db12e2d8cf3f79b04a55c397ce1dd97b5ccc6990db05a799b1a71a85410d5c2a905b7ba5e3791cbcb83e34611d138afe8c044d9
+  data.tar.gz: e54b02481e06962334aa9627c1fa1971dd92960aa5d2247dd4172a82f59738bcb5d10cafbc65efe8e8dcf373d81da7e4544e3fc0c938937fd33e343f7e672cd7

data/lib/active_record/hierarchical_query/cte/columns.rb

@@ -1,5 +1,3 @@
-require 'arel/visitors/depth_first'
-
 module ActiveRecord
   module HierarchicalQuery
     module CTE
@@ -18,7 +16,23 @@ module ActiveRecord
 
         private
         def connect_by_columns
-          @query.join_conditions.grep(Arel::Attributes::Attribute) { |column| column.name.to_s }
+          columns = []
+          traverse(@query.join_conditions) do |node|
+            columns << node.name.to_s if node.is_a?(Arel::Attributes::Attribute)
+          end
+          columns
+        end
+
+        def traverse(ast, &blck)
+          if ast && ast.respond_to?(:left) && ast.left
+            traverse(ast.left, &blck)
+          end
+
+          if ast && ast.respond_to?(:right) && ast.right
+            traverse(ast.right, &blck)
+          end
+
+          yield ast
         end
       end
     end

data/lib/active_record/hierarchical_query/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module HierarchicalQuery
-    VERSION = '1.2.3'
+    VERSION = '1.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hierarchical_query
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,7 +20,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -55,14 +55,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Recursively traverse trees using a single SQL query