gg-mysql-connector 1.0.129 → 1.0.132

package/dist/src/ModelGenerator/ModelGenerator.js

@@ -35,6 +35,14 @@ class ModelGenerator {
         });
         this.isConnected = true;
         await this.createDatabaseIfNotExist();
+        await this.connection.end();
+        this.connection = await promise_1.default.createPool({
+            host: this.dbInfo.host,
+            user: this.dbInfo.user,
+            password: this.dbInfo.password,
+            port: this.dbInfo.port,
+            database: this.dbInfo.database,
+        });
     }
     async createDatabaseIfNotExist() {
         const databaseName = this.dbInfo.database;

package/dist/src/MyDBMigrator/MyDBMigrator.js

@@ -16,13 +16,13 @@ class MyDBMigrator {
     async migrateTable(model) {
         let data = model.filter((row) => row.tableName !== "sessions" && row.tableName.search("prisma") < 0);
         let index = 1;
-        this.onetimeLoadColumnContent = [];
-        await this.loadColumnContentIfEmpty();
         for (let row of data) {
             console.log(chalk_1.default.bgBlue(`${index}/${data.length}  ${row.tableName}`));
             await this.createTableIfNotExist(row.tableName);
             index++;
             const indexList = (await this.MyDB.query(`SHOW INDEX FROM ${row.tableName}`));
+            this.onetimeLoadColumnContent = [];
+            await this.loadColumnContentIfEmpty();
             for (let col of row.columns) {
                 console.log(`${row.tableName} (${col.DATA_TYPE}) - ${col.COLUMN_NAME} `);
                 await this.alterPrimaryKey(row.tableName, col);
@@ -129,9 +129,8 @@ 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);
-            // recheck only id
-            if (isPrimaryKey === false && col.COLUMN_NAME === "id")
+            const isPrimaryKey = await this.checkIsPrimaryKey(this.MyDB.dbInfo.database, tableName, col.COLUMN_NAME);
+            if (isPrimaryKey === false)
                 await this.MyDB.query(`ALTER TABLE ${tableName} ADD PRIMARY KEY(id);`);
         }
     }
@@ -274,15 +273,18 @@ 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}'`));
+        // console.log("checkIsPrimaryKey", result)
+        // 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.132",
   "description": "",
   "main": "dist/src/index.js",
   "scripts": {

package/src/ModelGenerator/ModelGenerator.ts

@@ -36,6 +36,14 @@ export default class ModelGenerator {
     })
     this.isConnected = true
     await this.createDatabaseIfNotExist()
+    await this.connection.end()
+    this.connection = await mysql.createPool({
+      host: this.dbInfo.host,
+      user: this.dbInfo.user,
+      password: this.dbInfo.password,
+      port: this.dbInfo.port,
+      database: this.dbInfo.database,
+    })
   }
   private async createDatabaseIfNotExist() {
     const databaseName = this.dbInfo.database
@@ -44,6 +52,7 @@ export default class ModelGenerator {
   }
   async pushModelToDB() {
     const migrator = new MyDBMigrator(this)
+
     await migrator.migrateTable(this.model)
   }
   async pushViewToDB_v2(viewModel: MyViewModel[]) {

package/src/MyDBMigrator/MyDBMigrator.ts

@@ -32,8 +32,7 @@ export default class MyDBMigrator {
         row.tableName !== "sessions" && row.tableName.search("prisma") < 0
     )
     let index = 1
-    this.onetimeLoadColumnContent = []
-    await this.loadColumnContentIfEmpty()
+
     for (let row of data) {
       console.log(chalk.bgBlue(`${index}/${data.length}  ${row.tableName}`))
       await this.createTableIfNotExist(row.tableName)
@@ -44,6 +43,9 @@ export default class MyDBMigrator {
         `SHOW INDEX FROM ${row.tableName}`
       )) as { Key_name: string }[]
 
+      this.onetimeLoadColumnContent = []
+      await this.loadColumnContentIfEmpty()
+
       for (let col of row.columns) {
         console.log(`${row.tableName} (${col.DATA_TYPE}) - ${col.COLUMN_NAME} `)
         await this.alterPrimaryKey(row.tableName, col)
@@ -207,11 +209,11 @@ 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
       )
-      // recheck only id
-      if (isPrimaryKey === false && col.COLUMN_NAME === "id")
+      if (isPrimaryKey === false)
         await this.MyDB.query(`ALTER TABLE ${tableName} ADD PRIMARY KEY(id);`)
     }
   }
@@ -413,19 +415,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}'`)
-
-    const result2 = this.onetimeLoadColumnContent.find(
-      (row) => row.TABLE_NAME === tableName && columnName === 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 }[]
+    // console.log("checkIsPrimaryKey", result)
+    // 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
   }