Subqueries in BaseBuilder. BaseBuilder::cleanClone()

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>

Author: iRedds

system/Database/BaseBuilder.php

@@ -707,9 +707,8 @@ protected function whereHaving(string $qb_key, $key, $value = null, string $type
 
 				if ($v instanceof Closure)
 				{
-					$builder = clone $this;
-					$builder->from([], true)->resetQuery();
-					$v = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
+					$builder = $this->cleanClone();
+					$v       = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
 				}
 				else
 				{
@@ -849,9 +848,8 @@ protected function _whereIn(string $key = null, $values = null, bool $not = fals
 
 		if ($values instanceof Closure)
 		{
-			$builder = clone $this;
-			$builder->from([], true)->resetQuery();
-			$ok = str_replace("\n", ' ', $values($builder)->getCompiledSelect());
+			$builder = $this->cleanClone();
+			$ok      = str_replace("\n", ' ', $values($builder)->getCompiledSelect());
 		}
 		else
 		{
@@ -3030,4 +3028,16 @@ protected function setBind(string $key, $value = null, bool $escape = true): str
 	}
 
 	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a clone of a Base Builder with reset query builder values.
+	 *
+	 * @return BaseBuilder
+	 */
+	protected function cleanClone()
+	{
+		return (clone $this)->from([], true)->resetQuery();
+	}
+
+	//--------------------------------------------------------------------
 }