gg-mysql-connector 1.0.126 → 1.0.131

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

@@ -9,6 +9,7 @@ export default class MyDBMigrator {
         COLUMN_DEFAULT: string;
         COLUMN_KEY: string;
         COLUMN_TYPE: string;
+        CHARACTER_MAXIMUM_LENGTH: number | null;
     }[];
     foreignKeyStatementList: string[];
     constructor(connection: ModelGenerator);

package/dist/src/MyDBMigrator/MyDBMigrator.js

@@ -4,6 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
+function keepOnlyDigits(str) {
+    return Number(str.replace(/\D/g, ""));
+}
 class MyDBMigrator {
     constructor(connection) {
         this.MyDB = connection;
@@ -126,7 +129,7 @@ class MyDBMigrator {
     async alterPrimaryKey(tableName, col) {
         // console.log("alterPrimaryKey()")
         if (col.COLUMN_NAME === "id" && col.AUTO_INCREMENT === true) {
-            const isPrimaryKey = await this.checkIsPrimaryKey(tableName, col.COLUMN_NAME);
+            const isPrimaryKey = await this.checkIsPrimaryKey(this.MyDB.dbInfo.database, tableName, col.COLUMN_NAME);
             // recheck only id
             if (isPrimaryKey === false && col.COLUMN_NAME === "id")
                 await this.MyDB.query(`ALTER TABLE ${tableName} ADD PRIMARY KEY(id);`);
@@ -151,6 +154,9 @@ class MyDBMigrator {
         if (this.onetimeLoadColumnContent.length === 0) {
             this.onetimeLoadColumnContent = (await this.MyDB.query(`SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '${this.MyDB.dbInfo.database}'`, undefined, false));
         }
+        // const temp = this.onetimeLoadColumnContent.forEach((row)=>{
+        //   if(row.COLUMN_TYPE === '')
+        // })
     }
     async checkIsColumnDataTypeChange(tableName, columnName, dataType, columnDefault) {
         await this.loadColumnContentIfEmpty();
@@ -161,16 +167,18 @@ class MyDBMigrator {
             columnDefault = "NULL";
         if (temp.length > 0) {
             if (temp[0].DATA_TYPE !== dataType) {
-                console.log(chalk_1.default.green `${temp[0].DATA_TYPE} change to ${dataType}`);
-                return true;
-                // if (temp[0].DATA_TYPE === "enum") {
-                //   return true
-                // } else {
-                //   return true
-                // }
+                if (temp[0].DATA_TYPE.search("varchar") >= 0) {
+                    if (temp[0].CHARACTER_MAXIMUM_LENGTH !==
+                        keepOnlyDigits(temp[0].DATA_TYPE))
+                        return true;
+                }
+                else {
+                    console.log(chalk_1.default.green `DATA_TYPE -> ${temp[0].DATA_TYPE} change to ${dataType}`);
+                    return true;
+                }
             }
             if (temp[0].COLUMN_DEFAULT !== columnDefault) {
-                console.log(chalk_1.default.green `${temp[0].COLUMN_DEFAULT} change to ${columnDefault}`);
+                console.log(chalk_1.default.green `COLUMN_DEFAULT -> ${temp[0].COLUMN_DEFAULT} change to ${columnDefault}`);
                 return true;
             }
             return false;
@@ -266,15 +274,17 @@ class MyDBMigrator {
             loopCount++;
         }
     }
-    async checkIsPrimaryKey(tableName, columnName) {
-        // let result: any = await this.MyDB.query(`SELECT *
-        // FROM INFORMATION_SCHEMA.COLUMNS
-        // WHERE TABLE_SCHEMA='${databaseName}'
-        //     AND TABLE_NAME='${tableName}'
-        //     AND COLUMN_NAME='${columnName}'`)
-        const result2 = this.onetimeLoadColumnContent.find((row) => row.TABLE_NAME === tableName && columnName === columnName);
-        if (result2) {
-            if (result2.COLUMN_KEY === "PRI")
+    async checkIsPrimaryKey(databaseName, tableName, columnName) {
+        let result = (await this.MyDB.query(`SELECT *
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA='${databaseName}'
+        AND TABLE_NAME='${tableName}'
+        AND COLUMN_NAME='${columnName}'`));
+        // const result2 = this.onetimeLoadColumnContent.find(
+        //   (row) => row.TABLE_NAME === tableName && columnName === columnName
+        // )
+        if (result.length) {
+            if (result[0].COLUMN_KEY === "PRI")
                 return true;
             else
                 return false;

package/package.json

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

package/src/MyDBMigrator/MyDBMigrator.ts

@@ -4,6 +4,9 @@ import ModelGenerator from "../ModelGenerator/ModelGenerator"
 import { columnType, MyModel, MyViewModel } from "../myModel"
 import sql from "sql-template-strings"
 import { table } from "console"
+function keepOnlyDigits(str: string): number {
+  return Number(str.replace(/\D/g, ""))
+}
 export default class MyDBMigrator {
   MyDB: ModelGenerator
   onetimeLoadColumnContent: {
@@ -13,6 +16,7 @@ export default class MyDBMigrator {
     COLUMN_DEFAULT: string
     COLUMN_KEY: string
     COLUMN_TYPE: string
+    CHARACTER_MAXIMUM_LENGTH: number | null
   }[]
   foreignKeyStatementList: string[]
 
@@ -203,6 +207,7 @@ export default class MyDBMigrator {
     // console.log("alterPrimaryKey()")
     if (col.COLUMN_NAME === "id" && col.AUTO_INCREMENT === true) {
       const isPrimaryKey = await this.checkIsPrimaryKey(
+        this.MyDB.dbInfo.database,
         tableName,
         col.COLUMN_NAME
       )
@@ -240,6 +245,9 @@ export default class MyDBMigrator {
         false
       )) as any
     }
+    // const temp = this.onetimeLoadColumnContent.forEach((row)=>{
+    //   if(row.COLUMN_TYPE === '')
+    // })
   }
 
   private async checkIsColumnDataTypeChange(
@@ -257,17 +265,22 @@ export default class MyDBMigrator {
 
     if (temp.length > 0) {
       if (temp[0].DATA_TYPE !== dataType) {
-        console.log(chalk.green`${temp[0].DATA_TYPE} change to ${dataType}`)
-        return true
-        // if (temp[0].DATA_TYPE === "enum") {
-        //   return true
-        // } else {
-        //   return true
-        // }
+        if (temp[0].DATA_TYPE.search("varchar") >= 0) {
+          if (
+            temp[0].CHARACTER_MAXIMUM_LENGTH !==
+            keepOnlyDigits(temp[0].DATA_TYPE)
+          )
+            return true
+        } else {
+          console.log(
+            chalk.green`DATA_TYPE -> ${temp[0].DATA_TYPE} change to ${dataType}`
+          )
+          return true
+        }
       }
       if (temp[0].COLUMN_DEFAULT !== columnDefault) {
         console.log(
-          chalk.green`${temp[0].COLUMN_DEFAULT} change to ${columnDefault}`
+          chalk.green`COLUMN_DEFAULT -> ${temp[0].COLUMN_DEFAULT} change to ${columnDefault}`
         )
         return true
       }
@@ -401,19 +414,23 @@ export default class MyDBMigrator {
     }
   }
 
-  private async checkIsPrimaryKey(tableName: string, columnName: string) {
-    // let result: any = await this.MyDB.query(`SELECT *
-    // FROM INFORMATION_SCHEMA.COLUMNS
-    // WHERE TABLE_SCHEMA='${databaseName}'
-    //     AND TABLE_NAME='${tableName}'
-    //     AND COLUMN_NAME='${columnName}'`)
+  private async checkIsPrimaryKey(
+    databaseName: string,
+    tableName: string,
+    columnName: string
+  ) {
+    let result = (await this.MyDB.query(`SELECT *
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA='${databaseName}'
+        AND TABLE_NAME='${tableName}'
+        AND COLUMN_NAME='${columnName}'`)) as { COLUMN_KEY: string }[]
 
-    const result2 = this.onetimeLoadColumnContent.find(
-      (row) => row.TABLE_NAME === tableName && columnName === columnName
-    )
+    // const result2 = this.onetimeLoadColumnContent.find(
+    //   (row) => row.TABLE_NAME === tableName && columnName === columnName
+    // )
 
-    if (result2) {
-      if (result2.COLUMN_KEY === "PRI") return true
+    if (result.length) {
+      if (result[0].COLUMN_KEY === "PRI") return true
       else return false
     } else return false
   }