@axiosleo/orm-mysql 0.11.6 → 0.11.7

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.6',
+  version: '0.11.7',
   commands_dir: path.join(__dirname, '../commands'),
 });
 

package/index.d.ts

@@ -537,4 +537,6 @@ export declare class MigrationInterface {
   dropIndex(indexName: string): void;
 
   dropForeignKey(foreign_key: string, tableName: string): void;
+
+  insertData(table: string, data: any[]): void;
 }

package/package.json

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

package/src/builder.js

@@ -274,7 +274,23 @@ class Builder {
   _buildValues(value) {
     let fields = [];
     if (is.array(value)) {
-      [fields] = value.map((v) => this._buildValue(v));
+      fields = this._buildValue(value[0]);
+
+      this.values = this.values.slice(0, -fields.length);
+
+      value.forEach((obj) => {
+        fields.forEach((field) => {
+          const val = obj[field];
+          if (val instanceof Date) {
+            this.values.push(val);
+          } else if (Array.isArray(val) || is.object(val)) {
+            this.values.push(JSON.stringify(val));
+          } else {
+            this.values.push(val);
+          }
+        });
+      });
+
       let item = '(' + fields.map(f => '?').join(',') + ')';
       return { fields, sqlStr: new Array(value.length).fill(item).join(',') };
     }

package/src/client.js

@@ -25,7 +25,17 @@ const createClient = (options, name = null) => {
   const key = name ? name :
     `${options.host}:${options.port}:${options.user}:${options.password}:${options.database}`;
   if (clients[key]) {
-    return clients[key];
+    // 检查现有连接的连通性
+    const existingConnection = clients[key];
+
+    // 检查连接是否已关闭或销毁
+    if (existingConnection._closing || existingConnection._closed || existingConnection.destroyed) {
+      // 连接已关闭，清除并重新创建
+      delete clients[key];
+    } else {
+      // 如果连接看起来正常，返回现有的连接
+      return existingConnection;
+    }
   }
   clients[key] = mysql.createConnection(options);
   clients[key].connect();
@@ -48,7 +58,17 @@ const createPromiseClient = async (options, name = null) => {
   const key = name ? name :
     `${options.host}:${options.port}:${options.user}:${options.password}:${options.database}`;
   if (clients[key]) {
-    return clients[key];
+    // 检查现有连接的连通性
+    const existingConnection = clients[key];
+
+    // 检查连接是否已关闭或销毁
+    if (existingConnection._closing || existingConnection._closed || existingConnection.destroyed) {
+      // 连接已关闭，清除并重新创建
+      delete clients[key];
+    } else {
+      // 如果连接看起来正常，返回现有的连接
+      return existingConnection;
+    }
   }
   clients[key] = await mysqlPromise.createConnection(options);
   return clients[key];
@@ -66,6 +86,7 @@ const createPool = (options, name = null) => {
     password: 'required|string',
     port: 'required|integer',
     database: 'required|string',
+    enableKeepAlive: 'boolean',
   });
   const key = name ? name :
     `${options.host}:${options.port}:${options.user}:${options.password}:${options.database}`;
@@ -150,5 +171,8 @@ module.exports = {
   getClient,
   createPool,
   createClient,
-  createPromiseClient
+  createPromiseClient,
+
+  // 仅用于测试
+  _clients: clients
 };

package/src/migration.js

@@ -10,7 +10,7 @@ const { _render } = require('@axiosleo/cli-tool/src/helper/str');
 const { _foreach } = require('@axiosleo/cli-tool/src/helper/cmd');
 const { _assign } = require('@axiosleo/cli-tool/src/helper/obj');
 const { TransactionHandler } = require('..');
-const { ManageSQLBuilder } = require('./builder');
+const { ManageSQLBuilder, Builder } = require('./builder');
 
 const migrationColumns = [
   {
@@ -268,6 +268,17 @@ function _initMigration(file, queries = {}) {
     }, ...baseAttr
   });
 
+  Object.defineProperty(migration, 'insertData', {
+    value: function (table, data) {
+      const builder = new Builder({
+        operator: 'insert',
+        tables: [{ table }],
+        data
+      });
+      queries[file].push({ sql: builder.sql, values: builder.values });
+    }, ...baseAttr
+  });
+
   return migration;
 }