mm_sqlite 1.1.6 → 1.1.8

package/index.js

@@ -715,36 +715,6 @@ Sqlite.prototype.table = function (name, key) {
     return db;
 };
 
-// close 方法已在文件前面部分实现，这里不再重复
-
-/**
- * 确保连接池对象存在
- */
-if (!$.pool) {
-    $.pool = {};
-}
-if (!$.pool.sqlite) {
-    $.pool.sqlite = {};
-}
-
-/**
- * Sqlite管理器，用于创建缓存
- * @param {String} scope 作用域
- * @param {Object} config 配置参数
- * @return {Object} 返回一个Sqlite类实例
- */
-function sqliteAdmin(scope, config) {
-    if (!scope) {
-        scope = 'sys';
-    }
-    var obj = $.pool.sqlite[scope];
-    if (!obj) {
-        $.pool.sqlite[scope] = new Sqlite(config);
-        obj = $.pool.sqlite[scope];
-    }
-    return obj;
-}
-
 /**
  * 创建SQLite连接
  * @private
@@ -919,6 +889,34 @@ Sqlite.prototype._closePool = function () {
     this.logger('debug', '连接池已关闭');
 };
 
+/**
+ * 确保连接池对象存在
+ */
+if (!$.pool) {
+    $.pool = {};
+}
+if (!$.pool.sqlite) {
+    $.pool.sqlite = {};
+}
+
+/**
+ * Sqlite管理器，用于创建缓存
+ * @param {String} scope 作用域
+ * @param {Object} config 配置参数
+ * @return {Object} 返回一个Sqlite类实例
+ */
+function sqliteAdmin(scope, config) {
+    if (!scope) {
+        scope = 'sys';
+    }
+    var obj = $.pool.sqlite[scope];
+    if (!obj) {
+        $.pool.sqlite[scope] = new Sqlite(config);
+        obj = $.pool.sqlite[scope];
+    }
+    return obj;
+}
+
 // 模块导出
 exports.Sqlite = Sqlite;
 exports.sqliteAdmin = sqliteAdmin;

package/package.json

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

package/sql.js

@@ -466,18 +466,18 @@ Sql.prototype.toWhere = function (obj, like) {
 				val = val.trim("'");
 			}
 			val = escape(val);
-			if (k.endWith('_min')) {
+			if (k.endsWith('_min')) {
 				where += " and " + escapeId(k.replace('_min', '')) + " >= " + val;
-			} else if (k.endWith('_max')) {
+			} else if (k.endsWith('_max')) {
 				where += " and " + escapeId(k.replace('_max', '')) + " <= " + val;
-			} else if (k.endWith('_not')) {
+			} else if (k.endsWith('_not')) {
 				where += " and " + escapeId(k.replace('_not', '')) + " != " + val;
-			} else if (k.endWith('_has')) {
+			} else if (k.endsWith('_has')) {
 				var vals = val.trim("'").split(',').map((o) => {
 					return "'" + o + "'"
 				});
 				where += " and " + escapeId(k.replace('_has', '')) + " in (" + vals.join(',') + ")";
-			} else if (k.endWith('_like')) {
+			} else if (k.endsWith('_like')) {
 				where += " and " + escapeId(k.replace('_like', '')) + " LIKE '%" + val.trim("'") + "%'";
 			} else if (typeof (val) === "string" && !/^[0-9]+$/.test(val)) {
 				where += " and " + escapeId(k) + " LIKE '%" + val.trim("'") + "%'"
@@ -492,13 +492,13 @@ Sql.prototype.toWhere = function (obj, like) {
 				val = val.trim("'");
 			}
 			val = escape(val);
-			if (k.endWith('_min')) {
+			if (k.endsWith('_min')) {
 				where += " and " + escapeId(k.replace('_min', '')) + " >= " + val;
-			} else if (k.endWith('_max')) {
+			} else if (k.endsWith('_max')) {
 				where += " and " + escapeId(k.replace('_max', '')) + " <= " + val;
-			} else if (k.endWith('_not')) {
+			} else if (k.endsWith('_not')) {
 				where += " and " + escapeId(k.replace('_not', '')) + " != " + val;
-			} else if (k.endWith('_has')) {
+			} else if (k.endsWith('_has')) {
 				var vals = val.trim("'").split(',').map((o) => {
 					return "'" + o + "'"
 				});
@@ -529,10 +529,10 @@ Sql.prototype.toSet = function (obj) {
 		}
 		val = escape(val);
 
-		if (k.endWith('_add')) {
+		if (k.endsWith('_add')) {
 			var k2 = escapeId(k.replace('_add', ''));
 			set += "," + k2 + " = " + k2 + " + " + val;
-		} else if (k.endWith('_del')) {
+		} else if (k.endsWith('_del')) {
 			var k3 = escapeId(k.replace('_del', ''));
 			set += "," + k3 + " = " + k3 + " - " + val;
 		} else {