Merge branch 'group_by_for_mssql' of https://github.com/MartinKoerner/closure_tree into pr200

Author: mceachen

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### 6.2.0
+
+* Fix for [MySQL lock lengths](https://github.com/mceachen/closure_tree/issues/231).
+   Thanks to [Liam](https://github.com/hut8)!
+* [Tom Smyth](https://github.com/hooverlunch) added [eager tree loading](https://github.com/mceachen/closure_tree/pull/232)
+* Merged [PR 200](https://github.com/mceachen/closure_tree/pull/200) which may or may not add support to SQLServer 2008 (but this is not a supported RDBMS).
+
 ### 6.1.0
 
 * Added official support for ActiveRecord 5.0! Thanks to [Abdelkader Boudih](https://github.com/seuros),

lib/closure_tree/finders.rb

@@ -39,7 +39,7 @@ def find_all_by_generation(generation_level)
           SELECT descendant_id
           FROM #{_ct.quoted_hierarchy_table_name}
           WHERE ancestor_id = #{_ct.quote(self.id)}
-          GROUP BY 1
+          GROUP BY descendant_id
           HAVING MAX(#{_ct.quoted_hierarchy_table_name}.generations) = #{generation_level.to_i}
         ) AS descendants ON (#{_ct.quoted_table_name}.#{_ct.base_class.primary_key} = descendants.descendant_id)
       SQL
@@ -74,7 +74,7 @@ def leaves
           INNER JOIN (
             SELECT ancestor_id
             FROM #{_ct.quoted_hierarchy_table_name}
-            GROUP BY 1
+            GROUP BY ancestor_id
             HAVING MAX(#{_ct.quoted_hierarchy_table_name}.generations) = 0
           ) AS leaves ON (#{_ct.quoted_table_name}.#{primary_key} = leaves.ancestor_id)
         SQL
@@ -100,7 +100,7 @@ def find_all_by_generation(generation_level)
           INNER JOIN (
             SELECT ancestor_id, descendant_id
             FROM #{_ct.quoted_hierarchy_table_name}
-            GROUP BY 1, 2
+            GROUP BY ancestor_id, descendant_id
             HAVING MAX(generations) = #{generation_level.to_i}
           ) AS descendants ON (
             #{_ct.quoted_table_name}.#{primary_key} = descendants.descendant_id

lib/closure_tree/numeric_deterministic_ordering.rb

@@ -72,7 +72,7 @@ def roots_and_descendants_preordered
           JOIN (
             SELECT descendant_id, max(generations) AS max_depth
             FROM #{_ct.quoted_hierarchy_table_name}
-            GROUP BY 1
+            GROUP BY descendant_id
           ) AS depths ON depths.descendant_id = anc.#{_ct.quoted_id_column_name}
         SQL
         joins(join_sql)

lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = Gem::Version.new('6.1.0')
+  VERSION = Gem::Version.new('6.2.0')
 end