neopg 2.2.9 → 2.3.1

package/lib/ModelChain.js

@@ -44,6 +44,14 @@ class ModelChain {
     }
   }
 
+  get self() {
+    if (!this.ctx || !this.def || !this.def.modelName) {
+        throw new Error('[NeoPG] Cannot use .self on unregistered or raw ModelChain')
+    }
+
+    return this.ctx.model(this.def.modelName, this.schema)
+  }
+
   // --- 内部状态管理 ---
 
   _ensureActive() {
@@ -443,7 +451,10 @@ class ModelChain {
       const result = await this.sql`UPDATE ${fullTable} SET ${this.sql(data)} ${whereFragment} ${retFragment}`
 
       if (this._returning && this._returning.length > 0) {
-          if (result.length === 1 && one_result) return result[0]
+          if (one_result && result.length < 2) {
+            return result[0] ?? null
+          }
+
           return result
       }
       return result

package/lib/NeoPG.js

@@ -84,7 +84,7 @@ class NeoPG {
       } else if (rawSchema.tableName) {
         rawSchema.modelName = toPascalCase(rawSchema.tableName)
         setTimeout(() => {
-          console.error(`\x1b[33;5m[NeoPG]Warning: modelName is not specified, `
+          console.error(`\x1b[33;3m[NeoPG]Warning: modelName is not specified, `
                 + `use ${rawSchema.modelName} as the modelName\x1b[0m`)
         }, 100)
       } else {
@@ -98,13 +98,13 @@ class NeoPG {
       rawSchema.tableName = rawSchema.modelName.toLowerCase()
 
       setTimeout(() => {
-        console.error(`\x1b[33;5m[NeoPG]Warning: tableName is not specified, `
+        console.error(`\x1b[33;7m[NeoPG]Warning: tableName is not specified, `
               + `use ${rawSchema.modelName.toLowerCase()} as the tableName\x1b[0m`)
       }, 100)
     }
 
     if ((/[a-z]/).test(rawSchema.modelName[0])) {
-      throw new Error(`\x1b[31;5m[NeoPG] ${rawSchema.modelName}: modelName must start with an uppercase letter.\x1b[0m`)
+      throw new Error(`\x1b[31;7m[NeoPG] ${rawSchema.modelName}: modelName must start with an uppercase letter.\x1b[0m`)
     }
 
     const def = new ModelDef(rawSchema)

package/lib/TransactionScope.js

@@ -22,7 +22,8 @@ class TransactionScope {
     let m = new item.Class(this, item.def, target)
     if (!m.def) {
       m.def = item.def
-      m.ctx = this.parent
+      //fix: m.ctx = this.parent
+      m.ctx = this
       m.sql = this.sql
       m.schema = target
     }

package/package.json

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

package/test/test-db.js

@@ -300,15 +300,16 @@ db.add(User)
     
     console.log(upd_result.count, upd_result.columns, upd_result)
 
+    let User = tx.model('User')
     let sex = 3
     console.log(
       'test condition or',
-      await tx.model('User').where(tx.sql`(sex = ${sex} or level > 10)`).select(['id', 'level', 'username', 'sex']).find()
+      await User.self.where(tx.sql`(sex = ${sex} or level > 10)`).select(['id', 'level', 'username', 'sex']).find()
     )
 
     console.log(
       'test select *',
-      await tx.model('User').orderby('level', 'DESC').orderby('id', 'ASC').select().find()
+      await User.self.orderby('level', 'DESC').orderby('id', 'ASC').select().find()
     )
 
     console.log(