@zhin.js/database 1.1.6 → 1.1.7

package/lib/dialects/mysql.js

@@ -279,12 +279,18 @@ export class MySQLDialect extends Dialect {
         if (this.usePool) {
             // 从连接池获取一个连接用于事务
             const connection = await this.pool.getConnection();
-            // 设置隔离级别
-            if (options?.isolationLevel) {
-                await connection.query(`SET TRANSACTION ISOLATION LEVEL ${this.formatIsolationLevel(options.isolationLevel)}`);
+            try {
+                // 设置隔离级别
+                if (options?.isolationLevel) {
+                    await connection.query(`SET TRANSACTION ISOLATION LEVEL ${this.formatIsolationLevel(options.isolationLevel)}`);
+                }
+                // 开始事务
+                await connection.beginTransaction();
+            }
+            catch (error) {
+                connection.release();
+                throw error;
             }
-            // 开始事务
-            await connection.beginTransaction();
             return {
                 async commit() {
                     try {

package/lib/dialects/pg.js

@@ -254,7 +254,13 @@ export class PostgreSQLDialect extends Dialect {
             if (options?.isolationLevel) {
                 beginSql = `BEGIN ISOLATION LEVEL ${this.formatIsolationLevel(options.isolationLevel)}`;
             }
-            await client.query(beginSql);
+            try {
+                await client.query(beginSql);
+            }
+            catch (error) {
+                client.release();
+                throw error;
+            }
             return {
                 async commit() {
                     try {

package/lib/dialects/sqlite.js

@@ -63,8 +63,9 @@ export class SQLiteDialect extends Dialect {
         const trimmedSql = sql.trim().toLowerCase();
         const isInsert = trimmedSql.startsWith('insert');
         const isUpdateOrDelete = trimmedSql.startsWith('update') || trimmedSql.startsWith('delete');
-        // 带 RETURNING 的 DML 有结果集，不能走 run 丢行
-        const hasReturning = /\breturning\b/.test(trimmedSql);
+        // 带 RETURNING 的 DML 有结果集，不能走 run 丢行（剥离引号标识符与字符串字面量避免列名误判）
+        const sqlWithoutLiterals = trimmedSql.replace(/'[^']*'/g, "''").replace(/"[^"]*"/g, '""');
+        const hasReturning = /\breturning\b/.test(sqlWithoutLiterals);
         const args = this.prepareBindParams(params ?? []);
         const stmt = this.db.prepare(sql);
         if (isInsert && !hasReturning) {

package/lib/type/related/database.js

@@ -441,8 +441,12 @@ export class RelatedDatabase extends Database {
                             case '$in':
                                 if (isSubquery(value[op])) {
                                     // 子查询
+                                    const offset = parameterOffset + params.length;
                                     const subquery = value[op].toSQL();
-                                    clauses.push(`${quotedKey} IN (${subquery.sql})`);
+                                    const subSql = offset > 0
+                                        ? subquery.sql.replace(/\$(\d+)/g, (_, n) => `$${Number(n) + offset}`)
+                                        : subquery.sql;
+                                    clauses.push(`${quotedKey} IN (${subSql})`);
                                     params.push(...subquery.params);
                                 }
                                 else if (Array.isArray(value[op]) && value[op].length) {
@@ -457,8 +461,12 @@ export class RelatedDatabase extends Database {
                             case '$nin':
                                 if (isSubquery(value[op])) {
                                     // 子查询
+                                    const offset = parameterOffset + params.length;
                                     const subquery = value[op].toSQL();
-                                    clauses.push(`${quotedKey} NOT IN (${subquery.sql})`);
+                                    const subSql = offset > 0
+                                        ? subquery.sql.replace(/\$(\d+)/g, (_, n) => `$${Number(n) + offset}`)
+                                        : subquery.sql;
+                                    clauses.push(`${quotedKey} NOT IN (${subSql})`);
                                     params.push(...subquery.params);
                                 }
                                 else if (Array.isArray(value[op]) && value[op].length) {
@@ -565,6 +573,9 @@ export class RelatedDatabase extends Database {
      * 获取所有模型名称
      */
     getModelNames() {
+        if (this.definitions instanceof Map) {
+            return Array.from(this.definitions.keys()).map(String);
+        }
         return Object.keys(this.definitions || {});
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/database",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "Universal database abstraction layer for Zhin.js - supports SQLite, MySQL, PostgreSQL, MongoDB, Redis",
   "type": "module",
   "main": "./lib/index.js",