neopg 2.1.0 → 2.2.1

package/lib/ModelChain.js

@@ -49,8 +49,13 @@ class ModelChain {
   _ensureActive() {
     if (this._executed) {
       throw new Error(
-        `[NeoPG] ModelChain for '${this.def.tableName}' has already been executed. ` +
-        `Do NOT reuse the chain variable. Use .clone() if you need to fork queries.`
+        `[NeoPG] Security Error: This query chain for \x1b[36m'${this.def.tableName}'\x1b[0m has already been executed to prevent state pollution.\n` +
+        `❌ Do NOT reuse the same variable for multiple executions.\n` +
+        `✅ If you need to execute multiple queries based on the same conditions, use .clone() before execution.\n\x1b[35m` +
+        `   Example: \n` +
+        `   const q = model.where(...);\n` +
+        `   const data = await q.clone().find();\n` +
+        `   await q.clone().update(...);\x1b[0m`
       )
     }
   }

package/lib/SchemaSync.js

@@ -299,7 +299,7 @@ class SchemaSync {
             continue;
         }
 
-        const idxCols = indname.split(',').map(s=>s.trim()).filter(s=>s);
+        let idxCols = Array.isArray(indname) ? indname : indname.split(',').map(s=>s.trim()).filter(s=>s);
         const idxNamePart = idxCols.join('_');
         const targetIdxName = `${def.tableName}_${idxNamePart}_idx`;
 
@@ -329,7 +329,7 @@ class SchemaSync {
       for (const indname of uniques) {
           if (!this._checkColumnsExist(indname, def)) continue;
 
-          const idxCols = indname.split(',').map(s=>s.trim()).filter(s=>s);
+          let idxCols = Array.isArray(indname) ? indname : indname.split(',').map(s=>s.trim()).filter(s=>s);
 
           // 监测是否等于主键
           if (pkSet.size > 0 && idxCols.length === pkSet.size) {
@@ -372,7 +372,7 @@ class SchemaSync {
       const uniques = def.unique || [];
       
       const keepSet = new Set();
-      const makeName = (n) => `${tableName}_${n.split(',').map(x=>x.trim()).filter(x=>x).join('_')}_idx`;
+      const makeName = (n) => `${tableName}_${Array.isArray(n) ? n.map(x=>x.trim()).join('_') : n.split(',').map(x=>x.trim()).filter(x=>x).join('_')}_idx`;
 
       indices.forEach(n => keepSet.add(makeName(n)));
       uniques.forEach(n => keepSet.add(makeName(n)));
@@ -483,7 +483,13 @@ class SchemaSync {
   }
 
   static _checkColumnsExist(colsStr, def) {
-      const parts = colsStr.split(',').map(x=>x.trim()).filter(x=>x);
+      let parts;
+      if (Array.isArray(colsStr)) {
+        parts = colsStr;
+      } else {
+        parts = colsStr.split(',').map(x=>x.trim()).filter(x=>x);
+      }
+
       for (const p of parts) {
           if (!def.columns[p]) return false;
       }
@@ -501,4 +507,4 @@ class SchemaSync {
   }
 }
 
-module.exports = SchemaSync
+module.exports = SchemaSync

package/lib/TransactionScope.js

@@ -9,14 +9,24 @@ class TransactionScope {
 
   table(tableName, schema = null) {
     const target = schema || this.parent.defaultSchema
-    return new this.parent.ModelChain(this, {tableName, isRaw: true}, target)
+    let m = new this.parent.ModelChain(this, {tableName, isRaw: true}, target)
+    m._isRaw = true
+    return m
   }
 
   model(name, schema = null) {
     const item = this.parent.registry.get(name)
     if (!item) throw new Error(`[NeoPG] Model '${name}' not found.`)
     const target = schema || this.parent.defaultSchema
-    return new item.Class(this, item.def, target)
+    let m = new item.Class(this, item.def, target)
+    if (!m.def) {
+      m.def = item.def
+      m.ctx = this.parent
+      m.sql = this.sql
+      m.schema = target
+    }
+
+    return m
   }
 
   async transaction(callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neopg",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "orm for postgres",
   "keywords": [
     "neopg",

package/test/test-db.js

@@ -129,13 +129,16 @@ const User = {
   index: [
     'create_time',
     'level',
-    'is_root'
+    'is_root',
+    ['level', 'is_root']
   ],
 
   //唯一索引
   unique: [
     'username',
-    'email', 'id'
+    'email', 'id',
+    ['mobile', 'email']
+
   ]
 }