primaryKeys array is no longer associative

Author: phpfui

Tests/Fixtures/Record/Definition/Order.php

@@ -61,8 +61,8 @@ abstract class Order extends \PHPFUI\ORM\Record
 		'taxes' => ['decimal(19,4)', 'float', 19, false, true, 0, ],
 	];
 
-	/** @var array<string, true> */
-	protected static array $primaryKeys = ['order_id' => true, ];
+	/** @var array<string> */
+	protected static array $primaryKeys = ['order_id', ];
 
 	protected static string $table = 'order';
 	}

Tests/Fixtures/Record/Definition/OrderDetail.php

@@ -41,8 +41,8 @@ abstract class OrderDetail extends \PHPFUI\ORM\Record
 		'unit_price' => ['decimal(19,4)', 'float', 19, false, true, 0, ],
 	];
 
-	/** @var array<string, true> */
-	protected static array $primaryKeys = ['order_detail_id' => true, ];
+	/** @var array<string> */
+	protected static array $primaryKeys = ['order_detail_id', ];
 
 	protected static string $table = 'order_detail';
 	}

Tests/Fixtures/Record/Definition/Product.php

@@ -42,8 +42,8 @@ abstract class Product extends \PHPFUI\ORM\Record
 		'target_level' => ['integer', 'int', 0, false, true, null, ],
 	];
 
-	/** @var array<string, true> */
-	protected static array $primaryKeys = ['product_id' => true, ];
+	/** @var array<string> */
+	protected static array $primaryKeys = ['product_id', ];
 
 	protected static string $table = 'product';
 	}

Tests/Unit/MiscellaneousTest.php

