activerecord-hierarchical_query 1.2.1 → 1.4.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18f95128fd462bc6f9c7ea0ff645a4015b812c839058470b4ffa90d3f9086f94
-  data.tar.gz: 550f1bd66253046d7f1529dd35948deb4aae02195189e62d6e471bb9398323be
+  metadata.gz: d042af24e9fdd0b4aa819e458ee6ce01f6003a74319c89bb01c51c8d314ee23a
+  data.tar.gz: 7c3f983e9f6181d18414af603bc174d72f2baca983c10cd3cdd61425083e33aa
 SHA512:
-  metadata.gz: 898cec660309a3677f0b5c570fa7d8c368281b9a8d1713e38c21b1c1c1a022fe9f5cea21cee4c5a3f90dafd14fc3c4c25f168be7412c1b17b1cbaa9e4c713e83
-  data.tar.gz: a54b8e2d64dd6249ed4b80a7140849d2de1d74733c5a9c16796d8b5e8575077f4481edf23baf787f3544a82b1d9f14dd02db51b6f85bc99e32f942d62f829544
+  metadata.gz: 8de0cf1db7102615b812f1edd12a8c3409475713eb1852e46500806c44a50bee7f00e57779943e477b860f206fcb1350115a6f7ea3064de4ca3432a753286d53
+  data.tar.gz: 957277b46f4a99e87d0c3a1fdeb92216283a0071150a43687e995ef9fc4216c8fb01cbb25d1caec4946aaa0a21ddfbf0540dfb6950356ddffda0e93b8739b741

data/README.md

@@ -13,21 +13,13 @@ in hierarchical order using hierarchical query builder.
 
 ## Requirements
 
-* ActiveRecord >= 5.0, <= 6.0
-* PostgreSQL >= 8.4
-* Postgres Gem >= 0.21, < 1.2
+- ActiveRecord >= 5.0, < 7.1
+- PostgreSQL >= 8.4
+- 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
@@ -130,13 +122,15 @@ end
 
 Hierarchical queries consist of these important clauses:
 
-* **START WITH** clause
+- **START WITH** clause
 
   This clause specifies the root row(s) of the hierarchy.
-* **CONNECT BY** clause
+
+- **CONNECT BY** clause
 
   This clause specifies relationship between parent rows and child rows of the hierarchy.
-* **ORDER SIBLINGS** clause
+
+- **ORDER SIBLINGS** clause
 
   This clause specifies an order of rows in which they appear on each hierarchy level.
 
@@ -144,16 +138,16 @@ These terms are borrowed from [Oracle hierarchical queries syntax](http://docs.o
 
 Hierarchical queries are processed as follows:
 
-* First, root rows are selected -- those rows that satisfy `START WITH` condition in
+- First, root rows are selected -- those rows that satisfy `START WITH` condition in
   order specified by `ORDER SIBLINGS` clause. In example above it's specified by
   statements `query.start_with(parent_id: nil)` and `query.order_siblings(:name)`.
 
-* Second, child rows for each root rows are selected. Each child row must satisfy
+- Second, child rows for each root rows are selected. Each child row must satisfy
   condition specified by `CONNECT BY` clause with respect to one of the root rows
   (`query.connect_by(id: :parent_id)` in example above). Order of child rows is
   also specified by `ORDER SIBLINGS` clause.
 
-* Successive generations of child rows are selected with respect to `CONNECT BY` clause.
+- Successive generations of child rows are selected with respect to `CONNECT BY` clause.
   First the children of each row selected in step 2 selected, then the children of those
   children and so on.
 
@@ -342,7 +336,7 @@ ORDER BY "categories__recursive"."__order_column" ASC
 ```
 
 If you want to use a `LEFT OUTER JOIN` instead of an `INNER JOIN`,
-add a query option for `outer_join_hierarchical`.  This
+add a query option for `outer_join_hierarchical`. This
 option allows the query to return non-hierarchical entries:
 
 ```ruby
@@ -359,10 +353,10 @@ key of the main table to another column:
 
 ## Related resources
 
-* [About hierarchical queries (Wikipedia)](http://en.wikipedia.org/wiki/Hierarchical_and_recursive_queries_in_SQL)
-* [Hierarchical queries in Oracle](http://docs.oracle.com/cd/B19306_01/server.102/b14200/queries003.htm)
-* [Recursive queries in PostgreSQL](http://www.postgresql.org/docs/9.3/static/queries-with.html)
-* [Using Recursive SQL with ActiveRecord trees](http://hashrocket.com/blog/posts/recursive-sql-in-activerecord)
+- [About hierarchical queries (Wikipedia)](http://en.wikipedia.org/wiki/Hierarchical_and_recursive_queries_in_SQL)
+- [Hierarchical queries in Oracle](http://docs.oracle.com/cd/B19306_01/server.102/b14200/queries003.htm)
+- [Recursive queries in PostgreSQL](http://www.postgresql.org/docs/9.3/static/queries-with.html)
+- [Using Recursive SQL with ActiveRecord trees](http://hashrocket.com/blog/posts/recursive-sql-in-activerecord)
 
 ## Contributing
 

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hierarchical_query
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0.alpha1
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-15 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,9 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        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
@@ -165,11 +165,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 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