activerecord-hierarchical_query 1.2.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faba4aa6eac892d19c4bc1dd40e0144722d17a2147b8fa895876731e2f34db50
-  data.tar.gz: 7831c15020830d2c2b913357bac349509511998019042d4c0cadf79f1bd6d8bb
+  metadata.gz: dbfe38ba545752409503f8e35bac2dc57e10f01b3b52692b305925727095c371
+  data.tar.gz: b8cf2743d2a55b857c685be2adfd16ad4b881dae39029f173aaf60dcb7214726
 SHA512:
-  metadata.gz: f55aa4774dec03dbded8f0a3d8c7d416ad10fe4b4046fa46b28424ece88eb343fd5c8fe3e19590f1bd3228f94d06f84c54796b79e9739ee82bca0b4cf939dbba
-  data.tar.gz: 2e612eb0fcbd96396eb7da96ca7dcb4053f8d5227bcd5ccaea7618e4d44c7bd339bbf23c740a8a3250a10df9b588294fa444f7cadec47405d73de9849f9c9424
+  metadata.gz: 54dc3bc71efd8b69918175ca63ccf73161651f326da7c827b6a4dc6c1fcc1a19c95645e8bcddd6bb61cbb7959859ecf79da2bed72a69548aa560f595ad7fbfc6
+  data.tar.gz: ac232b4cb3a9ed883df916b57f51c48548e12b651d14524615a5dc3559c9727c358521bda0427c980a96175d6a2985a83c0d41411e24a05e37afcc6832b6bbd8

data/README.md

@@ -13,21 +13,13 @@ in hierarchical order using hierarchical query builder.
 
 ## Requirements
 
-- ActiveRecord >= 5.0, < 6.1
+- ActiveRecord >= 5.0, < 7.1
 - PostgreSQL >= 8.4
-- Postgres Gem >= 0.21, < 1.2
+- Postgres Gem >= 0.21, < 1.3
 
 Note that though PostgresSQL 8.4 and up should work, this library
 is tested on PostgresSQL 10.5.
 
-### Rails Version
-
-**Rails 4 support has ended.**
-
-If you have trouble with Rails 5.1 or 5.0, try upgrading to Rails 5.2
-first. Rails 6 should work, but please report issues immediately as
-support is recent.
-
 ## In a nutshell
 
 ### Traverse trees

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.2'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hierarchical_query
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2022-01-21 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
@@ -40,7 +40,7 @@ dependencies:
         version: '0.21'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,19 +50,19 @@ dependencies:
         version: '0.21'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   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
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -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.22
 signing_key: 
 specification_version: 4
 summary: Recursively traverse trees using a single SQL query