gg-mysql-connector 1.0.129 → 1.0.131

package/dist/src/MyDBMigrator/MyDBMigrator.js

@@ -129,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);`);
@@ -274,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.129",
+  "version": "1.0.131",
   "description": "",
   "main": "dist/src/index.js",
   "scripts": {

package/src/MyDBMigrator/MyDBMigrator.ts

@@ -207,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
       )
@@ -413,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
   }