closure_tree 3.6.7 → 3.6.8

data/README.md

@@ -367,6 +367,11 @@ Closure tree is [tested under every combination](http://travis-ci.org/#!/mceache
 
 ## Change log
 
+### 3.6.8
+
+* [Don Morrison](https://github.com/elskwid) massaged the [#hash_tree](#nested-hashes) query to
+be more efficient.
+
 ### 3.6.7
 
 * Added workaround for ActiveRecord::Observer usage pre-db-creation. Addresses

data/lib/closure_tree/acts_as_tree.rb

@@ -93,21 +93,26 @@ module ClosureTree
         tree = ActiveSupport::OrderedHash.new
         id_to_hash = {}
         limit_depth = (options[:limit_depth] || 10).to_i
-        scope = joins(<<-SQL)
-          INNER JOIN (
-            SELECT #{primary_key} as root_id
-              FROM #{quoted_table_name}
-              WHERE #{quoted_parent_column_name} IS NULL
-            ) AS roots ON (1 = 1)
+
+        # Simple join with hierarchy for ancestor, descendant, and generation
+        scope = joins(:ancestor_hierarchies)
+
+        # Deepest generation, within limit, for each descendant
+        scope = scope.joins(<<-SQL)
           INNER JOIN (
-            SELECT ancestor_id, descendant_id, MAX(generations) as max_gen
+            SELECT
+              #{quoted_hierarchy_table_name}.descendant_id,
+              MAX(#{quoted_hierarchy_table_name}.generations) AS depth
             FROM #{quoted_hierarchy_table_name}
-            GROUP BY 1, 2
-            HAVING MAX(generations) <= #{limit_depth - 1}
-          ) AS nodes ON (roots.root_id = nodes.ancestor_id) AND
-            #{quoted_table_name}.#{primary_key} = nodes.descendant_id
+            GROUP BY #{quoted_hierarchy_table_name}.descendant_id
+            HAVING MAX(#{quoted_hierarchy_table_name}.generations) <= #{limit_depth - 1}
+          ) AS generation_depth
+          ON #{quoted_hierarchy_table_name}.descendant_id = generation_depth.descendant_id
         SQL
-        scope.order(append_order("max_gen")).each do |ea|
+
+        scope = scope.order(append_order("generation_depth.depth"))
+
+        scope.each do |ea|
           h = id_to_hash[ea.id] = ActiveSupport::OrderedHash.new
           if ea.root?
             tree[ea] = h

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = "3.6.7" unless defined?(::ClosureTree::VERSION)
+  VERSION = "3.6.8" unless defined?(::ClosureTree::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 3.6.7
+  version: 3.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -486781145760134167
+      hash: 1831255790364540871
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -486781145760134167
+      hash: 1831255790364540871
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23