neopg 2.1.0 → 2.2.0

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/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.0",
   "description": "orm for postgres",
   "keywords": [
     "neopg",