Try to fix MSSQL and Oracle differently

yiisoft · Sep 26, 2023 · bdf10e6 · bdf10e6
1 parent 9de7184
commit bdf10e6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/ItemTreeTraversal/CteItemTreeTraversal.php b/src/ItemTreeTraversal/CteItemTreeTraversal.php
@@ -23,6 +23,8 @@
  */
 abstract class CteItemTreeTraversal implements ItemTreeTraversalInterface
 {
+    protected bool $useRecursiveInWith = true;
+
     /**
      * @param ConnectionInterface $database Yii Database connection instance.
      *
@@ -124,8 +126,13 @@ private function getRowsCommand(
             ->from($this->tableName)
             ->where(['name' => $name])
             ->union($cteSelectRelationQuery, all: true);
+        $quoter = $this->database->getQuoter();
         $outerQuery = $baseOuterQuery
-            ->withQuery($cteSelectItemQuery, "$cteName($cteParameterName)", recursive: true)
+            ->withQuery(
+                $cteSelectItemQuery,
+                $quoter->quoteTableName($cteName) . '(' . $quoter->quoteColumnName($cteParameterName) . ')',
+                recursive: $this->useRecursiveInWith,
+            )
             ->from($cteName)
             ->leftJoin(
                 ['item' => $this->tableName],

diff --git a/src/ItemTreeTraversal/MssqlCteItemTreeTraversal.php b/src/ItemTreeTraversal/MssqlCteItemTreeTraversal.php
@@ -11,4 +11,5 @@
  */
 final class MssqlCteItemTreeTraversal extends CteItemTreeTraversal
 {
+    protected bool $useRecursiveInWith = false;
 }
diff --git a/src/ItemTreeTraversal/OracleCteItemTreeTraversal.php b/src/ItemTreeTraversal/OracleCteItemTreeTraversal.php
@@ -11,4 +11,5 @@
  */
 final class OracleCteItemTreeTraversal extends CteItemTreeTraversal
 {
+    protected bool $useRecursiveInWith = false;
 }