修复 postWhere 闭包返回 IWhereCollector 对象时的错误 (#700)

Yurunsoft · web-flow · commit 82e53de69ccc · 2024-05-26T21:46:58.000+08:00
diff --git a/src/Db/Query/Where/WhereBrackets.php b/src/Db/Query/Where/WhereBrackets.php
@@ -8,6 +8,7 @@
 use Imi\Db\Query\Interfaces\IBaseWhere;
 use Imi\Db\Query\Interfaces\IQuery;
 use Imi\Db\Query\Interfaces\IWhereBrackets;
+use Imi\Db\Query\Interfaces\IWhereCollector;
 use Imi\Db\Query\Traits\TRaw;
 use Imi\Db\Query\WhereCollector;
 
@@ -97,7 +98,7 @@ public function toStringWithoutLogic(IQuery $query): string
 
             return '(' . $result . ')';
         }
-        elseif (null === $callResult)
+        elseif (null === $callResult || $callResult instanceof IWhereCollector)
         {
             $result = '(';
             foreach ([

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`use Imi\Db\Query\Interfaces\IBaseWhere;`
`9`	`9`	`use Imi\Db\Query\Interfaces\IQuery;`
`10`	`10`	`use Imi\Db\Query\Interfaces\IWhereBrackets;`
	`11`	`+use Imi\Db\Query\Interfaces\IWhereCollector;`
`11`	`12`	`use Imi\Db\Query\Traits\TRaw;`
`12`	`13`	`use Imi\Db\Query\WhereCollector;`
`13`	`14`
`@@ -97,7 +98,7 @@ public function toStringWithoutLogic(IQuery $query): string`
`97`	`98`
`98`	`99`	`return '(' . $result . ')';`
`99`	`100`	`}`
`100`		`- elseif (null === $callResult)`
	`101`	`+ elseif (null === $callResult \|\| $callResult instanceof IWhereCollector)`
`101`	`102`	`{`
`102`	`103`	`$result = '(';`
`103`	`104`	`foreach ([`