with_recursive_tree 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c1ccdf38306a7ddff768b00b73f3d3ff58bf094f7524e55b63e0502f4d757dd
-  data.tar.gz: 5572ccbc0023f7d7226b41f24ffa8513084dc2e8780075f48904dac3aa510a96
+  metadata.gz: e14936619fe555cbfb5024c1284f48645ce74ce15ea4f8d0986ba29181b4bd9d
+  data.tar.gz: a1edfad9f5e95ba7aa8a812703b8c73288840bf6aeb56a2334a47b7bbdd58d76
 SHA512:
-  metadata.gz: 0a9003bb5a943e7a4d48abed8db293a292dd21dfae943ab1c4899673920fa1c943b5f949d4caf9351c763b3f62e0a14bbfca0ff3e9dfa8fe7daa8e9f4ea6462e
-  data.tar.gz: 378da103d4c78855cc5c2acef7557e19a27eb2c3f11a4c63d26fa1e29dadff551d433d84060b0f7ef5bd2b711808d97b5c071e80e8f1ff5b61801ddca7a8bd38
+  metadata.gz: 3eab819caf4873be68501e1f0c4458d1e7c3dfdadc76331935be5ef93840ba57938dbbbdae48666e2e7bb63c5e7cca6106cf6b757fc51ae3214acc761138d974
+  data.tar.gz: deb8c83129e99787021939d4176bbef60b45e1edcf1f572d3076abe24e361205284e346f0320f68437e8eac0f13484b55d9975b6047af1bae5a21768ee3cd238

data/lib/with_recursive_tree/version.rb

@@ -1,3 +1,3 @@
 module WithRecursiveTree
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/with_recursive_tree.rb

@@ -6,8 +6,22 @@ module WithRecursiveTree
   extend ActiveSupport::Concern
 
   included do
-    scope :bfs, -> { order :depth }
-    scope :dfs, -> { self }
+    scope :bfs, -> {
+      if defined?(ActiveRecord::ConnectionAdapters::MySQL)
+        order :depth, with_recursive_tree_order
+      else
+        order :depth
+      end
+    }
+    scope :dfs, -> do
+      if defined?(ActiveRecord::ConnectionAdapters::MySQL)
+        order with_recursive_tree_order, :path
+      elsif defined?(ActiveRecord::ConnectionAdapters::PostgreSQL)
+        order :path
+      elsif defined?(ActiveRecord::ConnectionAdapters::SQLite3)
+        self
+      end
+    end
   end
 
   class_methods do
@@ -24,6 +38,14 @@ module WithRecursiveTree
     def roots
       where with_recursive_tree_foreign_key => nil
     end
+
+    def with_recursive_tree_order_column
+      if with_recursive_tree_order.is_a?(Hash)
+        with_recursive_tree_order.keys.first
+      else
+        with_recursive_tree_order.to_s.split(" ").first
+      end
+    end
   end
 
   def ancestors
@@ -52,21 +74,43 @@ module WithRecursiveTree
   end
 
   def self_and_ancestors
-    self.class.with(search_tree: self.class.with_recursive(
-      search_tree: [
+    self.class.with_recursive(
+      tree: [
         self.class.where(self.class.with_recursive_tree_primary_key => send(self.class.with_recursive_tree_primary_key)),
-        self.class.joins("JOIN search_tree ON #{self.class.table_name}.#{self.class.with_recursive_tree_primary_key} = search_tree.#{self.class.with_recursive_tree_foreign_key}")
+        self.class.joins("JOIN tree ON #{self.class.table_name}.#{self.class.with_recursive_tree_primary_key} = tree.#{self.class.with_recursive_tree_foreign_key}")
       ]
-    ).select("*").from("search_tree")).from("search_tree AS #{self.class.table_name}")
+    ).select("*").from("tree AS #{self.class.table_name}")
   end
 
   def self_and_descendants
-    self.class.with(search_tree: self.class.with_recursive(
-      search_tree: [
-        self.class.where(self.class.with_recursive_tree_primary_key => send(self.class.with_recursive_tree_primary_key)).select("*, '/' || #{self.class.with_recursive_tree_primary_key} || '/' AS path, 0 AS depth"),
-        Arel.sql(self.class.joins("JOIN search_tree ON #{self.class.table_name}.#{self.class.with_recursive_tree_foreign_key} = search_tree.#{self.class.with_recursive_tree_primary_key}").select("#{self.class.table_name}.*, search_tree.path || #{self.class.table_name}.#{self.class.with_recursive_tree_primary_key} || '/' AS path, depth + 1 AS depth").order(self.class.with_recursive_tree_order).to_sql)
+    anchor_path = if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+      "ARRAY[#{self.class.with_recursive_tree_order_column}]::text[]"
+    elsif defined?(ActiveRecord::ConnectionAdapters::MySQL)
+      "CAST(CONCAT('/', #{self.class.with_recursive_tree_primary_key}, '/') AS CHAR(512))"
+    elsif defined?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)
+      "'/' || #{self.class.with_recursive_tree_primary_key} || '/'"
+    end
+
+    recursive_path = if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+      "tree.path || #{self.class.table_name}.#{self.class.with_recursive_tree_order_column}::text"
+    elsif defined?(ActiveRecord::ConnectionAdapters::MySQL)
+      "CONCAT(tree.path, #{self.class.table_name}.#{self.class.with_recursive_tree_primary_key}, '/')"
+    elsif defined?(ActiveRecord::ConnectionAdapters::SQLite3)
+      "tree.path || #{self.class.table_name}.#{self.class.with_recursive_tree_primary_key} || '/'"
+    end
+
+    recursive_query = self.class.joins("JOIN tree ON #{self.class.table_name}.#{self.class.with_recursive_tree_foreign_key} = tree.#{self.class.with_recursive_tree_primary_key}").select("#{self.class.table_name}.*, #{recursive_path} AS path, depth + 1 AS depth")
+
+    unless defined?(ActiveRecord::ConnectionAdapters::MySQL)
+      recursive_query = recursive_query.order(self.class.with_recursive_tree_order)
+    end
+
+    self.class.with_recursive(
+      tree: [
+        self.class.where(self.class.with_recursive_tree_primary_key => send(self.class.with_recursive_tree_primary_key)).select("*, #{anchor_path} AS path, 0 AS depth"),
+        Arel.sql(recursive_query.to_sql)
       ]
-    ).select("*").from("search_tree")).from("search_tree AS #{self.class.table_name}")
+    ).select("*").from("tree AS #{self.class.table_name}")
   end
 
   def self_and_siblings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: with_recursive_tree
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord