fix: fix parse error on sepcial create SQL

inhere · Dec 5, 2023 · f5d1b2c · f5d1b2c
1 parent b80194c
commit f5d1b2c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/app/Lib/Parser/DBSchemeSQL.php b/app/Lib/Parser/DBSchemeSQL.php
@@ -52,30 +52,30 @@ public function parse(string $createSQL): DBTable
         $createSQL .= ";";
 
         $tableRows = explode("\n", $createSQL);
-        $tableName = trim(array_shift($tableRows), '( ');
+        $tableName = trim(array_shift($tableRows), " \t\n\r\0\x0B(");
         $tableName = trim(substr($tableName, 12), " \t\n\r\0\x0B`");
 
-        $tableComment = '';
         $tableEngine  = array_pop($tableRows);
-        if (($pos = stripos($tableEngine, ' comment')) !== false) {
+        if (stripos($tableEngine, ' comment') !== false) {
             $tableInfo = $this->parseTableMeta($tableEngine);
-            $tableComment = $tableInfo['comment'];
+            $dbt->setTableComment($tableInfo['comment']);
+        } else {
+            $tableRows[] = $tableEngine;
         }
 
         $dbt->setTableName($tableName);
-        $dbt->setTableComment($tableComment);
 
         $indexes = [];
-        $endstr = '';
+        $endStr = '';
         foreach ($tableRows as $row) {
-            $row = trim($row, ", \t\n\r\0\x0B");
+            $row = trim($row, ";, \t\n\r\0\x0B");
             if (!$row) {
                 continue;
             }
 
-            // eg: "(", ") ENGINE=some"
+            // eg: "(", ") ENGINE=some" table info 在多行
             if ($row[0] === '(' || $row[0] === ')' || !str_contains($row, ' ')) {
-                $endstr .= $row;
+                $endStr .= ' ' . $row;
                 continue;
             }
 
@@ -90,6 +90,11 @@ public function parse(string $createSQL): DBTable
 
         $dbt->setIndexes($indexes);
 
+        if ($endStr && !$dbt->tableComment) {
+            $tableInfo = $this->parseTableMeta($endStr);
+            $dbt->setTableComment($tableInfo['comment']);
+        }
+
         return $dbt;
     }
 

diff --git a/app/Lib/Parser/Item/FieldItem.php b/app/Lib/Parser/Item/FieldItem.php
@@ -94,7 +94,7 @@ public function javaType(): string
     }
 
     /**
-     * @param string $type
+     * @param string $type PHP type
      * @param string $name
      *
      * @return string
@@ -121,7 +121,6 @@ public function toJavaType(string $type, string $name): string
         if ($type === Type::OBJECT) {
             return Str::upFirst($name);
         }
-
         return Str::upFirst($type);
     }
 

diff --git a/app/Lib/Parser/MySQL/DBType.php b/app/Lib/Parser/MySQL/DBType.php
@@ -2,6 +2,8 @@
 
 namespace Inhere\Kite\Lib\Parser\MySQL;
 
+use Inhere\Kite\Lib\Generate\Java\JavaType;
+use Toolkit\Stdlib\Str;
 use Toolkit\Stdlib\Type;
 use function strtolower;
 
@@ -12,6 +14,8 @@ class DBType
 {
     public const INT = 'int';
 
+    public const BIGINT = 'bigint';
+
     public const CHAR = 'char';
 
     public const VARCHAR = 'varchar';
@@ -28,11 +32,11 @@ class DBType
     public static function isStringType(string $dbType): bool
     {
         if (str_contains($dbType, 'text')) {
-            return  true;
+            return true;
         }
 
         if (str_contains($dbType, 'char')) {
-            return  true;
+            return true;
         }
 
         return false;
@@ -46,7 +50,7 @@ public static function isStringType(string $dbType): bool
     public static function isIntType(string $dbType): bool
     {
         if (str_contains($dbType, 'int')) {
-            return  true;
+            return true;
         }
 
         return false;

diff --git a/app/Lib/Parser/MySQL/TableField.php b/app/Lib/Parser/MySQL/TableField.php
@@ -49,27 +49,19 @@ public function phpType(): string
     }
 
     /**
-     * @param string $type
+     * @param string $type DB type
      * @param string $name
      *
      * @return string
      */
     public function toJavaType(string $type, string $name): string
     {
-        if (Str::hasSuffixIC($this->name, 'id')) {
-            return JavaType::LONG;
-        }
-
-        if (Str::hasSuffixIC($this->name, 'ids')) {
-            return sprintf('%s<%s>', JavaType::LIST, JavaType::LONG);
-        }
-
         if ($type === DBType::JSON) {
-            // return JavaType::OBJECT;
             return Str::upFirst($name);
         }
 
-        return Str::upFirst(DBType::toPhpType($type));
+        $phpType = DBType::toPhpType($type);
+        return parent::toJavaType($phpType, $name);
     }
 
     /**