gg-mysql-connector 1.0.93 → 1.0.95

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

@@ -5,6 +5,7 @@ export interface DatabaseConfigInterface {
     user: string;
     password: string;
     database: string;
+    port: number;
 }
 export default class ModelGenerator {
     model: MyModel[];

package/dist/src/ModelGenerator/ModelGenerator.js

@@ -31,6 +31,7 @@ class ModelGenerator {
             host: this.dbInfo.host,
             user: this.dbInfo.user,
             password: this.dbInfo.password,
+            port: this.dbInfo.port,
         });
         this.isConnected = true;
         await this.createDatabaseIfNotExist();

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

@@ -13,10 +13,10 @@ export default class MyDBMigrator {
     constructor(connection: ModelGenerator);
     migrateTable(model: MyModel[]): Promise<void>;
     private isConstraintNameExist;
-    private getCompositeUniqueName;
+    private getCompositeName;
     private isCompositeUniqueColumnExist;
     private alterForeignKey;
-    private alterUniqueColumnCombination;
+    private alterColumnCombination;
     private alterDataType;
     private alterPrimaryKey;
     private createTableIfNotExist;

package/dist/src/MyDBMigrator/MyDBMigrator.js

@@ -28,7 +28,7 @@ class MyDBMigrator {
                 await this.alterPossibleEnum(row.tableName, col.COLUMN_NAME, col.POSSIBLE_VALUE, col.IS_NOT_NULL);
                 await this.alterForeignKey(row.tableName, col);
             }
-            await this.alterUniqueColumnCombination(row.tableName, row.compoisteUniqueColumn);
+            await this.alterColumnCombination(row.tableName, row.compoisteColumn);
         }
         console.log("migrate table done");
     }
@@ -41,18 +41,27 @@ class MyDBMigrator {
         const data = (await this.MyDB.query(sql));
         return data.length ? true : false;
     }
