gg-mysql-connector 1.0.114 → 1.0.117

package/dist/src/GGMySQLConnector/GGMySQLConnector.d.ts

@@ -1,7 +1,7 @@
 import mysql, { QueryResult, RowDataPacket } from "mysql2";
 import { DatabaseConfigInterface } from "../ModelGenerator/ModelGenerator";
 export interface ClassDBInterface<Main> {
-    connection: mysql.Pool;
+    connection: mysql.Pool | null;
     query<T>(statement: string, parameter?: object, isPrint?: boolean): Promise<T | QueryResult>;
     getColumnList(tableName: string): Promise<string[]>;
     select<T extends keyof Main>(tableName: T extends string ? T : string): Promise<Main[T][]>;
@@ -25,7 +25,7 @@ export interface ClassDBInterface<Main> {
 export type Unarray<T> = T extends Array<infer U> ? U : T;
 export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
     DBInfo: DatabaseConfigInterface;
-    connection: mysql.Pool;
+    connection: mysql.Pool | null;
     isPrintStatement: boolean;
     tableAndViewNameList: string[];
     columnAndTableListCache: {

package/dist/src/GGMySQLConnector/GGMySQLConnector.js

@@ -25,6 +25,7 @@ class GGMySQLConnector {
         this.columnAndTableListCache = null;
         this.DBInfo = DBInfo;
         this.isConnected = false;
+        this.connection = null;
     }
     async selectByDateRange(tableName, params) {
         const { columnName, endDate, startDate } = params;
@@ -219,15 +220,15 @@ class GGMySQLConnector {
         return result;
     }
     async init() {
-        const currentConnection = mysql2_1.default.createPool({
+        const tempConnection = mysql2_1.default.createPool({
             host: this.DBInfo.host,
             user: this.DBInfo.user,
             password: this.DBInfo.password,
         });
+        await this.createDatabaseIfNotExist(tempConnection);
+        await tempConnection.end();
+        this.connection = mysql2_1.default.createPool(Object.assign(Object.assign({}, this.DBInfo), { waitForConnections: true, connectionLimit: 10 }));
         this.isConnected = true;
-        await this.createDatabaseIfNotExist(currentConnection);
-        // await currentConnection.end()
-        this.connection = mysql2_1.default.createPool(Object.assign({}, this.DBInfo));
         // await this.query("SET global sql_mode=''")
         // await this.query("SET global query_cache_type='ON'")
         // await this.query("SET global query_cache_size=16777216")
@@ -273,31 +274,36 @@ class GGMySQLConnector {
             const uniqueTime = `${(0, crypto_1.randomUUID)()} ${statment}`;
             console.time(uniqueTime);
             const startTime = new Date();
-            const queryResult = this.connection.query(statment, parameter, (error, results, fields) => {
-                if (error) {
-                    // _getCallerFile()
-                    console.log(chalk_1.default.bgRed("Query Error"));
-                    console.log(chalk_1.default.bgRed(error));
-                    console.log(chalk_1.default.bgRed("Statement : "));
-                    console.log(statment);
-                    console.log(chalk_1.default.bgRed("Parameter : "));
-                    console.log(parameter);
-                    console.log("------------------------------------------------");
-                    console.log(chalk_1.default.bgRed(queryResult.sql));
-                    reject(error);
-                }
-                else {
-                    const endTime = new Date();
-                    const executionTime = endTime.getTime() - startTime.getTime();
-                    if (isPrint === true) {
-                        this.printResultLength(results, executionTime, queryResult);
+            if (this.connection === null) {
+                console.error("error : mysql connection not open.");
+            }
+            else if (this.connection) {
+                const queryResult = this.connection.query(statment, parameter, (error, results, fields) => {
+                    if (error) {
+                        // _getCallerFile()
+                        console.log(chalk_1.default.bgRed("Query Error"));
+                        console.log(chalk_1.default.bgRed(error));
+                        console.log(chalk_1.default.bgRed("Statement : "));
+                        console.log(statment);
+                        console.log(chalk_1.default.bgRed("Parameter : "));
+                        console.log(parameter);
+                        console.log("------------------------------------------------");
+                        console.log(chalk_1.default.bgRed(queryResult.sql));
+                        reject(error);
                     }
-                    else if (this.isPrintStatement) {
-                        this.printResultLength(results, executionTime, queryResult);
+                    else {
+                        const endTime = new Date();
+                        const executionTime = endTime.getTime() - startTime.getTime();
+                        if (isPrint === true) {
+                            this.printResultLength(results, executionTime, queryResult);
+                        }
+                        else if (this.isPrintStatement) {
+                            this.printResultLength(results, executionTime, queryResult);
+                        }
+                        resolve(results);
                     }
-                    resolve(results);
-                }
-            });
+                });
+            }
         });
     }
 }

package/dist/src/ModelGenerator/ModelGenerator.js

@@ -27,7 +27,7 @@ class ModelGenerator {
     }
     async init() {
         console.log("init");
-        this.connection = await promise_1.default.createConnection({
+        this.connection = await promise_1.default.createPool({
             host: this.dbInfo.host,
             user: this.dbInfo.user,
             password: this.dbInfo.password,

package/package.json

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

package/src/GGMySQLConnector/GGMySQLConnector.ts

@@ -12,7 +12,7 @@ function log(input: {
 }
 
 export interface ClassDBInterface<Main> {
-  connection: mysql.Pool
+  connection: mysql.Pool | null
   query<T>(
     statement: string,
     parameter?: object,
@@ -61,7 +61,7 @@ export interface ClassDBInterface<Main> {
 export type Unarray<T> = T extends Array<infer U> ? U : T
 export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
   DBInfo: DatabaseConfigInterface
-  connection!: mysql.Pool
+  connection: mysql.Pool | null
   isPrintStatement: boolean
   tableAndViewNameList: string[]
   columnAndTableListCache:
@@ -80,6 +80,7 @@ export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
     this.columnAndTableListCache = null
     this.DBInfo = DBInfo
     this.isConnected = false
+    this.connection = null
   }
   async selectByDateRange<T extends keyof Main>(
     tableName: T extends string ? T : never,
@@ -377,16 +378,21 @@ export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
   }
 
   async init() {
-    const currentConnection = mysql.createPool({
+    const tempConnection = mysql.createPool({
       host: this.DBInfo.host,
       user: this.DBInfo.user,
       password: this.DBInfo.password,
     })
+    await this.createDatabaseIfNotExist(tempConnection)
+    await tempConnection.end()
+
+    this.connection = mysql.createPool({
+      ...this.DBInfo,
+      waitForConnections: true,
+      connectionLimit: 10,
+    })
     this.isConnected = true
-    await this.createDatabaseIfNotExist(currentConnection)
-    // await currentConnection.end()
 
-    this.connection = mysql.createPool({ ...this.DBInfo })
     // await this.query("SET global sql_mode=''")
     // await this.query("SET global query_cache_type='ON'")
     // await this.query("SET global query_cache_size=16777216")
@@ -461,33 +467,37 @@ export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
       const uniqueTime = `${randomUUID()} ${statment}`
       console.time(uniqueTime)
       const startTime = new Date()
-      const queryResult = this.connection.query(
-        statment,
-        parameter,
-        (error, results, fields) => {
-          if (error) {
-            // _getCallerFile()
-            console.log(chalk.bgRed("Query Error"))
-            console.log(chalk.bgRed(error))
-            console.log(chalk.bgRed("Statement : "))
-            console.log(statment)
-            console.log(chalk.bgRed("Parameter : "))
-            console.log(parameter)
-            console.log("------------------------------------------------")
-            console.log(chalk.bgRed(queryResult.sql))
-            reject(error)
-          } else {
-            const endTime = new Date()
-            const executionTime = endTime.getTime() - startTime.getTime()
-            if (isPrint === true) {
-              this.printResultLength(results, executionTime, queryResult)
-            } else if (this.isPrintStatement) {
-              this.printResultLength(results, executionTime, queryResult)
+      if (this.connection === null) {
+        console.error("error : mysql connection not open.")
+      } else if (this.connection) {
+        const queryResult = this.connection.query(
+          statment,
+          parameter,
+          (error, results, fields) => {
+            if (error) {
+              // _getCallerFile()
+              console.log(chalk.bgRed("Query Error"))
+              console.log(chalk.bgRed(error))
+              console.log(chalk.bgRed("Statement : "))
+              console.log(statment)
+              console.log(chalk.bgRed("Parameter : "))
+              console.log(parameter)
+              console.log("------------------------------------------------")
+              console.log(chalk.bgRed(queryResult.sql))
+              reject(error)
+            } else {
+              const endTime = new Date()
+              const executionTime = endTime.getTime() - startTime.getTime()
+              if (isPrint === true) {
+                this.printResultLength(results, executionTime, queryResult)
+              } else if (this.isPrintStatement) {
+                this.printResultLength(results, executionTime, queryResult)
+              }
+              resolve(results)
             }
-            resolve(results)
           }
-        }
-      )
+        )
+      }
     })
   }
   private printResultLength = (

package/src/ModelGenerator/ModelGenerator.ts

@@ -28,7 +28,7 @@ export default class ModelGenerator {
   }
   async init() {
     console.log("init")
-    this.connection = await mysql.createConnection({
+    this.connection = await mysql.createPool({
       host: this.dbInfo.host,
       user: this.dbInfo.user,
       password: this.dbInfo.password,

package/src/ModelGenerator/SeedGenerator.ts

@@ -1,33 +0,0 @@
-// import { MyModel } from "../myModel"
-
-// function generateSeedInterfaceNoDBConnection(models: MyModel[]) {
-//   for (const tableModel of models) {
-//     const arrayOfColumnKeyValue = []
-//     const arrayOfSeedColumnKeyValue = []
-
-//     const columnList = tableModel.columns
-
-//     let stringOfRawColumnKeyAndValue = ""
-//     for (const cRow of columnList) {
-//       const possibleValue = cRow.POSSIBLE_VALUE
-//       if (possibleValue) {
-//         stringOfRawColumnKeyAndValue = `${stringOfRawColumnKeyAndValue} \n ${
-//           cRow.COLUMN_NAME
-//         }: ${possibleValue.map((row) => `"${row}"`).join(" | ")};`
-//       } else {
-//         stringOfRawColumnKeyAndValue = `${stringOfRawColumnKeyAndValue} \n ${
-//           cRow.COLUMN_NAME
-//         }: ${convertDataType(cRow.DATA_TYPE)};`
-//       }
-//     }
-
-//     // normal app model code
-//     const str = ` ${tableName} : { ${stringOfRawColumnKeyAndValue} }`
-//     arrayOfColumnKeyValue.push(str)
-//     // only seed model code
-//     const tempSeedModel = params.model.find(
-//       (row) => row.tableName === tableName && row.isSeed
-//     )
-//     if (tempSeedModel) arrayOfSeedColumnKeyValue.push(str)
-//   }
-// }