gg-mysql-connector 1.0.46 → 1.0.49

package/app_INF.ts

@@ -1,24 +1,18 @@
-export default interface app_INF {
-  item: {
-    id: number
-    name: "pen" | "ruler"
-    price: number
-    description: string
-    amount: number
-  }
-  user: {
-    id: number
-    name: string
-  }
-  test_view: {
-    id: number
-    name: string
-    itemName: "pen" | "ruler"
-  }
-  item_view: {
-    id: number
-    name: "pen" | "ruler"
-    amount: number
-    price: number
-  }
-}
+export default interface app_INF  {  item : {  
+ id: number; 
+ name: "pen" | "ruler" | "tiger"; 
+ price: number; 
+ description: string; 
+ amount: number; }
+ user : {  
+ id: number; 
+ name: string; }
+ test_view : {  
+ id: number; 
+ name: string; 
+ itemName: "pen" | "ruler" | "tiger"; }
+ item_view : {  
+ id: number; 
+ name: "pen" | "ruler" | "tiger"; 
+ amount: number; 
+ price: number; } }

package/app_model_const.ts

@@ -1,24 +1,16 @@
-export const app_model_const = {
-  item: {
-    id: "number",
-    name: ["pen", "ruler"] as string[],
-    price: "number",
-    description: "string",
-    amount: "number",
-  },
-  user: {
-    id: "number",
-    name: "string",
-  },
-  test_view: {
-    id: "number",
-    name: "string",
-    itemName: ["pen", "ruler"] as string[],
-  },
-  item_view: {
-    id: "number",
-    name: ["pen", "ruler"] as string[],
-    amount: "number",
-    price: "number",
-  },
-} as const
+
+    export const app_model_const = {  item  : {  
+ id: "number", 
+ name: ["pen" , "ruler" , "tiger"]  as  string[], 
+ price: "number", 
+ description: "string", 
+ amount: "number", }, user  : {  
+ id: "number", 
+ name: "string", }, test_view  : {  
+ id: "number", 
+ name: "string", 
+ itemName: ["pen" , "ruler" , "tiger"]  as  string[], }, item_view  : {  
+ id: "number", 
+ name: ["pen" , "ruler" , "tiger"]  as  string[], 
+ amount: "number", 
+ price: "number", } } as const

package/dist/app_INF.d.ts

@@ -1,7 +1,7 @@
 export default interface app_INF {
     item: {
         id: number;
-        name: "pen" | "ruler";
+        name: "pen" | "ruler" | "tiger";
         price: number;
         description: string;
         amount: number;
@@ -13,11 +13,11 @@ export default interface app_INF {
     test_view: {
         id: number;
         name: string;
-        itemName: "pen" | "ruler";
+        itemName: "pen" | "ruler" | "tiger";
     };
     item_view: {
         id: number;
-        name: "pen" | "ruler";
+        name: "pen" | "ruler" | "tiger";
         amount: number;
         price: number;
     };

package/dist/app_model_const.js

@@ -1,27 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.app_model_const = void 0;
-exports.app_model_const = {
-    item: {
+exports.app_model_const = { item: {
         id: "number",
-        name: ["pen", "ruler"],
+        name: ["pen", "ruler", "tiger"],
         price: "number",
         description: "string",
         amount: "number",
-    },
-    user: {
+    }, user: {
         id: "number",
         name: "string",
-    },
-    test_view: {
+    }, test_view: {
         id: "number",
         name: "string",
-        itemName: ["pen", "ruler"],
-    },
-    item_view: {
+        itemName: ["pen", "ruler", "tiger"],
+    }, item_view: {
         id: "number",
-        name: ["pen", "ruler"],
+        name: ["pen", "ruler", "tiger"],
         amount: "number",
         price: "number",
-    },
-};
+    } };

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[] | undefined;
+    getPossibleColumnValue(model: MyModel[], tableName: string, columnName: string, columnType: string): false | (string | null)[] | 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[]): Promise<null | undefined>;
+    alterPossibleEnum(tableName: string, columnName: string, possibleValue?: (string | null)[]): 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

@@ -118,10 +118,16 @@ class MyDBMigrator {
             return null;
         const data = this.onetimeLoadColumnContent.find((row) => row.COLUMN_NAME === columnName && row.TABLE_NAME === tableName);
         if (data) {
-            const possibleValueString = possibleValue
-                .map((row) => `"${row}"`)
+            let possibleValueString = possibleValue
+                .filter((row) => row !== null)
+                .map((row) => {
+                return `"${row}"`;
+            })
                 .join(", ");
-            await this.MyDB.query(`ALTER TABLE ${tableName} MODIFY COLUMN ${columnName} ENUM(${possibleValueString}) NOT NULL;`);
+            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};`);
         }
     }
     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[];
+    POSSIBLE_VALUE?: (string | null)[];
     IS_UNIQUE?: boolean;
     IS_INDEX?: boolean;
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "gg-mysql-connector",
-  "version": "1.0.46",
+  "version": "1.0.49",
   "description": "",
-  "main": "dist/index.js",
+  "main": "dist/src/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "tsc && npm version patch --no-git-tag-version"

package/src/MyDBMigrator/MyDBMigrator.ts

@@ -189,18 +189,27 @@ export default class MyDBMigrator {
   async alterPossibleEnum(
     tableName: string,
     columnName: string,
-    possibleValue?: string[]
+    possibleValue?: (string | null)[]
   ) {
     if (!possibleValue) return null
     const data = this.onetimeLoadColumnContent.find(
       (row) => row.COLUMN_NAME === columnName && row.TABLE_NAME === tableName
     )
     if (data) {
-      const possibleValueString = possibleValue
-        .map((row) => `"${row}"`)
+      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}) NOT NULL;`
+        `ALTER TABLE ${tableName} MODIFY COLUMN ${columnName} ENUM(${possibleValueString}) ${nullString};`
       )
     }
   }

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[]
+  POSSIBLE_VALUE?: (string | null)[]
   IS_UNIQUE?: boolean
   IS_INDEX?: boolean
 }