@@ -4,6 +4,14 @@
 
 class MiscellaneousTest extends \PHPUnit\Framework\TestCase
 	{
+	public function testNoStringPrimaryKey() : void
+		{
+		$customer = new \Tests\App\Record\Customer(1);
+		$this->assertTrue($customer->loaded());
+		$this->expectException(\PHPFUI\ORM\Exception::class);
+		$customer = new \Tests\App\Record\Customer('test');
+		}
+
 	public function testRow() : void
 		{
 		$row = \PHPFUI\ORM::getRow('select * from customer');

src/PHPFUI/ORM/Children.php

@@ -50,7 +50,7 @@ protected function getTable(string $class) : \PHPFUI\ORM\Table
 		$childTable = new $class();
 		$condition = new \PHPFUI\ORM\Condition();
 
-		foreach ($this->currentRecord->getPrimaryKeys() as $primaryKey => $junk)
+		foreach ($this->currentRecord->getPrimaryKeys() as $primaryKey)
 			{
 			$condition->and($primaryKey, $this->currentRecord->{$primaryKey});
 			}

src/PHPFUI/ORM/ManyToMany.php

@@ -33,12 +33,12 @@ public function getValue(array $parameters) : mixed
 		$relatedTable->addJoin($junctionTableName, $relatedTableName . \PHPFUI\ORM::$idSuffix);
 		$condition = new \PHPFUI\ORM\Condition();
 
-		foreach ($this->currentRecord->getPrimaryKeys() as $primaryKey => $junk)
+		foreach ($this->currentRecord->getPrimaryKeys() as $primaryKey)
 			{
 			$condition->and($junctionTableName . '.' . $primaryKey, $this->currentRecord->{$primaryKey});
 			}
 
-		foreach ($relatedTable->getPrimaryKeys() as $primaryKey => $junk)
+		foreach ($relatedTable->getPrimaryKeys() as $primaryKey)
 			{
 			$condition->and(new \PHPFUI\ORM\Field($junctionTableName . '.' . $primaryKey), new \PHPFUI\ORM\Field($relatedTableName . '.' . $primaryKey));
 			}

src/PHPFUI/ORM/Record.php

@@ -63,33 +63,22 @@ public function __construct(int|array|null|string $parameter = null)
 
 		switch ($type)
 		  {
-			case 'string':
-
-				if (1 == \count(static::$primaryKeys))
-					{
-					$this->read($parameter);
-					}
-				else
-					{
-					throw new \PHPFUI\ORM\Exception(static::class . ' has no string primary key');
-					}
-
-				break;
-
 			case 'integer':
+				$type = 'int';
+				// Intentionally fall through
+			case 'string':
 
-				if (1 == \count(static::$primaryKeys) && 'int' == static::$fields[\array_key_first(static::$primaryKeys)][self::PHP_TYPE_INDEX])
+				if (1 == \count(static::$primaryKeys) && $type == static::$fields[static::$primaryKeys[0]][self::PHP_TYPE_INDEX])
 					{
 					$this->read($parameter);
 					}
 				else
 					{
-					throw new \PHPFUI\ORM\Exception(static::class . ' does not have an integer primary key');
+					throw new \PHPFUI\ORM\Exception(static::class . ' has no ' . $type . ' primary key');
 					}
 
 				break;
 
-
 			case 'array':
 
 				$this->read($parameter);
@@ -360,7 +349,7 @@ public function getLength(string $field) : int
 		}
 
 	/**
-	 * @return array  primary keys
+	 * @return array<string>  primary keys
 	 */
 	public static function getPrimaryKeys() : array
 		{
@@ -374,7 +363,7 @@ public function getPrimaryKeyValues() : array
 		{
 		$retVal = [];
 
-		foreach (static::$primaryKeys as $key => $junk)
+		foreach (static::$primaryKeys as $key)
 			{
 			$retVal[$key] = $this->current[$key] ?? null;
 			}
@@ -518,7 +507,7 @@ public function reload() : bool
 		{
 		$keys = [];
 
-		foreach (static::$primaryKeys as $key => $junk)
+		foreach (static::$primaryKeys as $key)
 			{
 			if (\array_key_exists($key, $this->current))
 				{
@@ -608,7 +597,7 @@ public function update() : bool
 			{
 			if (isset(static::$fields[$field]))
 				{
-				if (! isset(static::$primaryKeys[$field]))
+				if (! \in_array($field, static::$primaryKeys))
 					{
 					if (empty($value) && \in_array(static::$fields[$field][self::MYSQL_TYPE_INDEX], $dateTimes))
 						{
@@ -786,15 +775,15 @@ private function buildWhere(array|int|string $key, array &$input) : string
 
 		if (! \is_array($key))
 			{
-			$key = [\array_key_first(static::$primaryKeys) => $key];
+			$key = [static::$primaryKeys[0] => $key];
 			}
 		else
 			{ // if all primary keys are set, then use primary keys only
 
 			$keys = [];
 			$all = true;
 
-			foreach (static::$primaryKeys as $keyField => $junk)
+			foreach (static::$primaryKeys as $keyField)
 				{
 				if (! isset($key[$keyField]))
 					{
@@ -854,7 +843,7 @@ private function privateInsert(bool $updateOnDuplicate, string $ignore = '') : i
 					continue;
 					}
 
-				if (! static::$autoIncrement || ! (isset(static::$primaryKeys[$key]) && empty($value)))
+				if (! static::$autoIncrement || ! (\in_array($key, static::$primaryKeys) && empty($value)))
 					{
 					$sql .= $comma . '`' . $key . '`';
 					$input[] = $value;
@@ -883,7 +872,7 @@ private function privateInsert(bool $updateOnDuplicate, string $ignore = '') : i
 						continue;
 						}
 
-					if (! isset(static::$primaryKeys[$key]))
+					if (! \in_array($key, static::$primaryKeys))
 						{
 						$updateSql .= $comma . '`' . $key . '` = ?';
 						$input[] = $value;
@@ -906,7 +895,7 @@ private function privateInsert(bool $updateOnDuplicate, string $ignore = '') : i
 
 		if (static::$autoIncrement && $returnValue)
 			{
-			$this->current[\array_key_first(static::$primaryKeys)] = $returnValue = (int)\PHPFUI\ORM::lastInsertId(\array_key_first(static::$primaryKeys));
+			$this->current[static::$primaryKeys[0]] = $returnValue = (int)\PHPFUI\ORM::lastInsertId(static::$primaryKeys[0]);
 			}
 
 		$this->loaded = true;	// record is effectively read from the database now

src/PHPFUI/ORM/Record/Definition/Migration.php

@@ -20,8 +20,8 @@ abstract class Migration extends \PHPFUI\ORM\Record
 		'ran' => ['timestamp', 'string', 20, false, null, ],
 	];
 
-	/** @var array<string, true> */
-	protected static array $primaryKeys = ['migrationId' => true, ];
+	/** @var array<string> */
+	protected static array $primaryKeys = ['migrationId', ];
 
 	protected static string $table = 'migration';
 	}

src/PHPFUI/ORM/Table.php

@@ -958,7 +958,7 @@ public function updateFromTable(array $request) : bool
 
 		if (\count($primaryKeys))
 			{
-			$mainKey = \array_key_first($primaryKeys);
+			$mainKey = $primaryKeys[0];
 
 			foreach ($request[$mainKey] ?? [] as $existingKey => $index)
 				{

src/PHPFUI/ORM/Tool/Generate/Base.php

@@ -13,6 +13,9 @@ public function nameSort(\PHPFUI\ORM\Schema\Field $lhs, \PHPFUI\ORM\Schema\Field
 
 	abstract protected function getLine(\PHPFUI\ORM\Schema\Field $field) : string;
 
+	/**
+	 * @return array<string, string>
+	 */
 	protected function getPrimaryKeys(string $table) : array
 		{
 		$primaryKeys = [];