修复有多个主键的表在生成模型时，主键顺序可能不正确 (#584)

Yurunsoft · web-flow · commit 7f1f53a7ae54 · 2023-09-08T19:29:28.000+08:00
diff --git a/src/Components/pgsql/src/Model/Cli/Model/ModelGenerate.php b/src/Components/pgsql/src/Model/Cli/Model/ModelGenerate.php
@@ -292,7 +292,6 @@ private function getClassName(string $table, array $prefixs): string
      */
     private function parseFields(?string $poolName, array $fields, ?array &$data, bool $isView, string $table, ?array $config): void
     {
-        $idCount = 0;
         foreach ($fields as $field)
         {
             $atttypmod = $field['atttypmod'];
@@ -331,7 +330,7 @@ private function parseFields(?string $poolName, array $fields, ?array &$data, bo
                 'default'           => $field['adsrc'],
                 'defaultValue'      => $this->parseFieldDefaultValue($poolName, $type, $field['adsrc']),
                 'isPrimaryKey'      => $isPk,
-                'primaryKeyIndex'   => $field['ordinal_position'] ?? -1,
+                'primaryKeyIndex'   => $primaryKeyIndex = ($field['ordinal_position'] ?? 0) - 1,
                 'isAutoIncrement'   => '' !== $field['attidentity'],
                 'comment'           => $field['description'] ?? '',
                 'typeDefinition'    => $config['relation'][$table]['fields'][$field['attname']]['typeDefinition'] ?? true,
@@ -340,10 +339,11 @@ private function parseFields(?string $poolName, array $fields, ?array &$data, bo
             ];
             if ($isPk)
             {
-                $data['table']['id'][] = $field['attname'];
-                ++$idCount;
+                $data['table']['id'][$primaryKeyIndex] = $field['attname'];
             }
         }
+        ksort($data['table']['id']);
+        $data['table']['id'] = array_values($data['table']['id']);
     }
 
     /**
diff --git a/src/Components/pgsql/tests/Model/Base/ArticleBase.php b/src/Components/pgsql/tests/Model/Base/ArticleBase.php
@@ -37,7 +37,7 @@ abstract class ArticleBase extends Model
     /**
      * id.
      *
-     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)
+     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)
      */
     protected ?int $id = null;
 
diff --git a/src/Components/pgsql/tests/Model/Base/MemberBase.php b/src/Components/pgsql/tests/Model/Base/MemberBase.php
@@ -36,7 +36,7 @@ abstract class MemberBase extends Model
     /**
      * id.
      *
-     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)
+     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)
      */
     protected ?int $id = null;
 
diff --git a/src/Components/pgsql/tests/Model/Base/NoIncPkBase.php b/src/Components/pgsql/tests/Model/Base/NoIncPkBase.php
@@ -36,7 +36,7 @@ abstract class NoIncPkBase extends Model
     /**
      * a_id.
      *
-     * @Column(name="a_id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=false, ndims=0, virtual=false)
+     * @Column(name="a_id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=false, ndims=0, virtual=false)
      */
     protected ?int $aId = null;
 
@@ -65,7 +65,7 @@ public function setAId(?int $aId)
     /**
      * b_id.
      *
-     * @Column(name="b_id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=2, isAutoIncrement=false, ndims=0, virtual=false)
+     * @Column(name="b_id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=false, ndims=0, virtual=false)
      */
     protected ?int $bId = null;
 
diff --git a/src/Components/pgsql/tests/Model/Base/PerformanceBase.php b/src/Components/pgsql/tests/Model/Base/PerformanceBase.php
@@ -35,7 +35,7 @@ abstract class PerformanceBase extends Model
     /**
      * id.
      *
-     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)
+     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)
      */
     protected ?int $id = null;
 
diff --git a/src/Components/pgsql/tests/Model/Base/TestJsonBase.php b/src/Components/pgsql/tests/Model/Base/TestJsonBase.php
@@ -35,7 +35,7 @@ abstract class TestJsonBase extends Model
     /**
      * id.
      *
-     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)
+     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)
      */
     protected ?int $id = null;
 
diff --git a/src/Components/pgsql/tests/Model/Base/TestSoftDeleteBase.php b/src/Components/pgsql/tests/Model/Base/TestSoftDeleteBase.php
@@ -36,7 +36,7 @@ abstract class TestSoftDeleteBase extends Model
     /**
      * id.
      *
-     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)
+     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)
      */
     protected ?int $id = null;
 
diff --git a/src/Components/pgsql/tests/Model/Base/TreeBase.php b/src/Components/pgsql/tests/Model/Base/TreeBase.php
@@ -36,7 +36,7 @@ abstract class TreeBase extends Model
     /**
      * id.
      *
-     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)
+     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)
      */
     protected ?int $id = null;
 
diff --git a/src/Components/pgsql/tests/Model/Base/UpdateTimeBase.php b/src/Components/pgsql/tests/Model/Base/UpdateTimeBase.php
@@ -45,7 +45,7 @@ abstract class UpdateTimeBase extends Model
     /**
      * id.
      *
-     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)
+     * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)
      */
     protected ?int $id = null;
 
diff --git a/src/Components/pgsql/tests/Model/Base/VirtualColumnBase.php b/src/Components/pgsql/tests/Model/Base/VirtualColumnBase.php
@@ -36,7 +36,7 @@ abstract class VirtualColumnBase extends Model
     /**
      * id.
      *
-     * @Column(name="id", type="int8", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)
+     * @Column(name="id", type="int8", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)
      */
     protected ?int $id = null;
 
diff --git a/src/Model/Cli/Model/ModelGenerate.php b/src/Model/Cli/Model/ModelGenerate.php
@@ -21,6 +21,7 @@
 use Imi\Model\Cli\Model\Event\Param\BeforeGenerateModel;
 use Imi\Model\Cli\Model\Event\Param\BeforeGenerateModels;
 use Imi\Model\Model;
+use Imi\Util\ArrayUtil;
 use Imi\Util\File;
 use Imi\Util\Imi;
 use Imi\Util\Text;
@@ -277,8 +278,10 @@ public function generate(string $namespace, string $baseClass, ?string $database
             {
                 $typeDefinitions[$field['Field']] = ($tableConfig['fields'][$field['Field']]['typeDefinition'] ?? null) ?? ($configData['relation'][$table]['fields'][$field['Field']]['typeDefinition'] ?? true);
             }
+            $pks = $query->execute(sprintf('SHOW KEYS FROM `%s`.`%s` where Key_name = \'PRIMARY\'', $database, $table))->getArray();
+            $pks = ArrayUtil::columnToKey($pks, 'Column_name');
 
-            $this->parseFields($fields, $data, 'VIEW' === $item['TABLE_TYPE'], $typeDefinitions);
+            $this->parseFields($fields, $pks, $data, $typeDefinitions);
 
             $baseFileName = File::path($basePath, $className . 'Base.php');
 
@@ -337,20 +340,12 @@ private function getClassName(string $table, array $prefixs): string
     /**
      * 处理字段信息.
      */
-    private function parseFields(array $fields, ?array &$data, bool $isView, array $typeDefinitions): void
+    private function parseFields(array $fields, array $pks, ?array &$data, array $typeDefinitions): void
     {
-        $idCount = 0;
-        foreach ($fields as $i => $field)
+        foreach ($fields as $field)
         {
             $this->parseFieldType($field['Type'], $typeName, $length, $accuracy, $unsigned);
-            if ($isView && 0 === $i)
-            {
-                $isPk = true;
-            }
-            else
-            {
-                $isPk = 'PRI' === $field['Key'];
-            }
+            $isPk = isset($pks[$field['Field']]);
             [$phpType, $phpDefinitionType, $typeConvert] = $this->dbFieldTypeToPhp($typeName);
             $data['fields'][] = [
                 'name'              => $field['Field'],
@@ -365,7 +360,7 @@ private function parseFields(array $fields, ?array &$data, bool $isView, array $
                 'default'           => $field['Default'],
                 'defaultValue'      => $this->parseFieldDefaultValue($typeName, $field['Default']),
                 'isPrimaryKey'      => $isPk,
-                'primaryKeyIndex'   => $isPk ? $idCount : -1,
+                'primaryKeyIndex'   => $primaryKeyIndex = ($pks[$field['Field']]['Seq_in_index'] ?? 0) - 1,
                 'isAutoIncrement'   => str_contains($field['Extra'], 'auto_increment'),
                 'comment'           => $field['Comment'],
                 'typeDefinition'    => $typeDefinitions[$field['Field']],
@@ -375,10 +370,11 @@ private function parseFields(array $fields, ?array &$data, bool $isView, array $
             ];
             if ($isPk)
             {
-                $data['table']['id'][] = $field['Field'];
-                ++$idCount;
+                $data['table']['id'][$primaryKeyIndex] = $field['Field'];
             }
         }
+        ksort($data['table']['id']);
+        $data['table']['id'] = array_values($data['table']['id']);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,6 @@ private function getClassName(string $table, array $prefixs): string`
`292`	`292`	`*/`
`293`	`293`	`private function parseFields(?string $poolName, array $fields, ?array &$data, bool $isView, string $table, ?array $config): void`
`294`	`294`	`{`
`295`		`- $idCount = 0;`
`296`	`295`	`foreach ($fields as $field)`
`297`	`296`	`{`
`298`	`297`	`$atttypmod = $field['atttypmod'];`
`@@ -331,7 +330,7 @@ private function parseFields(?string $poolName, array $fields, ?array &$data, bo`
`331`	`330`	`'default' => $field['adsrc'],`
`332`	`331`	`'defaultValue' => $this->parseFieldDefaultValue($poolName, $type, $field['adsrc']),`
`333`	`332`	`'isPrimaryKey' => $isPk,`
`334`		`- 'primaryKeyIndex' => $field['ordinal_position'] ?? -1,`
	`333`	`+ 'primaryKeyIndex' => $primaryKeyIndex = ($field['ordinal_position'] ?? 0) - 1,`
`335`	`334`	`'isAutoIncrement' => '' !== $field['attidentity'],`
`336`	`335`	`'comment' => $field['description'] ?? '',`
`337`	`336`	`'typeDefinition' => $config['relation'][$table]['fields'][$field['attname']]['typeDefinition'] ?? true,`
`@@ -340,10 +339,11 @@ private function parseFields(?string $poolName, array $fields, ?array &$data, bo`
`340`	`339`	`];`
`341`	`340`	`if ($isPk)`
`342`	`341`	`{`
`343`		`- $data['table']['id'][] = $field['attname'];`
`344`		`- ++$idCount;`
	`342`	`+ $data['table']['id'][$primaryKeyIndex] = $field['attname'];`
`345`	`343`	`}`
`346`	`344`	`}`
	`345`	`+ ksort($data['table']['id']);`
	`346`	`+ $data['table']['id'] = array_values($data['table']['id']);`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ abstract class ArticleBase extends Model`
`37`	`37`	`/**`
`38`	`38`	`* id.`
`39`	`39`	`*`
`40`		`- * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)`
	`40`	`+ * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)`
`41`	`41`	`*/`
`42`	`42`	`protected ?int $id = null;`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ abstract class MemberBase extends Model`
`36`	`36`	`/**`
`37`	`37`	`* id.`
`38`	`38`	`*`
`39`		`- * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)`
	`39`	`+ * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)`
`40`	`40`	`*/`
`41`	`41`	`protected ?int $id = null;`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ abstract class PerformanceBase extends Model`
`35`	`35`	`/**`
`36`	`36`	`* id.`
`37`	`37`	`*`
`38`		`- * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)`
	`38`	`+ * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)`
`39`	`39`	`*/`
`40`	`40`	`protected ?int $id = null;`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ abstract class TestJsonBase extends Model`
`35`	`35`	`/**`
`36`	`36`	`* id.`
`37`	`37`	`*`
`38`		`- * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)`
	`38`	`+ * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)`
`39`	`39`	`*/`
`40`	`40`	`protected ?int $id = null;`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ abstract class TestSoftDeleteBase extends Model`
`36`	`36`	`/**`
`37`	`37`	`* id.`
`38`	`38`	`*`
`39`		`- * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)`
	`39`	`+ * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)`
`40`	`40`	`*/`
`41`	`41`	`protected ?int $id = null;`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ abstract class TreeBase extends Model`
`36`	`36`	`/**`
`37`	`37`	`* id.`
`38`	`38`	`*`
`39`		`- * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)`
	`39`	`+ * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)`
`40`	`40`	`*/`
`41`	`41`	`protected ?int $id = null;`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ abstract class UpdateTimeBase extends Model`
`45`	`45`	`/**`
`46`	`46`	`* id.`
`47`	`47`	`*`
`48`		`- * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)`
	`48`	`+ * @Column(name="id", type="int4", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)`
`49`	`49`	`*/`
`50`	`50`	`protected ?int $id = null;`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ abstract class VirtualColumnBase extends Model`
`36`	`36`	`/**`
`37`	`37`	`* id.`
`38`	`38`	`*`
`39`		`- * @Column(name="id", type="int8", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=1, isAutoIncrement=true, ndims=0, virtual=false)`
	`39`	`+ * @Column(name="id", type="int8", length=-1, accuracy=0, nullable=false, default="", isPrimaryKey=true, primaryKeyIndex=0, isAutoIncrement=true, ndims=0, virtual=false)`
`40`	`40`	`*/`
`41`	`41`	`protected ?int $id = null;`
`42`	`42`