fix entity gen id error

swoft-cloud · Feb 4, 2020 · e437d36 · e437d36 · dcdebug · Jan 27, 2021
1 parent 563c493
commit e437d36
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/devtool/src/Model/Logic/EntityLogic.php b/src/devtool/src/Model/Logic/EntityLogic.php
@@ -146,7 +146,8 @@ private function generateEntity(
             output()->writeln(' Quit, Bye!');
             return;
         }
-        if ($fileExists && !$isConfirm && !ConsoleHelper::confirm(" entity $file already exists, Ensure continue?",
+        if ($fileExists && !$isConfirm
+            && !ConsoleHelper::confirm(" entity $file already exists, Ensure continue?",
                 false)
         ) {
             output()->writeln(' Quit, Bye!');
@@ -192,7 +193,7 @@ private function generateProperties(array $colSchema, string $tplDir): string
 
         // id
         $id = '*';
-        if (!empty($colSchema['key']) && !$this->readyGenerateId) {
+        if (!empty($colSchema['key']) && !$this->readyGenerateId && $colSchema['key'] === 'PRI') {
             // Is auto increment
             $auto = $colSchema['extra'] && strpos($colSchema['extra'], 'auto_increment') !== false ? '' :
                 'incrementing=false';