@axiosleo/orm-mysql 0.11.4 → 0.11.6

package/bin/orm-mysql.js

@@ -9,7 +9,7 @@ const app = new App({
   name: 'MySQL ORM CLI',
   desc: 'migrate, model, seed, etc.',
   bin: 'orm-mysql',
-  version: '0.11.4',
+  version: '0.11.6',
   commands_dir: path.join(__dirname, '../commands'),
 });
 

package/index.d.ts

@@ -229,35 +229,48 @@ export declare class QueryOperator extends Query {
 
   explain(operator: OperatorType): Promise<ExplainResult[]>;
 
-  select<T>(...attrs: string[]): Promise<T[] | Builder>;
+  select<T extends Object>(...attrs: string[]): Promise<T[]>;
+  select<T extends Object>(...attrs: string[]): Promise<Builder>;
 
-  find<T>(): Promise<T | Builder>;
+  find<T extends Object>(): Promise<T>;
+  find<T extends Object>(): Promise<Builder>;
 
-  count(): Promise<number | Builder>;
+  count(): Promise<number>;
+  count(): Promise<Builder>;
 
   /**
    * increment a column value
    * @param attr 
    * @param increment default is 1
    */
-  incrBy(attr: string, increment?: string | number | ((number: number) => number)): Promise<MySQLQueryResult | Builder>;
+  incrBy(attr: string, increment?: string | number | ((number: number) => number)): Promise<MySQLQueryResult>;
+  incrBy(attr: string, increment?: string | number | ((number: number) => number)): Promise<Builder>;
 
-  delete(id?: number, index_field_name?: string): Promise<MySQLQueryResult | Builder>;
+  delete(id?: number, index_field_name?: string): Promise<MySQLQueryResult>;
+  delete(id?: number, index_field_name?: string): Promise<Builder>;
 
-  update(row?: any): Promise<MySQLQueryResult | Builder>;
+  update(row?: any): Promise<MySQLQueryResult>;
+  update(row?: any): Promise<Builder>;
 
-  update<T extends Object>(row?: T): Promise<MySQLQueryResult | Builder>;
+  update<T extends Object>(row?: T): Promise<MySQLQueryResult>;
+  update<T extends Object>(row?: T): Promise<Builder>;
 
-  insert(row?: any): Promise<MySQLQueryResult | Builder>;
+  insert(row?: any): Promise<MySQLQueryResult>;
+  insert(row?: any): Promise<Builder>;
 
-  insert<T extends Object>(row?: T): Promise<MySQLQueryResult | Builder>;
+  insert<T extends Object>(row?: T): Promise<MySQLQueryResult>;
+  insert<T extends Object>(row?: T): Promise<Builder>;
 
-  insertAll(rows: any[]): Promise<MySQLQueryResult[] | Builder>;
+  insertAll(rows: any[]): Promise<MySQLQueryResult[]>;
+  insertAll(rows: any[]): Promise<Builder>;
 
-  insertAll<T extends Object>(rows: T[]): Promise<MySQLQueryResult[] | Builder>;
+  insertAll<T extends Object>(rows: T[]): Promise<MySQLQueryResult[]>;
+  insertAll<T extends Object>(rows: T[]): Promise<Builder>;
 
-  upsertRow(row: any, condition: QueryCondition): Promise<MySQLQueryResult | Builder>;
+  upsertRow(row: any, condition: QueryCondition): Promise<MySQLQueryResult>;
+  upsertRow(row: any, condition: QueryCondition): Promise<Builder>;
 
+  upsertRow<T extends Object>(row: T, ...conditions: WhereItem[]): Promise<MySQLQueryResult>;
   upsertRow<T extends Object>(row: T, ...conditions: WhereItem[]): Promise<MySQLQueryResult | Builder>;
 
   notExec(): this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiosleo/orm-mysql",
-  "version": "0.11.4",
+  "version": "0.11.6",
   "description": "MySQL ORM tool",
   "keywords": [
     "mysql",

package/src/builder.js

@@ -488,7 +488,7 @@ class ManageSQLBuilder extends Builder {
   }
 
   /**
-   * @param {import('../index').ManageBuilderOptions} options 
+   * @param {import('./migration').ManageBuilderOptions} options 
    */
   createTable(options) {
     _validate(options, {

package/src/client.js

@@ -70,7 +70,13 @@ const createPool = (options, name = null) => {
   const key = name ? name :
     `${options.host}:${options.port}:${options.user}:${options.password}:${options.database}`;
   if (clients[key]) {
-    return clients[key];
+    const existingPool = clients[key];
+
+    if (existingPool._closed) {
+      delete clients[key];
+    } else {
+      return existingPool;
+    }
   }
   const pool = mysql.createPool(options);
   clients[key] = pool;