gg-mysql-connector 1.0.122 → 1.0.126

package/dist/src/GGMySQLConnector/GGMySQLConnector.js

@@ -37,7 +37,9 @@ class GGMySQLConnector {
      */
     async selectByDateRange(tableName, params) {
         const { columnName, endDate, startDate } = params;
-        const result = (await this.query(`SELECT * FROM ${tableName} WHERE  ? <= ? AND ? <= ?`, [startDate, columnName, columnName, endDate], false));
+        const result = (await this.query(
+        //@ts-ignore
+        `SELECT * FROM ${tableName} WHERE ? <= ${columnName} AND ${columnName} <= ?`, [startDate, endDate], false));
         return result;
     }
     async createDatabaseIfNotExist(tempConnection) {

package/dist/src/ModelGenerator/ModelGenerator.js

@@ -137,7 +137,9 @@ class ModelGenerator {
         if (foundTable) {
             const foundColumn = foundTable["columns"].find((row) => row.COLUMN_NAME === columnName);
             // find in possible value in table model first
-            if (foundColumn && foundColumn.POSSIBLE_VALUE) {
+            if (foundColumn &&
+                foundColumn.DATA_TYPE === "enum" &&
+                foundColumn.POSSIBLE_VALUE) {
                 return foundColumn.POSSIBLE_VALUE;
             }
             else {

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

@@ -26,7 +26,6 @@ export default class MyDBMigrator {
     private checkIsColumnDataTypeChange;
     private alterUniqueKey;
     private alterIndex;
-    private deleteOldIndexVersion;
     private alterPossibleEnum;
     migrateView_v2(viewModel: MyViewModel[]): Promise<void>;
     private checkIsPrimaryKey;

package/dist/src/MyDBMigrator/MyDBMigrator.js

@@ -13,12 +13,11 @@ 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}`));
-            console.log(row);
             await this.createTableIfNotExist(row.tableName);
-            this.onetimeLoadColumnContent = [];
-            await this.loadColumnContentIfEmpty();
             index++;
             const indexList = (await this.MyDB.query(`SHOW INDEX FROM ${row.tableName}`));
             for (let col of row.columns) {
@@ -27,7 +26,8 @@ class MyDBMigrator {
                 await this.alterDataType(row.tableName, col);
                 await this.alterUniqueKey(row.tableName, col.COLUMN_NAME, col.IS_UNIQUE, indexList);
                 await this.alterIndex(row.tableName, col.COLUMN_NAME, col.IS_INDEX, indexList);
-                await this.alterPossibleEnum(row.tableName, col.COLUMN_NAME, col.POSSIBLE_VALUE, col.IS_NOT_NULL);
+                if (col.DATA_TYPE === "enum")
+                    await this.alterPossibleEnum(row.tableName, col.COLUMN_NAME, col.POSSIBLE_VALUE, col.IS_NOT_NULL);
                 await this.alterForeignKey(row.tableName, col);
             }
             await this.alterColumnCombination(row.tableName, row.compoisteColumn);
@@ -68,7 +68,7 @@ class MyDBMigrator {
         return data.length ? true : false;
     }
     async alterForeignKey(tableName, col) {
-        console.log("alterForeignKey()");
+        // 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);
@@ -104,7 +104,9 @@ class MyDBMigrator {
         }
     }
     async alterDataType(tableName, col) {
-        console.log("alterDataType()");
+        if (col.DATA_TYPE === "enum")
+            return null;
+        // console.log("alterDataType()")
         const AutoIncrement = col.AUTO_INCREMENT ? "AUTO_INCREMENT" : "";
         const columnDefault = col.COLUMN_DEFAULT
             ? `DEFAULT ${col.COLUMN_DEFAULT}`
@@ -122,15 +124,20 @@ class MyDBMigrator {
         }
     }
     async alterPrimaryKey(tableName, col) {
-        console.log("alterPrimaryKey()");
+        // 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)
+            const isPrimaryKey = await this.checkIsPrimaryKey(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);`);
         }
     }
     async createTableIfNotExist(tableName) {
-        await this.MyDB.query(`CREATE TABLE IF NOT EXISTS ${tableName} (id INT(11) AUTO_INCREMENT PRIMARY KEY)`);
+        const foundTable = this.onetimeLoadColumnContent.find((row) => row.TABLE_NAME === tableName);
+        if (!foundTable) {
+            await this.MyDB.query(`CREATE TABLE IF NOT EXISTS ${tableName} (id INT(11) AUTO_INCREMENT PRIMARY KEY)`);
+            this.loadColumnContentIfEmpty();
+        }
     }
     async columnInTableExist(tableName, columnName) {
         await this.loadColumnContentIfEmpty();
@@ -156,6 +163,11 @@ class MyDBMigrator {
             if (temp[0].DATA_TYPE !== dataType) {
                 console.log(chalk_1.default.green `${temp[0].DATA_TYPE} change to ${dataType}`);
                 return true;
+                // if (temp[0].DATA_TYPE === "enum") {
+                //   return true
+                // } else {
+                //   return true
+                // }
             }
             if (temp[0].COLUMN_DEFAULT !== columnDefault) {
                 console.log(chalk_1.default.green `${temp[0].COLUMN_DEFAULT} change to ${columnDefault}`);
@@ -184,7 +196,7 @@ class MyDBMigrator {
         }
     }
     async alterIndex(tableName, columnName, IS_INDEX, indexList) {
-        console.log("alterIndex()");
+        // console.log("alterIndex()")
         const isIndex = Boolean(IS_INDEX);
         const indexIndexName = `${columnName}_index`;
         const isFound = indexList.find((iRow) => iRow.Key_name === indexIndexName)
@@ -195,25 +207,18 @@ class MyDBMigrator {
         else if (isIndex === false && isFound === true)
             await this.MyDB.query(`DROP INDEX ${indexIndexName} ON ${tableName};`);
     }
-    async deleteOldIndexVersion(tableName, columnName, indexList) {
-        console.log("deleteOldIndexVersion()");
-        const indexIndexName = `${columnName}`;
-        const isFound = indexList.find((iRow) => iRow.Key_name === indexIndexName)
-            ? true
-            : false;
-        if (isFound === true)
-            await this.MyDB.query(`DROP INDEX ${indexIndexName} ON ${tableName};`);
-    }
     async alterPossibleEnum(tableName, columnName, possibleValue, isNotNull) {
-        console.log("alterPossibleEnum()");
+        // console.log("alterPossibleEnum()")
         if (!possibleValue)
             return null;
         const data = this.onetimeLoadColumnContent.find((row) => row.COLUMN_NAME === columnName && row.TABLE_NAME === tableName);
+        const possibleValueString = possibleValue.map((row) => `'${row}'`).join(",");
+        const enumType = `enum(${possibleValueString})`;
+        // console.log("enum ->", data?.COLUMN_TYPE)
+        // console.log("enumType ->", enumType)
         const notNull = isNotNull ? "NOT NULL" : "";
-        if (data) {
-            let possibleValueString = possibleValue
-                .map((row) => `'${row}'`)
-                .join(", ");
+        if (data && enumType !== data.COLUMN_TYPE) {
+            // console.log(chalk.red("alter enum"))
             try {
                 await this.MyDB.query(`ALTER TABLE ${tableName} MODIFY COLUMN ${columnName} ENUM(${possibleValueString}) ${notNull} ;`);
             }
@@ -261,15 +266,15 @@ class MyDBMigrator {
             loopCount++;
         }
     }
-    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("result", result);
-        if (result.length) {
-            if (result[0].COLUMN_KEY === "PRI")
+    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")
                 return true;
             else
                 return false;

package/dist/src/myModel.d.ts

@@ -1,11 +1,19 @@
 import { SQLStatement } from "sql-template-strings";
-export type columnType = "int" | "tinyint" | "float" | "double" | "text" | "varchar(8)" | "varchar(16)" | "varchar(32)" | "varchar(64)" | "varchar(128)" | "varchar(256)" | "varchar(512)" | "longtext" | "date" | "time" | "datetime";
-export interface columnContent {
+export type columnType = "int" | "tinyint" | "float" | "double" | "text" | "varchar(8)" | "varchar(16)" | "varchar(32)" | "varchar(64)" | "varchar(128)" | "varchar(256)" | "varchar(512)" | "longtext" | "date" | "time" | "datetime" | "enum";
+type ColumnTypeMap = {
+    [K in Exclude<columnType, "enum">]: BaseColumn & {
+        DATA_TYPE: K;
+    };
+} & {
+    enum: BaseColumn & {
+        DATA_TYPE: "enum";
+        POSSIBLE_VALUE: string[];
+    };
+};
+type BaseColumn = {
     COLUMN_NAME: string;
-    DATA_TYPE: columnType;
     COLUMN_DEFAULT?: string | number | null;
     AUTO_INCREMENT?: boolean;
-    POSSIBLE_VALUE?: string[];
     FOREIGN_KEY?: {
         tableName: string;
         columnName: string;
@@ -15,7 +23,9 @@ export interface columnContent {
     IS_UNIQUE?: boolean;
     IS_INDEX?: boolean;
     IS_NOT_NULL?: boolean;
-}
+};
+export type ColumnContent = ColumnTypeMap[keyof ColumnTypeMap];
+export type columnContent = ColumnContent;
 export interface compoisteColumn {
     type: "UNIQUE" | "INDEX";
     columnName: string[];
@@ -31,3 +41,4 @@ export interface MyViewModel {
     viewName: string;
     sqlStatement: string | SQLStatement;
 }
+export {};

package/package.json

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

package/src/GGMySQLConnector/GGMySQLConnector.ts

@@ -100,9 +100,11 @@ export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
     }
   ): Promise<Main[T][]> {
     const { columnName, endDate, startDate } = params
+
     const result = (await this.query(
-      `SELECT * FROM ${tableName} WHERE  ? <= ? AND ? <= ?`,
-      [startDate, columnName, columnName, endDate],
+      //@ts-ignore
+      `SELECT * FROM ${tableName} WHERE ? <= ${columnName} AND ${columnName} <= ?`,
+      [startDate, endDate],
       false
     )) as Main[T][]
     return result

package/src/ModelGenerator/ModelGenerator.ts

@@ -187,7 +187,11 @@ export default class ModelGenerator {
         (row) => row.COLUMN_NAME === columnName
       )
       // find in possible value in table model first
-      if (foundColumn && foundColumn.POSSIBLE_VALUE) {
+      if (
+        foundColumn &&
+        foundColumn.DATA_TYPE === "enum" &&
+        foundColumn.POSSIBLE_VALUE
+      ) {
         return foundColumn.POSSIBLE_VALUE
       } else {
         return false

package/src/MyDBMigrator/MyDBMigrator.ts

@@ -3,6 +3,7 @@ import { Unarray } from "../GGMySQLConnector/GGMySQLConnector"
 import ModelGenerator from "../ModelGenerator/ModelGenerator"
 import { columnType, MyModel, MyViewModel } from "../myModel"
 import sql from "sql-template-strings"
+import { table } from "console"
 export default class MyDBMigrator {
   MyDB: ModelGenerator
   onetimeLoadColumnContent: {
@@ -27,12 +28,12 @@ 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}`))
-      console.log(row)
       await this.createTableIfNotExist(row.tableName)
-      this.onetimeLoadColumnContent = []
-      await this.loadColumnContentIfEmpty()
+
       index++
 
       const indexList = (await this.MyDB.query(
@@ -55,13 +56,13 @@ export default class MyDBMigrator {
           col.IS_INDEX,
           indexList
         )
-
-        await this.alterPossibleEnum(
-          row.tableName,
-          col.COLUMN_NAME,
-          col.POSSIBLE_VALUE,
-          col.IS_NOT_NULL
-        )
+        if (col.DATA_TYPE === "enum")
+          await this.alterPossibleEnum(
+            row.tableName,
+            col.COLUMN_NAME,
+            col.POSSIBLE_VALUE,
+            col.IS_NOT_NULL
+          )
         await this.alterForeignKey(row.tableName, col)
       }
       await this.alterColumnCombination(row.tableName, row.compoisteColumn)
@@ -113,7 +114,7 @@ export default class MyDBMigrator {
     tableName: string,
     col: Unarray<MyModel["columns"]>
   ) {
-    console.log("alterForeignKey()")
+    // console.log("alterForeignKey()")
     if (col.FOREIGN_KEY) {
       for (const row of col.FOREIGN_KEY) {
         const CONSTRAINT =
@@ -121,7 +122,6 @@ export default class MyDBMigrator {
             0,
             64
           )
-
         const constraintExist = await this.isConstraintNameExist(CONSTRAINT)
         if (constraintExist) {
           await this.MyDB.query(
@@ -166,7 +166,8 @@ export default class MyDBMigrator {
     tableName: string,
     col: Unarray<MyModel["columns"]>
   ) {
-    console.log("alterDataType()")
+    if (col.DATA_TYPE === "enum") return null
+    // console.log("alterDataType()")
     const AutoIncrement = col.AUTO_INCREMENT ? "AUTO_INCREMENT" : ""
     const columnDefault = col.COLUMN_DEFAULT
       ? `DEFAULT ${col.COLUMN_DEFAULT}`
@@ -199,22 +200,28 @@ export default class MyDBMigrator {
     tableName: string,
     col: Unarray<MyModel["columns"]>
   ) {
-    console.log("alterPrimaryKey()")
+    // 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)
+      // recheck only id
+      if (isPrimaryKey === false && col.COLUMN_NAME === "id")
         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)`
+    const foundTable = this.onetimeLoadColumnContent.find(
+      (row) => row.TABLE_NAME === tableName
     )
+    if (!foundTable) {
+      await this.MyDB.query(
+        `CREATE TABLE IF NOT EXISTS ${tableName} (id INT(11) AUTO_INCREMENT PRIMARY KEY)`
+      )
+      this.loadColumnContentIfEmpty()
+    }
   }
 
   private async columnInTableExist(tableName: string, columnName: string) {
@@ -239,12 +246,11 @@ export default class MyDBMigrator {
     tableName: string,
     columnName: string,
     dataType: columnType,
-    columnDefault: string | null | undefined | number
+    columnDefault: string | number | null | undefined
   ) {
     await this.loadColumnContentIfEmpty()
     let temp = this.onetimeLoadColumnContent.filter(
-      (row: any) =>
-        row.TABLE_NAME === tableName && row.COLUMN_NAME === columnName
+      (row) => row.TABLE_NAME === tableName && row.COLUMN_NAME === columnName
     )
     if (columnDefault === undefined) columnDefault = "NULL"
     if (columnDefault === null) columnDefault = "NULL"
@@ -253,6 +259,11 @@ export default class MyDBMigrator {
       if (temp[0].DATA_TYPE !== dataType) {
         console.log(chalk.green`${temp[0].DATA_TYPE} change to ${dataType}`)
         return true
+        // if (temp[0].DATA_TYPE === "enum") {
+        //   return true
+        // } else {
+        //   return true
+        // }
       }
       if (temp[0].COLUMN_DEFAULT !== columnDefault) {
         console.log(
@@ -296,7 +307,7 @@ export default class MyDBMigrator {
     IS_INDEX: boolean | undefined,
     indexList: { Key_name: string }[]
   ) {
-    console.log("alterIndex()")
+    // console.log("alterIndex()")
     const isIndex = Boolean(IS_INDEX)
     const indexIndexName = `${columnName}_index`
     const isFound = indexList.find((iRow) => iRow.Key_name === indexIndexName)
@@ -310,38 +321,24 @@ export default class MyDBMigrator {
       await this.MyDB.query(`DROP INDEX ${indexIndexName} ON ${tableName};`)
   }
 
-  private async deleteOldIndexVersion(
-    tableName: string,
-    columnName: string,
-    indexList: { Key_name: string }[]
-  ) {
-    console.log("deleteOldIndexVersion()")
-    const indexIndexName = `${columnName}`
-    const isFound = indexList.find((iRow) => iRow.Key_name === indexIndexName)
-      ? true
-      : false
-
-    if (isFound === true)
-      await this.MyDB.query(`DROP INDEX ${indexIndexName} ON ${tableName};`)
-  }
-
   private async alterPossibleEnum(
     tableName: string,
     columnName: string,
     possibleValue?: string[],
     isNotNull?: boolean
   ) {
-    console.log("alterPossibleEnum()")
+    // console.log("alterPossibleEnum()")
     if (!possibleValue) return null
     const data = this.onetimeLoadColumnContent.find(
       (row) => row.COLUMN_NAME === columnName && row.TABLE_NAME === tableName
     )
+    const possibleValueString = possibleValue.map((row) => `'${row}'`).join(",")
+    const enumType = `enum(${possibleValueString})`
+    // console.log("enum ->", data?.COLUMN_TYPE)
+    // console.log("enumType ->", enumType)
     const notNull = isNotNull ? "NOT NULL" : ""
-    if (data) {
-      let possibleValueString = possibleValue
-        .map((row) => `'${row}'`)
-        .join(", ")
-
+    if (data && enumType !== data.COLUMN_TYPE) {
+      // console.log(chalk.red("alter enum"))
       try {
         await this.MyDB.query(
           `ALTER TABLE ${tableName} MODIFY COLUMN ${columnName} ENUM(${possibleValueString}) ${notNull} ;`
@@ -351,11 +348,9 @@ export default class MyDBMigrator {
           `SELECT DISTINCT(${columnName}) as columnValue FROM ${tableName}`
         )
         const valueInColumn = data.map((dRow) => `['${dRow.columnValue}']`)
-
         const problemValue = valueInColumn.filter(
           (row) => !possibleValue.includes(row)
         )
-
         console.log(
           chalk.bgRed.white(
             `error table(${tableName}) - column (${columnName}) has problem value is ${problemValue.join(
@@ -406,19 +401,19 @@ export default class MyDBMigrator {
     }
   }
 
-  private async checkIsPrimaryKey(
-    databaseName: string,
-    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}'`)
-    console.log("result", result)
-    if (result.length) {
-      if (result[0].COLUMN_KEY === "PRI") return true
+  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
+    )
+
+    if (result2) {
+      if (result2.COLUMN_KEY === "PRI") return true
       else return false
     } else return false
   }

package/src/myModel.ts

@@ -17,12 +17,33 @@ export type columnType =
   | "date"
   | "time"
   | "datetime"
-export interface columnContent {
+  | "enum"
+// export interface columnContent {
+//   COLUMN_NAME: string
+//   DATA_TYPE: columnType
+//   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
+//   IS_NOT_NULL?: boolean
+// }
+type ColumnTypeMap = {
+  [K in Exclude<columnType, "enum">]: BaseColumn & { DATA_TYPE: K }
+} & {
+  enum: BaseColumn & { DATA_TYPE: "enum"; POSSIBLE_VALUE: string[] }
+}
+
+type BaseColumn = {
   COLUMN_NAME: string
-  DATA_TYPE: columnType
   COLUMN_DEFAULT?: string | number | null
   AUTO_INCREMENT?: boolean
-  POSSIBLE_VALUE?: string[]
   FOREIGN_KEY?: {
     tableName: string
     columnName: string
@@ -33,7 +54,25 @@ export interface columnContent {
   IS_INDEX?: boolean
   IS_NOT_NULL?: boolean
 }
+// export type columnContent = {
+//   COLUMN_NAME: string
+//   DATA_TYPE: columnType
+//   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
+//   IS_NOT_NULL?: boolean
+// }
+export type ColumnContent = ColumnTypeMap[keyof ColumnTypeMap]
 
+export type columnContent = ColumnContent
 export interface compoisteColumn {
   type: "UNIQUE" | "INDEX"
   columnName: string[]