gg-mysql-connector 1.0.64 → 1.0.72

package/app_INF.ts

@@ -3,7 +3,8 @@ export default interface app_INF  {  item : {
  name: "pen" | "ruler" | "tiger"; 
  price: number; 
  description: string; 
- amount: number; }
+ amount: number; 
+ userId: number; }
  user : {  
  id: number; 
  name: string; }

package/app_model_const.ts

@@ -4,7 +4,8 @@
  name: ["pen" , "ruler" , "tiger"]  as  string[], 
  price: "number", 
  description: "string", 
- amount: "number", }, user  : {  
+ amount: "number", 
+ userId: "number", }, user  : {  
  id: "number", 
  name: "string", }, test_view  : {  
  id: "number", 

package/dist/app_INF.d.ts

@@ -5,6 +5,7 @@ export default interface app_INF {
         price: number;
         description: string;
         amount: number;
+        userId: number;
     };
     user: {
         id: number;

package/dist/app_model_const.d.ts

@@ -5,6 +5,7 @@ export declare const app_model_const: {
         readonly price: "number";
         readonly description: "string";
         readonly amount: "number";
+        readonly userId: "number";
     };
     readonly user: {
         readonly id: "number";

package/dist/app_model_const.js

@@ -7,6 +7,7 @@ exports.app_model_const = { item: {
         price: "number",
         description: "string",
         amount: "number",
+        userId: "number",
     }, user: {
         id: "number",
         name: "string",

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

@@ -15,7 +15,6 @@ export default class ModelGenerator {
     init(): Promise<void>;
     private createDatabaseIfNotExist;
     pushModelToDB(): Promise<void>;
-    pushViewToDB(viewDirectory: string): Promise<void>;
     pushViewToDB_v2(viewModel: MyViewModel[]): Promise<void>;
     waitUntilInitSuccess(interval: number): true | Promise<unknown>;
     query<T>(statment: string, parameter?: any[], isPrint?: boolean): Promise<T>;

package/dist/src/ModelGenerator/ModelGenerator.js

@@ -42,10 +42,10 @@ class ModelGenerator {
         const migrator = new MyDBMigrator_1.default(this);
         await migrator.migrateTable(this.model);
     }
-    async pushViewToDB(viewDirectory) {
-        const migrator = new MyDBMigrator_1.default(this);
-        await migrator.migrateView(viewDirectory);
-    }
+    // 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);

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

@@ -12,6 +12,10 @@ export default class MyDBMigrator {
     }[];
     constructor(connection: ModelGenerator);
     migrateTable(model: MyModel[]): Promise<void>;
+    private isConstraintNameExist;
+    private alterForeignKey;
+    private alterDataType;
+    private alterPrimaryKey;
     private createTableIfNotExist;
     private columnInTableExist;
     private loadColumnContentIfEmpty;
@@ -19,7 +23,6 @@ export default class MyDBMigrator {
     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>;
-    migrateView(viewDirectory: string): Promise<0 | undefined>;
     migrateView_v2(viewModel: MyViewModel[]): Promise<void>;
     checkIsPrimaryKey(databaseName: string, tableName: string, columnName: string): Promise<boolean>;
 }

package/dist/src/MyDBMigrator/MyDBMigrator.js

@@ -4,8 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 class MyDBMigrator {
     constructor(connection) {
         this.MyDB = connection;
@@ -22,32 +20,65 @@ class MyDBMigrator {
             index++;
             for (let col of row.columns) {
                 console.log(`${row.tableName} (${col.DATA_TYPE}) - ${col.COLUMN_NAME} `);
-                if (col.COLUMN_NAME === "id" && col.AUTO_INCREMENT === true) {
-                    const isPrimaryKey = await this.checkIsPrimaryKey(this.MyDB.dbInfo.database, row.tableName, col.COLUMN_NAME);
-                    if (isPrimaryKey === false)
-                        await this.MyDB.query(`ALTER TABLE ${row.tableName} ADD PRIMARY KEY(id);`);
-                }
-                const AutoIncrement = col.AUTO_INCREMENT ? "AUTO_INCREMENT" : "";
-                const columnDefault = col.COLUMN_DEFAULT
-                    ? `DEFAULT ${col.COLUMN_DEFAULT}`
-                    : "";
-                const isColumnChange = await this.checkIsColumnDataTypeChange(row.tableName, col.COLUMN_NAME, col.DATA_TYPE, col.COLUMN_DEFAULT);
-                if (isColumnChange) {
-                    const isColumnExist = await this.columnInTableExist(row.tableName, col.COLUMN_NAME);
-                    if (!isColumnExist) {
-                        await this.MyDB.query(`ALTER TABLE ${row.tableName} ADD COLUMN ${col.COLUMN_NAME} ${col.DATA_TYPE} ${AutoIncrement} ${columnDefault}`);
-                    }
-                    else {
-                        await this.MyDB.query(`ALTER TABLE ${row.tableName} MODIFY COLUMN ${col.COLUMN_NAME} ${col.DATA_TYPE} ${AutoIncrement} ${columnDefault}`);
-                    }
-                }
+                await this.alterPrimaryKey(row.tableName, col);
+                await this.alterDataType(row.tableName, col);
                 await this.alterUniqueKey(row.tableName, col.COLUMN_NAME, col.IS_UNIQUE);
                 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);
             }
         }
         console.log("migrate table done");
     }
+    async isConstraintNameExist(constraintName) {
+        const sql = `
+    SELECT CONSTRAINT_NAME 
+    FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE 
+    WHERE CONSTRAINT_NAME = '${constraintName}' AND TABLE_SCHEMA = '${this.MyDB.dbInfo.database}'
+`;
+        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} ADD CONSTRAINT ${CONSTRAINT} 
+                      FOREIGN KEY (${col.COLUMN_NAME}) 
+                      REFERENCES ${row.tableName}(${row.columnName}) 
+                      ON DELETE ${row.ON_DELETE}
+                      ON UPDATE ${row.ON_UPDATE}`);
+            }
+        }
+    }
+    async alterDataType(tableName, col) {
+        const AutoIncrement = col.AUTO_INCREMENT ? "AUTO_INCREMENT" : "";
+        const columnDefault = col.COLUMN_DEFAULT
+            ? `DEFAULT ${col.COLUMN_DEFAULT}`
+            : "";
+        const isColumnChange = await this.checkIsColumnDataTypeChange(tableName, col.COLUMN_NAME, col.DATA_TYPE, col.COLUMN_DEFAULT);
+        if (isColumnChange) {
+            const isColumnExist = await this.columnInTableExist(tableName, col.COLUMN_NAME);
+            if (!isColumnExist) {
+                await this.MyDB.query(`ALTER TABLE ${tableName} ADD COLUMN ${col.COLUMN_NAME} ${col.DATA_TYPE} ${AutoIncrement} ${columnDefault}`);
+            }
+            else {
+                await this.MyDB.query(`ALTER TABLE ${tableName} MODIFY COLUMN ${col.COLUMN_NAME} ${col.DATA_TYPE} ${AutoIncrement} ${columnDefault}`);
+            }
+        }
+    }
+    async alterPrimaryKey(tableName, col) {
+        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)
+                await this.MyDB.query(`ALTER TABLE ${tableName} ADD PRIMARY KEY(id);`);
+        }
+    }
     async createTableIfNotExist(tableName) {
         await this.MyDB.query(`CREATE TABLE IF NOT EXISTS ${tableName} (id INT(11) AUTO_INCREMENT PRIMARY KEY)`);
     }
@@ -96,7 +127,7 @@ class MyDBMigrator {
                     await this.MyDB.query(`ALTER TABLE ${tableName} ADD UNIQUE (${columnName});`);
                 }
                 else {
-                    await this.MyDB.query(`ALTER TABLE ${tableName} DROP INDEX ${columnName};`);
+                    await this.MyDB.query(`ALTER TABLE ${tableName} DROP UNIQUE ${columnName};`);
                 }
         }
     }
@@ -133,32 +164,6 @@ class MyDBMigrator {
             }
         }
     }
-    async migrateView(viewDirectory) {
-        if (!fs_1.default.existsSync(viewDirectory)) {
-            return 0;
-        }
-        let fileList = (await fs_1.default.readdirSync(path_1.default.join(viewDirectory)));
-        let unSuccessUpdateViewList = fileList;
-        let loopCount = 0;
-        while (unSuccessUpdateViewList.length > 0) {
-            for (const viewFileName of unSuccessUpdateViewList) {
-                const filePath = path_1.default.join(viewDirectory, viewFileName);
-                const content = fs_1.default.readFileSync(filePath, "utf8");
-                process.stdout.write(`loop : ${loopCount} unUpdate : ${unSuccessUpdateViewList.length} update view ${viewFileName}`);
-                await this.MyDB.query(content)
-                    .then((result) => {
-                    process.stdout.write(" " + chalk_1.default.bgGreen(`success`));
-                    unSuccessUpdateViewList = unSuccessUpdateViewList.filter((row) => row !== viewFileName);
-                })
-                    .catch((_error) => {
-                    process.stdout.write(" " + chalk_1.default.bgRed(`fail`));
-                })
-                    .finally(() => {
-                    console.log("");
-                });
-            }
-        }
-    }
     async migrateView_v2(viewModel) {
         let unSuccessUpdateViewList = viewModel;
         let loopCount = 0;

package/dist/src/myModel.d.ts

@@ -6,6 +6,12 @@ export interface columnContent {
     COLUMN_DEFAULT?: string | number | null;
     AUTO_INCREMENT?: boolean;
     POSSIBLE_VALUE?: string[];
+    FOREIGN_KEY?: {
+        tableName: string;
+        columnName: string;
+        ON_UPDATE: "CASCADE" | "SET NULL" | "RESTRICT";
+        ON_DELETE: "CASCADE" | "SET NULL" | "RESTRICT";
+    }[];
     IS_UNIQUE?: boolean;
     IS_INDEX?: boolean;
 }

package/package.json

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

package/src/ModelGenerator/ModelGenerator.ts

@@ -42,10 +42,10 @@ export default class ModelGenerator {
     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(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)

package/src/MyDBMigrator/MyDBMigrator.ts

@@ -1,9 +1,8 @@
 import chalk from "chalk"
-import fs from "fs"
-import path from "path"
+import { Unarray } from "../GGMySQLConnector/GGMySQLConnector"
 import ModelGenerator from "../ModelGenerator/ModelGenerator"
 import { columnType, MyModel, MyViewModel } from "../myModel"
-
+import sql from "sql-template-strings"
 export default class MyDBMigrator {
   MyDB: ModelGenerator
   onetimeLoadColumnContent: {
@@ -34,44 +33,8 @@ export default class MyDBMigrator {
 
       for (let col of row.columns) {
         console.log(`${row.tableName} (${col.DATA_TYPE}) - ${col.COLUMN_NAME} `)
-
-        if (col.COLUMN_NAME === "id" && col.AUTO_INCREMENT === true) {
-          const isPrimaryKey = await this.checkIsPrimaryKey(
-            this.MyDB.dbInfo.database,
-            row.tableName,
-            col.COLUMN_NAME
-          )
-          if (isPrimaryKey === false)
-            await this.MyDB.query(
-              `ALTER TABLE ${row.tableName} ADD PRIMARY KEY(id);`
-            )
-        }
-
-        const AutoIncrement = col.AUTO_INCREMENT ? "AUTO_INCREMENT" : ""
-        const columnDefault = col.COLUMN_DEFAULT
-          ? `DEFAULT ${col.COLUMN_DEFAULT}`
-          : ""
-        const isColumnChange = await this.checkIsColumnDataTypeChange(
-          row.tableName,
-          col.COLUMN_NAME,
-          col.DATA_TYPE,
-          col.COLUMN_DEFAULT
-        )
-        if (isColumnChange) {
-          const isColumnExist = await this.columnInTableExist(
-            row.tableName,
-            col.COLUMN_NAME
-          )
-          if (!isColumnExist) {
-            await this.MyDB.query(
-              `ALTER TABLE ${row.tableName} ADD COLUMN ${col.COLUMN_NAME} ${col.DATA_TYPE} ${AutoIncrement} ${columnDefault}`
-            )
-          } else {
-            await this.MyDB.query(
-              `ALTER TABLE ${row.tableName} MODIFY COLUMN ${col.COLUMN_NAME} ${col.DATA_TYPE} ${AutoIncrement} ${columnDefault}`
-            )
-          }
-        }
+        await this.alterPrimaryKey(row.tableName, col)
+        await this.alterDataType(row.tableName, col)
         await this.alterUniqueKey(row.tableName, col.COLUMN_NAME, col.IS_UNIQUE)
         await this.alterIndex(row.tableName, col.COLUMN_NAME, col.IS_INDEX)
         await this.alterPossibleEnum(
@@ -79,11 +42,93 @@ export default class MyDBMigrator {
           col.COLUMN_NAME,
           col.POSSIBLE_VALUE
         )
+        await this.alterForeignKey(row.tableName, col)
       }
     }
     console.log("migrate table done")
   }
 
+  private async isConstraintNameExist(constraintName: string) {
+    const sql = `
+    SELECT CONSTRAINT_NAME 
+    FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE 
+    WHERE CONSTRAINT_NAME = '${constraintName}' AND TABLE_SCHEMA = '${this.MyDB.dbInfo.database}'
+`
+
+    const data = (await this.MyDB.query(sql)) as any[]
+    return data.length ? true : false
+  }
+
+  private async alterForeignKey(
+    tableName: string,
+    col: Unarray<MyModel["columns"]>
+  ) {
+    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} ADD CONSTRAINT ${CONSTRAINT} 
+                      FOREIGN KEY (${col.COLUMN_NAME}) 
+                      REFERENCES ${row.tableName}(${row.columnName}) 
+                      ON DELETE ${row.ON_DELETE}
+                      ON UPDATE ${row.ON_UPDATE}`)
+      }
+    }
+  }
+
+  private async alterDataType(
+    tableName: string,
+    col: Unarray<MyModel["columns"]>
+  ) {
+    const AutoIncrement = col.AUTO_INCREMENT ? "AUTO_INCREMENT" : ""
+    const columnDefault = col.COLUMN_DEFAULT
+      ? `DEFAULT ${col.COLUMN_DEFAULT}`
+      : ""
+    const isColumnChange = await this.checkIsColumnDataTypeChange(
+      tableName,
+      col.COLUMN_NAME,
+      col.DATA_TYPE,
+      col.COLUMN_DEFAULT
+    )
+    if (isColumnChange) {
+      const isColumnExist = await this.columnInTableExist(
+        tableName,
+        col.COLUMN_NAME
+      )
+      if (!isColumnExist) {
+        await this.MyDB.query(
+          `ALTER TABLE ${tableName} ADD COLUMN ${col.COLUMN_NAME} ${col.DATA_TYPE} ${AutoIncrement} ${columnDefault}`
+        )
+      } else {
+        await this.MyDB.query(
+          `ALTER TABLE ${tableName} MODIFY COLUMN ${col.COLUMN_NAME} ${col.DATA_TYPE} ${AutoIncrement} ${columnDefault}`
+        )
+      }
+    }
+  }
+
+  private async alterPrimaryKey(
+    tableName: string,
+    col: Unarray<MyModel["columns"]>
+  ) {
+    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)
+        await this.MyDB.query(`ALTER TABLE ${tableName} ADD PRIMARY KEY(id);`)
+    }
+  }
+
   private async createTableIfNotExist(tableName: string) {
     await this.MyDB.query(
       `CREATE TABLE IF NOT EXISTS ${tableName} (id INT(11) AUTO_INCREMENT PRIMARY KEY)`
@@ -158,7 +203,7 @@ export default class MyDBMigrator {
           )
         } else {
           await this.MyDB.query(
-            `ALTER TABLE ${tableName} DROP INDEX ${columnName};`
+            `ALTER TABLE ${tableName} DROP UNIQUE ${columnName};`
           )
         }
     }
