gg-mysql-connector 1.0.57 → 1.0.61

package/dist/src/GGMySQLConnector/GGMySQLConnector.d.ts

@@ -32,6 +32,7 @@ export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
         COLUMN_NAME: string;
         TABLE_NAME: string;
         DATA_TYPE: string;
+        COLUMN_TYPE: string;
     }[] | null;
     isConnected: boolean;
     constructor(DBInfo: DatabaseConfigInterface);

package/dist/src/GGMySQLConnector/GGMySQLConnector.js

@@ -228,7 +228,7 @@ class GGMySQLConnector {
         await this.loadColumnListToCache();
     }
     async loadColumnListToCache() {
-        const result = (await this.query(`SELECT COLUMN_NAME,TABLE_NAME,DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '${this.DBInfo.database}'`, undefined, false));
+        const result = (await this.query(`SELECT COLUMN_NAME,TABLE_NAME,DATA_TYPE,COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '${this.DBInfo.database}'`, undefined, false));
         this.columnAndTableListCache = result;
     }
     async getColumnList(tableName) {

package/dist/src/ModelGenerator/ModelGenerator.d.ts

@@ -25,7 +25,7 @@ export default class ModelGenerator {
     getColumnFullList(tableName: string): Promise<mysql.RowDataPacket[]>;
     private isTableNameExistInModel;
     private isColumnExistInModel;
-    getPossibleColumnValue(model: MyModel[], tableName: string, columnName: string, columnType: string): false | string[] | undefined;
+    getPossibleColumnValue(model: MyModel[], tableName: string, columnName: string, columnType: string): string[] | false;
     generateModelInterface(params: {
         appName: string;
         model: MyModel[];

package/dist/src/ModelGenerator/ModelGenerator.js

@@ -154,6 +154,7 @@ class ModelGenerator {
                 return word;
             }
         }
+        return false;
     }
     async generateModelInterface(params) {
         const tableList = [

package/dist/src/MyDBMigrator/MyDBMigrator.d.ts

@@ -8,6 +8,7 @@ export default class MyDBMigrator {
         TABLE_NAME: string;
         COLUMN_DEFAULT: string;
         COLUMN_KEY: string;
+        COLUMN_TYPE: string;
     }[];
     constructor(connection: ModelGenerator);
     migrateTable(model: MyModel[]): Promise<void>;

package/dist/src/MyDBMigrator/MyDBMigrator.js

@@ -119,9 +119,7 @@ class MyDBMigrator {
         const data = this.onetimeLoadColumnContent.find((row) => row.COLUMN_NAME === columnName && row.TABLE_NAME === tableName);
         if (data) {
             let possibleValueString = possibleValue
-                .map((row) => {
-                return `"${row}"`;
-            })
+                .map((row) => `"${row}"`)
                 .join(", ");
             try {
                 await this.MyDB.query(`ALTER TABLE ${tableName} MODIFY COLUMN ${columnName} ENUM(${possibleValueString}) ;`);
@@ -179,12 +177,12 @@ class MyDBMigrator {
                     .finally(() => {
                     console.log("");
                 });
-                loopCount++;
                 if (loopCount > viewModel.length * 5) {
                     console.log("error while updating view, reason is loop update counter is over 5 time fail");
                     process.exit(1);
                 }
             }
+            loopCount++;
         }
     }
     async checkIsPrimaryKey(databaseName, tableName, columnName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg-mysql-connector",
-  "version": "1.0.57",
+  "version": "1.0.61",
   "description": "",
   "main": "dist/src/index.js",
   "scripts": {

package/src/GGMySQLConnector/GGMySQLConnector.ts

@@ -57,7 +57,12 @@ export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
   isPrintStatement: boolean
   tableAndViewNameList: string[]
   columnAndTableListCache:
-    | { COLUMN_NAME: string; TABLE_NAME: string; DATA_TYPE: string }[]
+    | {
+        COLUMN_NAME: string
+        TABLE_NAME: string
+        DATA_TYPE: string
+        COLUMN_TYPE: string
+      }[]
     | null
   isConnected: boolean
 
@@ -374,11 +379,17 @@ export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
       COLUMN_NAME: string
       TABLE_NAME: string
       DATA_TYPE: string
+      COLUMN_TYPE: string
     }[] = (await this.query(
-      `SELECT COLUMN_NAME,TABLE_NAME,DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '${this.DBInfo.database}'`,
+      `SELECT COLUMN_NAME,TABLE_NAME,DATA_TYPE,COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '${this.DBInfo.database}'`,
       undefined,
       false
-    )) as { COLUMN_NAME: string; TABLE_NAME: string; DATA_TYPE: string }[]
+    )) as {
+      COLUMN_NAME: string
+      TABLE_NAME: string
+      DATA_TYPE: string
+      COLUMN_TYPE: string
+    }[]
 
     this.columnAndTableListCache = result
   }

package/src/ModelGenerator/ModelGenerator.ts

@@ -171,7 +171,7 @@ export default class ModelGenerator {
     tableName: string,
     columnName: string,
     columnType: string
-  ) {
+  ): string[] | false {
     const foundTable = model.find((row) => row.tableName === tableName)
     // search in table model
     if (foundTable) {
@@ -196,6 +196,7 @@ export default class ModelGenerator {
         return word
       }
     }
+    return false
   }
   async generateModelInterface(params: {
     appName: string

package/src/MyDBMigrator/MyDBMigrator.ts

@@ -12,6 +12,7 @@ export default class MyDBMigrator {
     TABLE_NAME: string
     COLUMN_DEFAULT: string
     COLUMN_KEY: string
+    COLUMN_TYPE: string
   }[]
   constructor(connection: ModelGenerator) {
     this.MyDB = connection
@@ -197,9 +198,7 @@ export default class MyDBMigrator {
     )
     if (data) {
       let possibleValueString = possibleValue
-        .map((row) => {
-          return `"${row}"`
-        })
+        .map((row) => `"${row}"`)
         .join(", ")
 
       try {
@@ -283,7 +282,6 @@ export default class MyDBMigrator {
           .finally(() => {
             console.log("")
           })
-        loopCount++
 
         if (loopCount > viewModel.length * 5) {
           console.log(
@@ -292,6 +290,7 @@ export default class MyDBMigrator {
           process.exit(1)
         }
       }
+      loopCount++
     }
   }