SqlBuilder: The same conditions with different parameter is not skipped [Closes #109, #14]

Author: norbe

src/Database/Table/SqlBuilder.php

@@ -213,7 +213,7 @@ public function addWhere($condition, ...$params)
 			return $this->addWhereComposition($condition, $params[0]);
 		}
 
-		$hash = md5($condition . json_encode($params));
+		$hash = $this->getConditionHash($condition, $params);
 		if (isset($this->conditions[$hash])) {
 			return FALSE;
 		}
@@ -553,6 +553,21 @@ protected function addWhereComposition(array $columns, array $parameters)
 	}
 
 
+	private function getConditionHash($condition, $parameters)
+	{
+		foreach ($parameters as & $parameter) {
+			if ($parameter instanceof Selection) {
+				$parameter = $this->getConditionHash($parameter->getSql(), $parameter->sqlBuilder->getParameters());
+			} elseif ($parameter instanceof SqlLiteral) {
+				$parameter = $this->getConditionHash($parameter->__toString(), $parameter->getParameters());
+			} elseif (is_object($parameter) && method_exists($parameter, '__toString')) {
+				$parameter = $parameter->__toString();
+			}
+		}
+		return md5($condition . json_encode($parameters));
+	}
+
+
 	private function getCachedTableList()
 	{
 		if (!$this->cacheTableList) {

tests/Database/Table/SqlBuilder.addWhere().phpt

@@ -42,6 +42,29 @@ test(function () use ($context) { // test Selection as a parameter
 	]), $sqlBuilder->buildSelectQuery());
 });
 
+
+test(function () use ($context) { // test more Selection as a parameter
+	$sqlBuilder = new SqlBuilder('book', $context);
+	$sqlBuilder->addWhere('id', $context->table('book'));
+	$sqlBuilder->addWhere('id', $context->table('book_tag')->select('book_id'));
+	Assert::equal(reformat([
+		'mysql' => 'SELECT * FROM `book` WHERE (`id` IN (?)) AND (`id` IN (?))',
+		'SELECT * FROM [book] WHERE ([id] IN (SELECT [id] FROM [book])) AND ([id] IN (SELECT [book_id] FROM [book_tag]))',
+	]), $sqlBuilder->buildSelectQuery());
+});
+
+
+test(function () use ($context) { // test more ActiveRow as a parameter
+	$sqlBuilder = new SqlBuilder('book', $context);
+	$books = $context->table('book')->where('id', [1,2])->fetchPairs('id');
+	$sqlBuilder->addWhere('id ?', $books[1]);
+	$sqlBuilder->addWhere('id ?', $books[2]);
+	Assert::equal(reformat([
+		'SELECT * FROM [book] WHERE ([id] = ?) AND ([id] = ?)',
+	]), $sqlBuilder->buildSelectQuery());
+});
+
+
 test(function () use ($context) { // test Selection with parameters as a parameter
 	$sqlBuilder = new SqlBuilder('book', $context);
 	$sqlBuilder->addWhere('id', $context->table('book')->having('COUNT(:book_tag.tag_id) >', 1));
@@ -53,6 +76,7 @@ test(function () use ($context) { // test Selection with parameters as a paramet
 	Assert::count(1, $sqlBuilder->getParameters());
 });
 
+
 test(function () use ($context) { // test Selection with column as a parameter
 	$sqlBuilder = new SqlBuilder('book', $context);
 	$sqlBuilder->addWhere('id', $context->table('book')->select('id'));