@@ -227,39 +272,6 @@ export default class MyDBMigrator {
     }
   }
 
-  async migrateView(viewDirectory: string) {
-    if (!fs.existsSync(viewDirectory)) {
-      return 0
-    }
-    let fileList: string[] = (await fs.readdirSync(
-      path.join(viewDirectory)
-    )) as string[]
-    let unSuccessUpdateViewList: string[] = fileList
-    let loopCount = 0
-    while (unSuccessUpdateViewList.length > 0) {
-      for (const viewFileName of unSuccessUpdateViewList) {
-        const filePath = path.join(viewDirectory, viewFileName)
-        const content = fs.readFileSync(filePath, "utf8")
-        process.stdout.write(
-          `loop : ${loopCount} unUpdate : ${unSuccessUpdateViewList.length} update view ${viewFileName}`
-        )
-        await this.MyDB.query(content)
-          .then((result) => {
-            process.stdout.write(" " + chalk.bgGreen(`success`))
-            unSuccessUpdateViewList = unSuccessUpdateViewList.filter(
-              (row) => row !== viewFileName
-            )
-          })
-          .catch((_error) => {
-            process.stdout.write(" " + chalk.bgRed(`fail`))
-          })
-          .finally(() => {
-            console.log("")
-          })
-      }
-    }
-  }
-
   async migrateView_v2(viewModel: MyViewModel[]) {
     let unSuccessUpdateViewList: MyViewModel[] = viewModel
     let loopCount = 0

package/src/myModel.ts

@@ -23,6 +23,12 @@ export interface columnContent {
   COLUMN_DEFAULT?: string | number | null
   AUTO_INCREMENT?: boolean
   POSSIBLE_VALUE?: string[]
+  FOREIGN_KEY?: {
+    tableName: string
+    columnName: string
+    ON_UPDATE: "CASCADE" | "SET NULL" | "RESTRICT"
+    ON_DELETE: "CASCADE" | "SET NULL" | "RESTRICT"
+  }[]
   IS_UNIQUE?: boolean
   IS_INDEX?: boolean
 }