gg-mysql-connector 1.0.49 → 1.0.53

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

@@ -25,7 +25,7 @@ export default class ModelGenerator {
     getColumnFullList(tableName: string): Promise<mysql.RowDataPacket[]>;
     private isTableNameExistInModel;
     private isColumnExistInModel;
-    getPossibleColumnValue(model: MyModel[], tableName: string, columnName: string, columnType: string): false | (string | null)[] | undefined;
+    getPossibleColumnValue(model: MyModel[], tableName: string, columnName: string, columnType: string): false | string[] | undefined;
     generateModelInterface(params: {
         appName: string;
         model: MyModel[];

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

@@ -17,7 +17,7 @@ export default class MyDBMigrator {
     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 | null)[]): Promise<null | undefined>;
+    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

@@ -119,15 +119,11 @@ class MyDBMigrator {
         const data = this.onetimeLoadColumnContent.find((row) => row.COLUMN_NAME === columnName && row.TABLE_NAME === tableName);
         if (data) {
             let possibleValueString = possibleValue
-                .filter((row) => row !== null)
                 .map((row) => {
                 return `"${row}"`;
             })
                 .join(", ");
-            const nullString = possibleValue.filter((row) => row == null).length > 0
-                ? "NULL"
-                : "NOT NULL";
-            await this.MyDB.query(`ALTER TABLE ${tableName} MODIFY COLUMN ${columnName} ENUM(${possibleValueString}) ${nullString};`);
+            await this.MyDB.query(`ALTER TABLE ${tableName} MODIFY COLUMN ${columnName} ENUM(${possibleValueString}) NOT NULL;`);
         }
     }
     async migrateView(viewDirectory) {

package/dist/src/myModel.d.ts

@@ -5,7 +5,7 @@ export interface columnContent {
     DATA_TYPE: columnType;
     COLUMN_DEFAULT?: string | number | null;
     AUTO_INCREMENT?: boolean;
-    POSSIBLE_VALUE?: (string | null)[];
+    POSSIBLE_VALUE?: string[];
     IS_UNIQUE?: boolean;
     IS_INDEX?: boolean;
 }

package/package.json

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

package/src/MyDBMigrator/MyDBMigrator.ts

@@ -189,7 +189,7 @@ export default class MyDBMigrator {
   async alterPossibleEnum(
     tableName: string,
     columnName: string,
-    possibleValue?: (string | null)[]
+    possibleValue?: string[]
   ) {
     if (!possibleValue) return null
     const data = this.onetimeLoadColumnContent.find(
@@ -197,19 +197,13 @@ export default class MyDBMigrator {
     )
     if (data) {
       let possibleValueString = possibleValue
-        .filter((row) => row !== null)
         .map((row) => {
           return `"${row}"`
         })
         .join(", ")
 
-      const nullString =
-        possibleValue.filter((row) => row == null).length > 0
-          ? "NULL"
-          : "NOT NULL"
-
       await this.MyDB.query(
-        `ALTER TABLE ${tableName} MODIFY COLUMN ${columnName} ENUM(${possibleValueString}) ${nullString};`
+        `ALTER TABLE ${tableName} MODIFY COLUMN ${columnName} ENUM(${possibleValueString}) NOT NULL;`
       )
     }
   }

package/src/myModel.ts

@@ -22,7 +22,7 @@ export interface columnContent {
   DATA_TYPE: columnType
   COLUMN_DEFAULT?: string | number | null
   AUTO_INCREMENT?: boolean
-  POSSIBLE_VALUE?: (string | null)[]
+  POSSIBLE_VALUE?: string[]
   IS_UNIQUE?: boolean
   IS_INDEX?: boolean
 }