Better in select logic

Author: phpfui

Tests/Unit/MiscellaneousTest.php

@@ -23,15 +23,28 @@ public function testInOperator() : void
 		{
 		$in = new \PHPFUI\ORM\Operator\In();
 		$this->assertTrue($in->correctlyTyped([1, 2]));
-		$this->assertFalse($in->correctlyTyped([]));
+		$this->assertTrue($in->correctlyTyped([]));
 		$this->assertFalse($in->correctlyTyped(1));
 
 		$notIn = new \PHPFUI\ORM\Operator\NotIn();
 		$this->assertTrue($notIn->correctlyTyped([1, 2]));
-		$this->assertFalse($notIn->correctlyTyped([]));
+		$this->assertTrue($notIn->correctlyTyped([]));
 		$this->assertFalse($notIn->correctlyTyped(1));
 		}
 
+	public function testInSelectOperator() : void
+		{
+		$productTable = new \Tests\Fixtures\Table\Product();
+		$productTable->addSelect('product_id');
+		$productTable->setWhere(new \PHPFUI\ORM\Condition('product_name', '%dried%', new \PHPFUI\ORM\Operator\Like()));
+		$orderDetailTable = new \Tests\Fixtures\Table\OrderDetail();
+		$orderDetailTable->setWhere(new \PHPFUI\ORM\Condition('product_id', $productTable, new \PHPFUI\ORM\Operator\In()));
+
+		$this->assertCount(8, $orderDetailTable);
+		$orderDetailTable->setWhere(new \PHPFUI\ORM\Condition('product_id', $productTable, new \PHPFUI\ORM\Operator\NotIn()));
+		$this->assertCount(50, $orderDetailTable);
+		}
+
 	public function testLiteralCondition() : void
 		{
 		$condition = new \PHPFUI\ORM\Condition('field', new \PHPFUI\ORM\Literal('invoiceItem.storeItemId'));

src/PHPFUI/ORM/Condition.php

@@ -67,7 +67,7 @@ public function __toString() : string
 					$retVal .= "{$first}{$escapedField}{$operator} ";
 					$first = ' ';
 
-					if (\is_array($value) || $value instanceof \PHPFUI\ORM\Table)
+					if (\is_array($value))
 						{
 						$count = \count($value);
 
@@ -80,6 +80,11 @@ public function __toString() : string
 							$retVal = 'FALSE';
 							}
 						}
+					elseif ($value instanceof \PHPFUI\ORM\Table)
+						{
+						$input = [];
+						$retVal .= '(' . $value->getSelectSQL($input) . ')';
+						}
 					elseif (null !== $value)
 						{
 						$retVal .= '?';
@@ -167,9 +172,7 @@ public function getInput() : array
 
 				if ($value instanceof \PHPFUI\ORM\Table)
 					{
-					$input = [];
-					$sql = $value->getSelectSQL($input);
-					$retVal = \array_merge($retVal, \PHPFUI\ORM::getValueArray($sql, $input));
+					$value->getSelectSQL($retVal);
 					}
 				elseif (\is_array($value))
 					{

src/PHPFUI/ORM/Operator/In.php

@@ -11,6 +11,6 @@ public function __construct()
 
 	public function correctlyTyped(mixed $variable) : bool
 		{
-		return (\is_array($variable) && \count($variable)) || $variable instanceof \PHPFUI\ORM\Table;
+		return \is_array($variable) || $variable instanceof \PHPFUI\ORM\Table;
 		}
 	}

src/PHPFUI/ORM/Operator/NotIn.php

@@ -11,6 +11,6 @@ public function __construct()
 
 	public function correctlyTyped(mixed $variable) : bool
 		{
-		return (\is_array($variable) && \count($variable)) || $variable instanceof \PHPFUI\ORM\Table;
+		return \is_array($variable) || $variable instanceof \PHPFUI\ORM\Table;
 		}
 	}