Better primary key detection

Author: phpfui

src/PHPFUI/ORM/Record.php

@@ -13,11 +13,9 @@
  */
 abstract class Record extends DataObject
 	{
-	public const ALLOWS_NULL_INDEX = 4;
+	public const ALLOWS_NULL_INDEX = 3;
 
-	public const DEFAULT_INDEX = 5;
-
-	public const KEY_INDEX = 3;
+	public const DEFAULT_INDEX = 4;
 
 	public const LENGTH_INDEX = 2;
 

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

@@ -15,9 +15,9 @@ abstract class Migration extends \PHPFUI\ORM\Record
 
 	/** @var array<string, array<mixed>> */
 	protected static array $fields = [
-		// MYSQL_TYPE, PHP_TYPE, LENGTH, KEY, ALLOWS_NULL, DEFAULT
-		'migrationId' => ['int(11)', 'int', 11, true, false, null, ],
-		'ran' => ['timestamp', 'string', 20, false, false, null, ],
+		// MYSQL_TYPE, PHP_TYPE, LENGTH, ALLOWS_NULL, DEFAULT
+		'migrationId' => ['int(11)', 'int', 11, false, null, ],
+		'ran' => ['timestamp', 'string', 20, false, null, ],
 	];
 
 	/** @var array<string, true> */

src/PHPFUI/ORM/Schema/Field.php

@@ -24,7 +24,7 @@ public function __construct(\PHPFUI\ORM\PDOInstance $pdo, array $fields, bool $a
 			$this->type = \strtolower($fields['Type']);
 			$this->nullable = 'YES' == $fields['Null'];
 			$this->defaultValue = $fields['Default'];
-			$this->primaryKey = 'PRI' == $fields['Key'];
+			$this->primaryKey = false;	// use indexes to find primary keys
 			$this->autoIncrement = \str_contains($fields['Extra'], 'auto_increment');
 
 			return;

src/PHPFUI/ORM/Schema/Index.php

@@ -14,7 +14,7 @@ public function __construct(\PHPFUI\ORM\PDOInstance $pdo, array $fields)
 		{
 		if (\str_starts_with($pdo->getDSN(), 'mysql'))
 			{
-			$this->primaryKey = 'PRIMARY' == $fields['Key_name'] || ! (bool)$fields['Non_unique'];
+			$this->primaryKey = 'PRIMARY' == $fields['Key_name'];
 			$this->name = $fields['Column_name'];
 			$this->extra = \implode(',', $fields);
 			}

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

@@ -31,7 +31,7 @@ abstract class ~~CLASS~~ extends \PHPFUI\ORM\Record
 
 	/** @var array<string, array<mixed>> */
 	protected static array $fields = [
-		// MYSQL_TYPE, PHP_TYPE, LENGTH, KEY, ALLOWS_NULL, DEFAULT
+		// MYSQL_TYPE, PHP_TYPE, LENGTH, ALLOWS_NULL, DEFAULT
 ~~FIELD_ARRAY~~	];
 
 	/** @var array<string, true> */
@@ -190,7 +190,6 @@ protected function getLine(\PHPFUI\ORM\Schema\Field $field) : string
 			$defaultValue = (int)$field->defaultValue;
 			}
 
-		$retVal .= $this->line($field->primaryKey ? 'true' : 'false');
 		$retVal .= $this->line($allowNulls ? 'true' : 'false');
 
 		if (null !== $defaultValue)