Support cycle detection with UUIDs on PostgreSQL

staudenmeir · May 7, 2023 · 82db6aa · 82db6aa
1 parent 3928fa7
commit 82db6aa
Show file tree

Hide file tree

Showing 9 changed files with 191 additions and 35 deletions.
diff --git a/src/Query/Grammars/PostgresGrammar.php b/src/Query/Grammars/PostgresGrammar.php
@@ -100,10 +100,14 @@ public function compilePivotColumnNullValue(string $type): string
      */
     public function compileCycleDetection(string $localKey, string $path): string
     {
-        $localKey = $this->wrap($localKey);
-        $path = $this->wrap($path);
+        $wrappedLocalKey = $this->wrap($localKey);
+        $wrappedPath = $this->wrap($path);
 
-        return "$localKey = any($path)";
+        if ($this->model->isIntegerAttribute($localKey)) {
+            return "$wrappedLocalKey = any($wrappedPath)";
+        }
+
+        return "$wrappedLocalKey::varchar = any($wrappedPath)";
     }
 
     /**

diff --git a/tests/Graph/AncestorsTest.php b/tests/Graph/AncestorsTest.php
@@ -30,21 +30,35 @@ public function testLazyLoading()
         );
     }
 
-    public function testLazyLoadingWithCycleDetection()
+    /**
+     * @dataProvider cycleDetectionClassProvider
+     */
+    public function testLazyLoadingWithCycleDetection(string $class, array $exclusions)
     {
+        if (in_array($this->database, $exclusions)) {
+            $this->markTestSkipped();
+        }
+
         $this->seedCycle();
 
-        $ancestors = NodeWithCycleDetection::find(12)->ancestors;
+        $ancestors = $class::find(12)->ancestors;
 
         $this->assertEquals([14, 13, 12], $ancestors->pluck('id')->all());
         $this->assertEquals([-1, -2, -3], $ancestors->pluck('depth')->all());
     }
 
-    public function testLazyLoadingWithCycleDetectionAndStart()
+    /**
+     * @dataProvider cycleDetectionAndStartClassProvider
+     */
+    public function testLazyLoadingWithCycleDetectionAndStart(string $class, array $exclusions)
     {
+        if (in_array($this->database, $exclusions)) {
+            $this->markTestSkipped();
+        }
+
         $this->seedCycle();
 
-        $ancestors = NodeWithCycleDetectionAndStart::find(12)->ancestors;
+        $ancestors = $class::find(12)->ancestors;
 
         $this->assertEquals([14, 13, 12, 14], $ancestors->pluck('id')->all());
         $this->assertEquals([-1, -2, -3, -4], $ancestors->pluck('depth')->all());
@@ -125,23 +139,37 @@ public function testEagerLoading()
         );
     }
 