-    getCompositeUniqueName(compositeUniqueColumn) {
-        return `unique_${compositeUniqueColumn === null || compositeUniqueColumn === void 0 ? void 0 : compositeUniqueColumn.columnName.join("_")}`;
+    getCompositeName(compositeUniqueColumn) {
+        if ((compositeUniqueColumn === null || compositeUniqueColumn === void 0 ? void 0 : compositeUniqueColumn.type) === "INDEX")
+            return `my_index_${compositeUniqueColumn === null || compositeUniqueColumn === void 0 ? void 0 : compositeUniqueColumn.columnName.join("_")}`;
+        if ((compositeUniqueColumn === null || compositeUniqueColumn === void 0 ? void 0 : compositeUniqueColumn.type) === "UNIQUE")
+            return `my_unique_${compositeUniqueColumn === null || compositeUniqueColumn === void 0 ? void 0 : compositeUniqueColumn.columnName.join("_")}`;
     }
-    async isCompositeUniqueColumnExist(tableName, compositeUniqueColumn) {
-        const compositeUniqueName = this.getCompositeUniqueName(compositeUniqueColumn);
-        const sql = `SHOW INDEX FROM ${tableName} WHERE Non_unique = 0 AND Key_name like "${compositeUniqueName}"`;
+    async isCompositeUniqueColumnExist(tableName, compositeColumn) {
+        const compositeName = this.getCompositeName(compositeColumn);
+        let Non_unique;
+        if ((compositeColumn === null || compositeColumn === void 0 ? void 0 : compositeColumn.type) === "INDEX")
+            Non_unique = 1;
+        else if ((compositeColumn === null || compositeColumn === void 0 ? void 0 : compositeColumn.type) === "UNIQUE")
+            Non_unique = 0;
+        const sql = `SHOW INDEX FROM ${tableName} WHERE Non_unique = ${Non_unique} AND Key_name like '${compositeName}'`;
         const data = (await this.MyDB.query(sql));
         // console.log("sql", sql)
         // console.log("isCompositeUniqueColumnExist", data.length, data)
         return data.length ? true : false;
     }
     async alterForeignKey(tableName, col) {
+        console.log("alterForeignKey()");
         if (col.FOREIGN_KEY) {
             for (const row of col.FOREIGN_KEY) {
                 const CONSTRAINT = `fk_${tableName}_${col.COLUMN_NAME}_${row.tableName}_${row.columnName}`.slice(0, 64);
@@ -69,21 +78,25 @@ class MyDBMigrator {
             }
         }
     }
-    async alterUniqueColumnCombination(tableName, uniqueColumnCombination) {
+    async alterColumnCombination(tableName, uniqueColumnCombination) {
+        console.log("alterColumnCombination()");
         if (uniqueColumnCombination === null || uniqueColumnCombination === void 0 ? void 0 : uniqueColumnCombination.length) {
             for (let row of uniqueColumnCombination) {
                 const isCompositeUniqueNameExist = await this.isCompositeUniqueColumnExist(tableName, row);
                 // check is exist, then drop it first
+                const compositeName = this.getCompositeName(row);
                 if (isCompositeUniqueNameExist) {
-                    await this.MyDB.query(`ALTER TABLE ${tableName} DROP INDEX ${this.getCompositeUniqueName(row)}`);
+                    const stmt = `ALTER TABLE ${tableName} DROP INDEX ${compositeName}`;
+                    await this.MyDB.query(stmt);
                 }
-                const compositeUniqueName = this.getCompositeUniqueName(row);
+                const type = row.type === "UNIQUE" ? `${row.type} KEY` : "INDEX";
                 const temp = row.columnName.join(",");
-                await this.MyDB.query(`ALTER TABLE ${tableName} ADD UNIQUE KEY ${compositeUniqueName} (${temp})`);
+                await this.MyDB.query(`ALTER TABLE ${tableName} ADD ${type} ${compositeName} (${temp})`);
             }
         }
     }
     async alterDataType(tableName, col) {
+        console.log("alterDataType()");
         const AutoIncrement = col.AUTO_INCREMENT ? "AUTO_INCREMENT" : "";
         const columnDefault = col.COLUMN_DEFAULT
             ? `DEFAULT ${col.COLUMN_DEFAULT}`
@@ -101,6 +114,7 @@ class MyDBMigrator {
         }
     }
     async alterPrimaryKey(tableName, col) {
+        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);
             if (isPrimaryKey === false)
@@ -147,6 +161,7 @@ class MyDBMigrator {
         }
     }
     async alterUniqueKey(tableName, columnName, IS_UNIQUE) {
+        console.log("alterUniqueKey()");
         if (IS_UNIQUE === true) {
             // ต้องโหลดใหม่ เพราะ กรณี ที่เพิ่ม column ใหม่ที่เป็น unique index แล้ว โค้ดก่อนหน้าจะเพิ่ม column เข้าเข้าไม่ก่อน
             // onetimeLoadColumnContent จะยังไม่มี ข้อมูล column ใหม่ ทำให้ไม่ยอม add unique key index ให้
@@ -167,6 +182,7 @@ class MyDBMigrator {
         }
     }
     async alterIndex(tableName, columnName, IS_INDEX) {
+        console.log("alterIndex()");
         const data = this.onetimeLoadColumnContent.find((row) => row.COLUMN_NAME === columnName && row.TABLE_NAME === tableName);
         if (data) {
             if ((data.COLUMN_KEY === "MUL" && !IS_INDEX) ||
@@ -180,13 +196,14 @@ class MyDBMigrator {
         }
     }
     async alterPossibleEnum(tableName, columnName, possibleValue, isNotNull) {
+        console.log("alterPossibleEnum()");
         if (!possibleValue)
             return null;
         const data = this.onetimeLoadColumnContent.find((row) => row.COLUMN_NAME === columnName && row.TABLE_NAME === tableName);
         const notNull = isNotNull ? "NOT NULL" : "";
         if (data) {
             let possibleValueString = possibleValue
-                .map((row) => `"${row}"`)
+                .map((row) => `'${row}'`)
                 .join(", ");
             try {
                 await this.MyDB.query(`ALTER TABLE ${tableName} MODIFY COLUMN ${columnName} ENUM(${possibleValueString}) ${notNull} ;`);

package/dist/src/myModel.d.ts

@@ -16,7 +16,8 @@ export interface columnContent {
     IS_INDEX?: boolean;
     IS_NOT_NULL?: boolean;
 }
-export interface compoisteUniqueColumn {
+export interface compoisteColumn {
+    type: "UNIQUE" | "INDEX";
     columnName: string[];
 }
 export interface MyModel {
@@ -24,7 +25,7 @@ export interface MyModel {
     tableName: string;
     columns: [...columnContent[]];
     meaning?: string;
-    compoisteUniqueColumn?: compoisteUniqueColumn[];
+    compoisteColumn?: compoisteColumn[];
 }
 export interface MyViewModel {
     viewName: string;

package/package.json

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

package/src/ModelGenerator/ModelGenerator.ts

@@ -11,6 +11,7 @@ export interface DatabaseConfigInterface {
   user: string
   password: string
   database: string
+  port: number
 }
 
 export default class ModelGenerator {
@@ -31,6 +32,7 @@ export default class ModelGenerator {
       host: this.dbInfo.host,
       user: this.dbInfo.user,
       password: this.dbInfo.password,
+      port: this.dbInfo.port,
     })
     this.isConnected = true
     await this.createDatabaseIfNotExist()

package/src/MyDBMigrator/MyDBMigrator.ts

@@ -46,10 +46,7 @@ export default class MyDBMigrator {
         )
         await this.alterForeignKey(row.tableName, col)
       }
-      await this.alterUniqueColumnCombination(
-        row.tableName,
-        row.compoisteUniqueColumn
-      )
+      await this.alterColumnCombination(row.tableName, row.compoisteColumn)
     }
     console.log("migrate table done")
   }
@@ -65,19 +62,24 @@ export default class MyDBMigrator {
     return data.length ? true : false
   }
 
-  private getCompositeUniqueName(
-    compositeUniqueColumn: Unarray<MyModel["compoisteUniqueColumn"]>
+  private getCompositeName(
+    compositeUniqueColumn: Unarray<MyModel["compoisteColumn"]>
   ) {
-    return `unique_${compositeUniqueColumn?.columnName.join("_")}`
+    if (compositeUniqueColumn?.type === "INDEX")
+      return `my_index_${compositeUniqueColumn?.columnName.join("_")}`
+    if (compositeUniqueColumn?.type === "UNIQUE")
+      return `my_unique_${compositeUniqueColumn?.columnName.join("_")}`
   }
   private async isCompositeUniqueColumnExist(
     tableName: string,
-    compositeUniqueColumn: Unarray<MyModel["compoisteUniqueColumn"]>
+    compositeColumn: Unarray<MyModel["compoisteColumn"]>
   ) {
-    const compositeUniqueName = this.getCompositeUniqueName(
-      compositeUniqueColumn
-    )
-    const sql = `SHOW INDEX FROM ${tableName} WHERE Non_unique = 0 AND Key_name like "${compositeUniqueName}"`
+    const compositeName = this.getCompositeName(compositeColumn)
+    let Non_unique
+    if (compositeColumn?.type === "INDEX") Non_unique = 1
+    else if (compositeColumn?.type === "UNIQUE") Non_unique = 0
+    const sql = `SHOW INDEX FROM ${tableName} WHERE Non_unique = ${Non_unique} AND Key_name like '${compositeName}'`
+
     const data = (await this.MyDB.query(sql)) as any[]
     // console.log("sql", sql)
     // console.log("isCompositeUniqueColumnExist", data.length, data)
@@ -88,6 +90,7 @@ export default class MyDBMigrator {
     tableName: string,
     col: Unarray<MyModel["columns"]>
   ) {
+    console.log("alterForeignKey()")
     if (col.FOREIGN_KEY) {
       for (const row of col.FOREIGN_KEY) {
         const CONSTRAINT =
@@ -111,26 +114,25 @@ export default class MyDBMigrator {
       }
     }
   }
-  private async alterUniqueColumnCombination(
+  private async alterColumnCombination(
     tableName: string,
-    uniqueColumnCombination: MyModel["compoisteUniqueColumn"]
+    uniqueColumnCombination: MyModel["compoisteColumn"]
   ) {
+    console.log("alterColumnCombination()")
     if (uniqueColumnCombination?.length) {
       for (let row of uniqueColumnCombination) {
         const isCompositeUniqueNameExist =
           await this.isCompositeUniqueColumnExist(tableName, row)
         // check is exist, then drop it first
+        const compositeName = this.getCompositeName(row)
         if (isCompositeUniqueNameExist) {
-          await this.MyDB.query(
-            `ALTER TABLE ${tableName} DROP INDEX ${this.getCompositeUniqueName(
-              row
-            )}`
-          )
+          const stmt = `ALTER TABLE ${tableName} DROP INDEX ${compositeName}`
+          await this.MyDB.query(stmt)
         }
-        const compositeUniqueName = this.getCompositeUniqueName(row)
+        const type = row.type === "UNIQUE" ? `${row.type} KEY` : "INDEX"
         const temp = row.columnName.join(",")
         await this.MyDB.query(
-          `ALTER TABLE ${tableName} ADD UNIQUE KEY ${compositeUniqueName} (${temp})`
+          `ALTER TABLE ${tableName} ADD ${type} ${compositeName} (${temp})`
         )
       }
     }
@@ -140,6 +142,7 @@ export default class MyDBMigrator {
     tableName: string,
     col: Unarray<MyModel["columns"]>
   ) {
+    console.log("alterDataType()")
     const AutoIncrement = col.AUTO_INCREMENT ? "AUTO_INCREMENT" : ""
     const columnDefault = col.COLUMN_DEFAULT
       ? `DEFAULT ${col.COLUMN_DEFAULT}`
@@ -172,6 +175,7 @@ export default class MyDBMigrator {
     tableName: string,
     col: Unarray<MyModel["columns"]>
   ) {
+    console.log("alterPrimaryKey()")
     if (col.COLUMN_NAME === "id" && col.AUTO_INCREMENT === true) {
       const isPrimaryKey = await this.checkIsPrimaryKey(
         this.MyDB.dbInfo.database,
@@ -243,6 +247,7 @@ export default class MyDBMigrator {
     columnName: string,
     IS_UNIQUE: boolean | undefined
   ) {
+    console.log("alterUniqueKey()")
     if (IS_UNIQUE === true) {
       // ต้องโหลดใหม่ เพราะ กรณี ที่เพิ่ม column ใหม่ที่เป็น unique index แล้ว โค้ดก่อนหน้าจะเพิ่ม column เข้าเข้าไม่ก่อน
       // onetimeLoadColumnContent จะยังไม่มี ข้อมูล column ใหม่ ทำให้ไม่ยอม add unique key index ให้
@@ -275,6 +280,7 @@ export default class MyDBMigrator {
     columnName: string,
     IS_INDEX: boolean | undefined
   ) {
+    console.log("alterIndex()")
     const data = this.onetimeLoadColumnContent.find(
       (row) => row.COLUMN_NAME === columnName && row.TABLE_NAME === tableName
     )
@@ -299,6 +305,7 @@ export default class MyDBMigrator {
     possibleValue?: string[],
     isNotNull?: boolean
   ) {
+    console.log("alterPossibleEnum()")
     if (!possibleValue) return null
     const data = this.onetimeLoadColumnContent.find(
       (row) => row.COLUMN_NAME === columnName && row.TABLE_NAME === tableName
@@ -306,7 +313,7 @@ export default class MyDBMigrator {
     const notNull = isNotNull ? "NOT NULL" : ""
     if (data) {
       let possibleValueString = possibleValue
-        .map((row) => `"${row}"`)
+        .map((row) => `'${row}'`)
         .join(", ")
 
       try {

package/src/myModel.ts

@@ -34,15 +34,17 @@ export interface columnContent {
   IS_NOT_NULL?: boolean
 }
 
-export interface compoisteUniqueColumn {
+export interface compoisteColumn {
+  type: "UNIQUE" | "INDEX"
   columnName: string[]
 }
+
 export interface MyModel {
   isSeed?: boolean
   tableName: string
   columns: [...columnContent[]]
   meaning?: string
-  compoisteUniqueColumn?: compoisteUniqueColumn[]
+  compoisteColumn?: compoisteColumn[]
 }
 export interface MyViewModel {
   viewName: string