mm_sqlite 1.0.7 → 1.0.9

package/db.js

@@ -18,7 +18,9 @@ class DB extends Sql {
 
 		// 事务SQL
 		this.task_sql = "";
-
+		// 表名
+		this.table = "";
+		
 		/**
 		 * 获取上级
 		 * @return {Object} 返回上级管理器
@@ -83,7 +85,7 @@ DB.prototype.run = async function(sql, params = [], timeout = 30000) {
 	try {
 		// 使用Promise.race实现超时控制
 		return await Promise.race([
-			this._mysql.run(sql, params),
+			this._mysql.run(sql, params, timeout),
 			this._createTimeoutPromise(timeout, `查询执行超时: ${sql.substring(0, 100)}...`)
 		]);
 	} catch (error) {
@@ -99,23 +101,25 @@ DB.prototype.run = async function(sql, params = [], timeout = 30000) {
 /**
  * 执行SQL命令
  * @param {string} sql SQL语句
+ * @param {Array} params 参数数组
  * @param {Number} timeout 超时时间(毫秒)
  * @returns {Promise<Object>} 执行结果
  */
-DB.prototype.exec = async function(sql, timeout = 30000) {
+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),
+			this._mysql.exec(sql, params, timeout),
 			this._createTimeoutPromise(timeout, `命令执行超时: ${sql.substring(0, 100)}...`)
 		]);
 	} catch (error) {
 		$.log.error(`[DB] [exec] 命令执行失败`, {
 			error: error.message,
-			sql: sql.substring(0, 200)
+			sql: sql.substring(0, 200),
+			params: JSON.stringify(params.slice(0, 5))
 		});
 		throw error;
 	}
@@ -153,7 +157,7 @@ DB.prototype.getConn = async function(timeout = 15000) {
 DB.prototype.start = async function(identifier = "point_1", timeout = 15000) {
 	this.task = 1;
 	try {
-		return await this.exec("BEGIN;", timeout);
+		return await this.exec("BEGIN;", [], timeout);
 	} catch (err) {
 		this.task = 0;
 		$.log.error(`[DB] [start] 事务开始失败: ${err.message}`);
@@ -173,7 +177,7 @@ DB.prototype.commit = async function(timeout = 15000) {
 	}
 	this.task = 2;
 	try {
-		const result = await this.exec("COMMIT;", timeout);
+		const result = await this.exec("COMMIT;", [], timeout);
 		// 重置事务状态
 		this.task = 0;
 		this.task_sql = '';
@@ -182,7 +186,7 @@ DB.prototype.commit = async function(timeout = 15000) {
 		$.log.error(`[DB] [commit] 事务提交失败: ${err.message}`);
 		// 尝试回滚
 		try {
-			await this.exec("ROLLBACK;", timeout);
+			await this.exec("ROLLBACK;", [], timeout);
 		} catch (rollbackErr) {
 			$.log.error(`[DB] [commit] 事务回滚也失败: ${rollbackErr.message}`);
 		}
@@ -216,8 +220,8 @@ DB.prototype.back = async function(identifier = "point_1", timeout = 15000) {
 	}
 	this.task = 3;
 	try {
-		await this.exec("ROLLBACK;", timeout);
-		const result = await this.exec("COMMIT;", timeout);
+		await this.exec("ROLLBACK;", [], timeout);
+		const result = await this.exec("COMMIT;", [], timeout);
 		// 重置事务状态
 		this.task = 0;
 		this.task_sql = '';
@@ -437,14 +441,28 @@ DB.prototype.addTable = async function(table, field, type = 'int', auto = true,
 		if (!field) {
 			field = "id";
 		}
-		var sql = "CREATE TABLE IF NOT EXISTS `{0}` (`{1}` {2})".replace('{0}', table).replace(
-			'{1}', field).replace('{2}', this.setType(field, type, null, true, auto) + ' PRIMARY KEY');
-		if (commit) {
-			sql += " COMMENT = '" + commit + "';"
+		// SQLite的自增主键要求字段类型必须是INTEGER（大写且不带长度）
+		let fieldType;
+		if (auto) {
+			// 自增字段使用简单的INTEGER类型，由后面的PRIMARY KEY AUTOINCREMENT决定自增行为
+			fieldType = "INTEGER";
+		} else {
+			// 非自增字段使用正常的类型设置
+			fieldType = this.setType(field, type, null, true, auto);
+		}
+		// 根据是否自增来构造不同的SQL语句
+		let sqlTemplate;
+		if (auto) {
+			// 自增字段：使用INTEGER PRIMARY KEY AUTOINCREMENT语法
+			sqlTemplate = "CREATE TABLE IF NOT EXISTS `{0}` (`{1}` {2} PRIMARY KEY AUTOINCREMENT)";
 		} else {
-			sql += ";"
+			// 非自增字段：使用正常的字段类型和主键定义
+			sqlTemplate = "CREATE TABLE IF NOT EXISTS `{0}` (`{1}` {2} PRIMARY KEY)";
 		}
-		var bl = await this.exec(sql, timeout);
+		var sql = sqlTemplate.replace('{0}', table).replace(
+			'{1}', field).replace('{2}', fieldType) + ";";
+		// SQLite不支持表级COMMENT语法，所以忽略commit参数
+		var bl = await this.exec(sql, [], timeout);
 		// 设置实例的表名属性，以便后续操作使用
 		this.table = table;
 		return bl && bl.affectedRows !== undefined ? 1 : 0;
@@ -486,22 +504,25 @@ DB.prototype.addField = async function(field, type, value = '', not_null = true,
 			return 0;
 		}
 		
-		var sql =
-			"select count(*) as `count` from sqlite_master where `type` = 'table' and `name` = '{1}' and `sql` like '%{2}%'";
-		sql = sql.replace('{1}', this.table).replace('{2}', field);
-		var arr = await this.run(sql, [], timeout);
-		if (arr && arr.length > 0) {
-			if (arr[0].count == 0) {
-				var type = this.setType(field, type, value, not_null, auto);
-				var sql = "ALTER Table `{0}` ADD `{1}` {2}";
-				sql = sql.replace('{0}', this.table).replace('{1}', field).replace('{2}', type);
-				if (comment) {
-					sql += " COMMENT '" + comment + "'";
-				}
-				sql += ";";
-				return await this.exec(sql, timeout);
+		// 在SQLite中，使用PRAGMA table_info检查表中是否已存在字段
+		var sql = "PRAGMA table_info(`{0}`)";
+		sql = sql.replace('{0}', this.table);
+		var columns = await this.run(sql, [], timeout);
+		var fieldExists = false;
+		for (var i = 0; i < columns.length; i++) {
+			if (columns[i].name === field) {
+				fieldExists = true;
+				break;
 			}
 		}
+		
+		if (!fieldExists) {
+			var fieldType = this.setType(field, type, value, not_null, auto);
+			var sql = "ALTER Table `{0}` ADD `{1}` {2}";
+			sql = sql.replace('{0}', this.table).replace('{1}', field).replace('{2}', fieldType) + ";";
+			// SQLite不支持字段级COMMENT语法，所以忽略comment参数
+			return await this.exec(sql, [], timeout);
+		}
 		return 0;
 	} catch (err) {
 		$.log.error(`[DB] [addField] 添加字段失败: ${err.message}`);

package/package.json

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