-    public function testEagerLoadingWithCycleDetection()
+    /**
+     * @dataProvider cycleDetectionClassProvider
+     */
+    public function testEagerLoadingWithCycleDetection(string $class, array $exclusions)
     {
+        if (in_array($this->database, $exclusions)) {
+            $this->markTestSkipped();
+        }
+
         $this->seedCycle();
 
-        $nodes = NodeWithCycleDetection::with([
+        $nodes = $class::with([
             'ancestors' => fn (Ancestors $query) => $query->orderByDesc('depth'),
         ])->findMany([12, 13, 14]);
 
         $this->assertEquals([14, 13, 12], $nodes[0]->ancestors->pluck('id')->all());
         $this->assertEquals([-1, -2, -3], $nodes[0]->ancestors->pluck('depth')->all());
     }
 
-    public function testEagerLoadingWithCycleDetectionAndStart()
+    /**
+     * @dataProvider cycleDetectionAndStartClassProvider
+     */
+    public function testEagerLoadingWithCycleDetectionAndStart(string $class, array $exclusions)
     {
+        if (in_array($this->database, $exclusions)) {
+            $this->markTestSkipped();
+        }
+
         $this->seedCycle();
 
-        $nodes = NodeWithCycleDetectionAndStart::with([
+        $nodes = $class::with([
             'ancestors' => fn (Ancestors $query) => $query->orderByDesc('depth'),
         ])->findMany([12, 13, 14]);
 

diff --git a/tests/Graph/DescendantsTest.php b/tests/Graph/DescendantsTest.php
@@ -30,21 +30,35 @@ public function testLazyLoading()
         );
     }
 
-    public function testLazyLoadingWithCycleDetection()
+    /**
+     * @dataProvider cycleDetectionClassProvider
+     */
+    public function testLazyLoadingWithCycleDetection(string $class, array $exclusions)
     {
+        if (in_array($this->database, $exclusions)) {
+            $this->markTestSkipped();
+        }
+
         $this->seedCycle();
 
-        $descendants = NodeWithCycleDetection::find(12)->descendants;
+        $descendants = $class::find(12)->descendants;
 
         $this->assertEquals([13, 14, 12], $descendants->pluck('id')->all());
         $this->assertEquals([1, 2, 3], $descendants->pluck('depth')->all());
     }
 
-    public function testLazyLoadingWithCycleDetectionAndStart()
+    /**
+     * @dataProvider cycleDetectionAndStartClassProvider
+     */
+    public function testLazyLoadingWithCycleDetectionAndStart(string $class, array $exclusions)
     {
+        if (in_array($this->database, $exclusions)) {
+            $this->markTestSkipped();
+        }
+
         $this->seedCycle();
 
-        $descendants = NodeWithCycleDetectionAndStart::find(12)->descendants;
+        $descendants = $class::find(12)->descendants;
 
         $this->assertEquals([13, 14, 12, 13], $descendants->pluck('id')->all());
         $this->assertEquals([1, 2, 3, 4], $descendants->pluck('depth')->all());
@@ -133,23 +147,37 @@ public function testEagerLoading()
         );
     }
 
-    public function testEagerLoadingWithCycleDetection()
+    /**
+     * @dataProvider cycleDetectionClassProvider
+     */
+    public function testEagerLoadingWithCycleDetection(string $class, array $exclusions)
     {
+        if (in_array($this->database, $exclusions)) {
+            $this->markTestSkipped();
+        }
+
         $this->seedCycle();
 
-        $nodes = NodeWithCycleDetection::with([
+        $nodes = $class::with([
             'descendants' => fn (Descendants $query) => $query->orderBy('depth'),
         ])->findMany([12, 13, 14]);
 
         $this->assertEquals([13, 14, 12], $nodes[0]->descendants->pluck('id')->all());
         $this->assertEquals([1, 2, 3], $nodes[0]->descendants->pluck('depth')->all());
     }
 
-    public function testEagerLoadingWithCycleDetectionAndStart()
+    /**
+     * @dataProvider cycleDetectionAndStartClassProvider
+     */
+    public function testEagerLoadingWithCycleDetectionAndStart(string $class, array $exclusions)
     {
+        if (in_array($this->database, $exclusions)) {
+            $this->markTestSkipped();
+        }
+
         $this->seedCycle();
 
-        $nodes = NodeWithCycleDetectionAndStart::with([
+        $nodes = $class::with([
             'descendants' => fn (Descendants $query) => $query->orderBy('depth')
         ])->findMany([12, 13, 14]);
 

diff --git a/tests/Graph/Models/Node.php b/tests/Graph/Models/Node.php
@@ -14,6 +14,8 @@ class Node extends Model
     }
     use SoftDeletes;
 
+    protected $table = 'nodes';
+
     public function getPivotTableName(): string
     {
         return 'edges';

diff --git a/tests/Graph/Models/NodeWithCycleDetection.php b/tests/Graph/Models/NodeWithCycleDetection.php
@@ -4,8 +4,6 @@
 
 class NodeWithCycleDetection extends Node
 {
-    protected $table = 'nodes';
-
     public function enableCycleDetection(): bool
     {
         return true;

diff --git a/tests/Graph/Models/NodeWithUuid.php b/tests/Graph/Models/NodeWithUuid.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Staudenmeir\LaravelAdjacencyList\Tests\Graph\Models;
+
+class NodeWithUuid extends Node
+{
+    public function getParentKeyName(): string
+    {
+        return 'parent_uuid';
+    }
+
+    public function getChildKeyName(): string
+    {
+        return 'child_uuid';
+    }
+
+    public function getLocalKeyName(): string
+    {
+        return 'uuid';
+    }
+}
diff --git a/tests/Graph/Models/NodeWithUuidAndCycleDetection.php b/tests/Graph/Models/NodeWithUuidAndCycleDetection.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Staudenmeir\LaravelAdjacencyList\Tests\Graph\Models;
+
+class NodeWithUuidAndCycleDetection extends NodeWithUuid
+{
+    public function enableCycleDetection(): bool
+    {
+        return true;
+    }
+}
diff --git a/tests/Graph/Models/NodeWithUuidAndCycleDetectionAndStart.php b/tests/Graph/Models/NodeWithUuidAndCycleDetectionAndStart.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Staudenmeir\LaravelAdjacencyList\Tests\Graph\Models;
+
+class NodeWithUuidAndCycleDetectionAndStart extends NodeWithUuidAndCycleDetection
+{
+    public function includeCycleStart(): bool
+    {
+        return true;
+    }
+}