gg-mysql-connector 1.0.78 → 1.0.81

package/app_INF.ts

@@ -8,6 +8,10 @@ export default interface app_INF  {  item : {
  user : {  
  id: number; 
  name: string; }
+ item__each_user : {  
+ id: number; 
+ itemId: number; 
+ userId: number; }
  test_view : {  
  id: number; 
  name: string; 

package/app_model_const.ts

@@ -7,7 +7,10 @@
  amount: "number", 
  userId: "number", }, user  : {  
  id: "number", 
- name: "string", }, test_view  : {  
+ name: "string", }, item__each_user  : {  
+ id: "number", 
+ itemId: "number", 
+ userId: "number", }, test_view  : {  
  id: "number", 
  name: "string", 
  itemName: ["pen" , "ruler" , "tiger"]  as  string[], }, item_view  : {  

package/dist/app_INF.d.ts

@@ -11,6 +11,11 @@ export default interface app_INF {
         id: number;
         name: string;
     };
+    item__each_user: {
+        id: number;
+        itemId: number;
+        userId: number;
+    };
     test_view: {
         id: number;
         name: string;

package/dist/app_model_const.d.ts

@@ -11,6 +11,11 @@ export declare const app_model_const: {
         readonly id: "number";
         readonly name: "string";
     };
+    readonly item__each_user: {
+        readonly id: "number";
+        readonly itemId: "number";
+        readonly userId: "number";
+    };
     readonly test_view: {
         readonly id: "number";
         readonly name: "string";

package/dist/app_model_const.js

@@ -11,6 +11,10 @@ exports.app_model_const = { item: {
     }, user: {
         id: "number",
         name: "string",
+    }, item__each_user: {
+        id: "number",
+        itemId: "number",
+        userId: "number",
     }, test_view: {
         id: "number",
         name: "string",

package/dist/src/ModelGenerator/ModelGenerator.js

@@ -9,6 +9,7 @@ const fs_1 = __importDefault(require("fs"));
 const promise_1 = __importDefault(require("mysql2/promise"));
 const path_1 = __importDefault(require("path"));
 const MyDBMigrator_1 = __importDefault(require("../MyDBMigrator/MyDBMigrator"));
+const convertDataType_1 = require("./convertDataType");
 class ModelGenerator {
     constructor(dbInfo, model) {
         this.printResultLength = (results, executionTime, queryResult) => {
@@ -42,10 +43,6 @@ class ModelGenerator {
         const migrator = new MyDBMigrator_1.default(this);
         await migrator.migrateTable(this.model);
     }
-    // async pushViewToDB(viewDirectory: string) {
-    //   const migrator = new MyDBMigrator(this)
-    //   await migrator.migrateView(viewDirectory)
-    // }
     async pushViewToDB_v2(viewModel) {
         const migrator = new MyDBMigrator_1.default(this);
         await migrator.migrateView_v2(viewModel);
@@ -178,7 +175,7 @@ class ModelGenerator {
                             stringOfRawColumnKeyAndValue = `${stringOfRawColumnKeyAndValue} \n ${cRow.COLUMN_NAME}: ${possibleValue.map((row) => `"${row}"`).join(" | ")};`;
                         }
                         else {
-                            stringOfRawColumnKeyAndValue = `${stringOfRawColumnKeyAndValue} \n ${cRow.COLUMN_NAME}: ${convertDataType(cRow.DATA_TYPE)};`;
+                            stringOfRawColumnKeyAndValue = `${stringOfRawColumnKeyAndValue} \n ${cRow.COLUMN_NAME}: ${(0, convertDataType_1.convertDataType)(cRow.DATA_TYPE)};`;
                         }
                     }
                     else {
@@ -272,7 +269,7 @@ class ModelGenerator {
                                 .join(" , ")}]  as  ${typeof possibleValue[0]}[],`;
                         }
                         else {
-                            value = `${value} \n ${cRow.COLUMN_NAME}: "${convertDataType(cRow.DATA_TYPE)}",`;
+                            value = `${value} \n ${cRow.COLUMN_NAME}: "${(0, convertDataType_1.convertDataType)(cRow.DATA_TYPE)}",`;
                         }
                     }
                     else {
@@ -297,25 +294,3 @@ class ModelGenerator {
     }
 }
 exports.default = ModelGenerator;
-function convertDataType(inputDataType) {
-    let result = "string";
-    if (inputDataType === "int") {
-        result = "number";
-    }
-    else if (inputDataType === "tinyint") {
-        result = "number";
-    }
-    else if (inputDataType === "bigint") {
-        result = "number";
-    }
-    else if (inputDataType === "date") {
-        result = "string";
-    }
-    else if (inputDataType === "float") {
-        result = "number";
-    }
-    else if (inputDataType === "double") {
-        result = "number";
-    }
-    return result;
-}

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

@@ -0,0 +1 @@
+export declare function convertDataType(inputDataType: string): "string" | "number";

package/dist/src/ModelGenerator/convertDataType.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertDataType = convertDataType;
+function convertDataType(inputDataType) {
+    let result = "string";
+    if (inputDataType === "int") {
+        result = "number";
+    }
+    else if (inputDataType === "tinyint") {
+        result = "number";
+    }
+    else if (inputDataType === "bigint") {
+        result = "number";
+    }
+    else if (inputDataType === "date") {
+        result = "string";
+    }
+    else if (inputDataType === "float") {
+        result = "number";
+    }
+    else if (inputDataType === "double") {
+        result = "number";
+    }
+    return result;
+}

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

@@ -13,16 +13,19 @@ export default class MyDBMigrator {
     constructor(connection: ModelGenerator);
     migrateTable(model: MyModel[]): Promise<void>;
     private isConstraintNameExist;
+    private getCompositeUniqueName;
+    private isCompositeUniqueColumnExist;
     private alterForeignKey;
+    private alterUniqueColumnCombination;
     private alterDataType;
     private alterPrimaryKey;
     private createTableIfNotExist;
     private columnInTableExist;
     private loadColumnContentIfEmpty;
     private checkIsColumnDataTypeChange;
-    alterUniqueKey(tableName: string, columnName: string, IS_UNIQUE: boolean | undefined): Promise<void>;
-    alterIndex(tableName: string, columnName: string, IS_INDEX: boolean | undefined): Promise<void>;
-    alterPossibleEnum(tableName: string, columnName: string, possibleValue?: string[]): Promise<null | undefined>;
+    private alterUniqueKey;
+    private alterIndex;
+    private alterPossibleEnum;
     migrateView_v2(viewModel: MyViewModel[]): Promise<void>;
-    checkIsPrimaryKey(databaseName: string, tableName: string, columnName: string): Promise<boolean>;
+    private checkIsPrimaryKey;
 }

package/dist/src/MyDBMigrator/MyDBMigrator.js

@@ -14,6 +14,7 @@ class MyDBMigrator {
         let index = 1;
         for (let row of data) {
             console.log(chalk_1.default.bgBlue(`${index}/${data.length}  ${row.tableName}`));
+            console.log(row);
             await this.createTableIfNotExist(row.tableName);
             this.onetimeLoadColumnContent = [];
             await this.loadColumnContentIfEmpty();
@@ -26,6 +27,7 @@ class MyDBMigrator {
                 await this.alterIndex(row.tableName, col.COLUMN_NAME, col.IS_INDEX);
                 await this.alterPossibleEnum(row.tableName, col.COLUMN_NAME, col.POSSIBLE_VALUE);
                 await this.alterForeignKey(row.tableName, col);
+                await this.alterUniqueColumnCombination(row.tableName, row.compoisteUniqueColumn);
             }
         }
         console.log("migrate table done");
@@ -39,13 +41,22 @@ 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("_")}`;
+    }
+    async isCompositeUniqueColumnExist(tableName, compositeUniqueColumn) {
+        const compositeUniqueName = this.getCompositeUniqueName(compositeUniqueColumn);
+        const sql = `SHOW INDEX FROM ${tableName} WHERE Non_unique = 0 AND Key_name like '${compositeUniqueName}'`;
+        const data = (await this.MyDB.query(sql));
+        return data.length ? true : false;
+    }
     async alterForeignKey(tableName, col) {
         if (col.FOREIGN_KEY) {
             for (const row of col.FOREIGN_KEY) {
                 const CONSTRAINT = `fk_${tableName}_${col.COLUMN_NAME}_${row.tableName}_${row.columnName}`;
                 const constraintExist = await this.isConstraintNameExist(CONSTRAINT);
                 if (constraintExist) {
-                    this.MyDB.query(`ALTER TABLE ${tableName} DROP FOREIGN KEY ${CONSTRAINT}`);
+                    await this.MyDB.query(`ALTER TABLE ${tableName} DROP FOREIGN KEY ${CONSTRAINT}`);
                 }
                 await this.MyDB
                     .query(`ALTER TABLE ${tableName} ADD CONSTRAINT ${CONSTRAINT} 
@@ -56,6 +67,20 @@ class MyDBMigrator {
             }
         }
     }
+    async alterUniqueColumnCombination(tableName, uniqueColumnCombination) {
+        if (uniqueColumnCombination === null || uniqueColumnCombination === void 0 ? void 0 : uniqueColumnCombination.length) {
+            uniqueColumnCombination.forEach(async (row) => {
+                const isCompositeUniqueNameExist = await this.isCompositeUniqueColumnExist(tableName, row);
+                // check is exist, then drop it first
+                if (isCompositeUniqueNameExist) {
+                    await this.MyDB.query(`ALTER TABLE ${tableName} DROP INDEX ${this.getCompositeUniqueName(row)}`);
+                }
+                const uniqueKeyName = `unique_${row.columnName.join("_")}`;
+                const temp = row.columnName.join(",");
+                await this.MyDB.query(`ALTER TABLE ${tableName} ADD UNIQUE KEY ${uniqueKeyName} (${temp})`);
+            });
+        }
+    }
     async alterDataType(tableName, col) {
         const AutoIncrement = col.AUTO_INCREMENT ? "AUTO_INCREMENT" : "";
         const columnDefault = col.COLUMN_DEFAULT

package/dist/src/myModel.d.ts

@@ -15,11 +15,15 @@ export interface columnContent {
     IS_UNIQUE?: boolean;
     IS_INDEX?: boolean;
 }
+export interface compoisteUniqueColumn {
+    columnName: string[];
+}
 export interface MyModel {
     isSeed?: boolean;
     tableName: string;
     columns: [...columnContent[]];
     meaning?: string;
+    compoisteUniqueColumn?: compoisteUniqueColumn[];
 }
 export interface MyViewModel {
     viewName: string;

package/package.json

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

package/src/ModelGenerator/ModelGenerator.ts

@@ -5,6 +5,7 @@ import mysql from "mysql2/promise"
 import path from "path"
 import MyDBMigrator from "../MyDBMigrator/MyDBMigrator"
 import { MyModel, MyViewModel } from "../myModel"
+import { convertDataType } from "./convertDataType"
 export interface DatabaseConfigInterface {
   host: string
   user: string
@@ -37,15 +38,10 @@ export default class ModelGenerator {
     await this.connection.query(`CREATE DATABASE IF NOT EXISTS ${databaseName}`)
     await this.connection.query(`USE ${databaseName}`)
   }
-
   async pushModelToDB() {
     const migrator = new MyDBMigrator(this)
     await migrator.migrateTable(this.model)
   }
-  // async pushViewToDB(viewDirectory: string) {
-  //   const migrator = new MyDBMigrator(this)
-  //   await migrator.migrateView(viewDirectory)
-  // }
   async pushViewToDB_v2(viewModel: MyViewModel[]) {
     const migrator = new MyDBMigrator(this)
     await migrator.migrateView_v2(viewModel)
@@ -388,21 +384,3 @@ export default class ModelGenerator {
     return code
   }
 }
-
-function convertDataType(inputDataType: string): "string" | "number" {
-  let result: "string" | "number" = "string"
-  if (inputDataType === "int") {
-    result = "number"
-  } else if (inputDataType === "tinyint") {
-    result = "number"
-  } else if (inputDataType === "bigint") {
-    result = "number"
-  } else if (inputDataType === "date") {
-    result = "string"
-  } else if (inputDataType === "float") {
-    result = "number"
-  } else if (inputDataType === "double") {
-    result = "number"
-  }
-  return result
-}

package/src/ModelGenerator/convertDataType.ts

@@ -0,0 +1,17 @@
+export function convertDataType(inputDataType: string): "string" | "number" {
+  let result: "string" | "number" = "string"
+  if (inputDataType === "int") {
+    result = "number"
+  } else if (inputDataType === "tinyint") {
+    result = "number"
+  } else if (inputDataType === "bigint") {
+    result = "number"
+  } else if (inputDataType === "date") {
+    result = "string"
+  } else if (inputDataType === "float") {
+    result = "number"
+  } else if (inputDataType === "double") {
+    result = "number"
+  }
+  return result
+}

package/src/MyDBMigrator/MyDBMigrator.ts

@@ -26,6 +26,7 @@ export default class MyDBMigrator {
     let index = 1
     for (let row of data) {
       console.log(chalk.bgBlue(`${index}/${data.length}  ${row.tableName}`))
+      console.log(row)
       await this.createTableIfNotExist(row.tableName)
       this.onetimeLoadColumnContent = []
       await this.loadColumnContentIfEmpty()
@@ -43,6 +44,10 @@ export default class MyDBMigrator {
           col.POSSIBLE_VALUE
         )
         await this.alterForeignKey(row.tableName, col)
+        await this.alterUniqueColumnCombination(
+          row.tableName,
+          row.compoisteUniqueColumn
+        )
       }
     }
     console.log("migrate table done")
@@ -59,6 +64,23 @@ export default class MyDBMigrator {
     return data.length ? true : false
   }
 
+  private getCompositeUniqueName(
+    compositeUniqueColumn: Unarray<MyModel["compoisteUniqueColumn"]>
+  ) {
+    return `unique_${compositeUniqueColumn?.columnName.join("_")}`
+  }
+  private async isCompositeUniqueColumnExist(
+    tableName: string,
+    compositeUniqueColumn: Unarray<MyModel["compoisteUniqueColumn"]>
+  ) {
+    const compositeUniqueName = this.getCompositeUniqueName(
+      compositeUniqueColumn
+    )
+    const sql = `SHOW INDEX FROM ${tableName} WHERE Non_unique = 0 AND Key_name like '${compositeUniqueName}'`
+    const data = (await this.MyDB.query(sql)) as any[]
+    return data.length ? true : false
+  }
+
   private async alterForeignKey(
     tableName: string,
     col: Unarray<MyModel["columns"]>
@@ -69,7 +91,7 @@ export default class MyDBMigrator {
 
         const constraintExist = await this.isConstraintNameExist(CONSTRAINT)
         if (constraintExist) {
-          this.MyDB.query(
+          await this.MyDB.query(
             `ALTER TABLE ${tableName} DROP FOREIGN KEY ${CONSTRAINT}`
           )
         }
@@ -82,6 +104,30 @@ export default class MyDBMigrator {
       }
     }
   }
+  private async alterUniqueColumnCombination(
+    tableName: string,
+    uniqueColumnCombination: MyModel["compoisteUniqueColumn"]
+  ) {
+    if (uniqueColumnCombination?.length) {
+      uniqueColumnCombination.forEach(async (row) => {
+        const isCompositeUniqueNameExist =
+          await this.isCompositeUniqueColumnExist(tableName, row)
+        // check is exist, then drop it first
+        if (isCompositeUniqueNameExist) {
+          await this.MyDB.query(
+            `ALTER TABLE ${tableName} DROP INDEX ${this.getCompositeUniqueName(
+              row
+            )}`
+          )
+        }
+        const uniqueKeyName = `unique_${row.columnName.join("_")}`
+        const temp = row.columnName.join(",")
+        await this.MyDB.query(
+          `ALTER TABLE ${tableName} ADD UNIQUE KEY ${uniqueKeyName} (${temp})`
+        )
+      })
+    }
+  }
 
   private async alterDataType(
     tableName: string,
@@ -184,7 +230,7 @@ export default class MyDBMigrator {
       return true
     }
   }
-  async alterUniqueKey(
+  private async alterUniqueKey(
     tableName: string,
     columnName: string,
     IS_UNIQUE: boolean | undefined
@@ -210,7 +256,7 @@ export default class MyDBMigrator {
     }
   }
 
-  async alterIndex(
+  private async alterIndex(
     tableName: string,
     columnName: string,
     IS_INDEX: boolean | undefined
@@ -233,7 +279,7 @@ export default class MyDBMigrator {
     }
   }
 
-  async alterPossibleEnum(
+  private async alterPossibleEnum(
     tableName: string,
     columnName: string,
     possibleValue?: string[]
@@ -273,7 +319,7 @@ export default class MyDBMigrator {
     }
   }
 
-  async migrateView_v2(viewModel: MyViewModel[]) {
+  public async migrateView_v2(viewModel: MyViewModel[]) {
     let unSuccessUpdateViewList: MyViewModel[] = viewModel
     let loopCount = 0
     while (unSuccessUpdateViewList.length > 0) {
@@ -306,7 +352,7 @@ export default class MyDBMigrator {
     }
   }
 
-  async checkIsPrimaryKey(
+  private async checkIsPrimaryKey(
     databaseName: string,
     tableName: string,
     columnName: string

package/src/myModel.ts

@@ -32,11 +32,16 @@ export interface columnContent {
   IS_UNIQUE?: boolean
   IS_INDEX?: boolean
 }
+
+export interface compoisteUniqueColumn {
+  columnName: string[]
+}
 export interface MyModel {
   isSeed?: boolean
   tableName: string
   columns: [...columnContent[]]
   meaning?: string
+  compoisteUniqueColumn?: compoisteUniqueColumn[]
 }
 export interface MyViewModel {
   viewName: string