mm_sqlite 1.1.8 → 1.2.0

package/db.js

@@ -71,54 +71,6 @@ DB.prototype.new = function (table, key) {
 	return db;
 };
 
-/**
- * 执行SQL查询
- * @param {string} sql SQL语句
- * @param {Array} params 参数数组
- * @param {Number} timeout 超时时间(毫秒)
- * @returns {Promise<Object>} 查询结果
- */
-DB.prototype.run = async function (sql, params = [], timeout = 30000) {
-	if (!this._mysql) {
-		throw new Error('SQLite实例未初始化');
-	}
-	try {
-		// 使用Promise.race实现超时控制
-		return await Promise.race([
-			this._mysql.run(sql, params, timeout),
-			this._createTimeoutPromise(timeout, `查询执行超时: ${sql.substring(0, 100)}...`)
-		]);
-	} catch (error) {
-		this.logger('error', '查询执行失败', error);
-		// 返回空数组作为默认值，保持返回值类型一致
-		return [];
-	}
-};
-
-/**
- * 执行SQL命令
- * @param {string} sql SQL语句
- * @param {Array} params 参数数组
- * @param {Number} timeout 超时时间(毫秒)
- * @returns {Promise<Object>} 执行结果
- */
-DB.prototype.exec = async function (sql, params = [], timeout = 30000) {
-	if (!this._mysql) {
-		throw new Error('SQLite实例未初始化');
-	}
-	try {
-		// 使用Promise.race实现超时控制
-		return await Promise.race([
-			this._mysql.exec(sql, params, timeout),
-			this._createTimeoutPromise(timeout, `命令执行超时: ${sql.substring(0, 100)}...`)
-		]);
-	} catch (error) {
-		this.logger('error', '命令执行失败', error);
-		// 返回默认操作结果对象，保持返回值类型一致
-		return 0;
-	}
-};
-
 /**
  * 获取数据库连接
  * @param {Number} timeout 超时时间(毫秒)

package/index.js

@@ -242,7 +242,7 @@ Sqlite.prototype.getConn = async function (timeout) {
     timeout = timeout || this.config.acquire_timeout || this.config.connect_timeout || 20000;
 
     if (this._status !== 'connected') {
-        throw new Error('数据库连接未建立');
+        await this.open(timeout);
     }
 
     try {
@@ -345,13 +345,6 @@ Sqlite.prototype.run = async function (sql, params, timeout) {
         if (err.code && (err.code === 'ECONNRESET' || err.code === 'ETIMEDOUT')) {
             this._handleConnectionError(err);
         }
-        this.sql = sql;
-        // 记录错误信息
-        this.error = {
-            code: err.code,
-            message: err.message
-        };
-
         // 返回空数组作为默认值，保持返回值类型一致
         return [];
     }
@@ -387,9 +380,9 @@ Sqlite.prototype.exec = async function (sql, params, timeout) {
         var _this = this;
         // 直接在方法内部实现超时控制
         const query_promise = new Promise((resolve, reject) => {
-            conn.run(sql, params || [], function (error, rows) {
+            conn.run(sql, params || [], function (error) {
                 if (error) {
-                    _this.sql = error.sql;
+                    _this.sql = sql;
                     _this.error = {
                         code: error.errno,
                         message: error.message
@@ -429,13 +422,6 @@ Sqlite.prototype.exec = async function (sql, params, timeout) {
         if (err.code && (err.code === 'ECONNRESET' || err.code === 'ETIMEDOUT')) {
             this._handleConnectionError(err);
         }
-        this.sql = sql;
-        // 记录错误信息
-        this.error = {
-            code: err.code,
-            message: err.message
-        };
-
         // 返回默认操作结果对象，保持返回值类型一致
         return 0;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_sqlite",
-    "version": "1.1.8",
+    "version": "1.2.0",
     "description": "高性能SQLite数据库操作模块，提供与mm_mysql完全兼容的API接口，支持异步操作、事务处理和批量操作",
     "main": "index.js",
     "scripts": {

package/sql.js

@@ -708,7 +708,6 @@ Sql.prototype.get = async function (query, sort, view, like, timeout = 30000) {
 			(async () => {
 				// 生成SQL并执行
 				var sql = this.toGetSql(query, sort, view, like);
-				this.sql = sql;
 				var list = await this.run(sql);
 				return list;
 			})(),