neopg 2.0.3 → 2.0.5

package/lib/ModelChain.js

@@ -2,6 +2,7 @@
 
 const makeId = require('./makeId.js')
 const makeTimestamp = require('./makeTimestamp.js')
+const serialId = makeId.serialId
 
 // 提取常量定义
 const INT_TYPES = new Set([
@@ -16,12 +17,10 @@ const FLOAT_TYPES = new Set([
 ])
 
 class ModelChain {
-  constructor(ctx, def, schema = 'public') {
+  constructor(ctx, def, schema='public') {
     this.ctx = ctx
     this.def = def
-    this.sql = ctx.sql
-    
-    this.tableName = def.tableName
+    this.sql = ctx ? ctx.sql : null
     this.schema = schema
 
     // --- 查询状态 ---
@@ -35,7 +34,7 @@ class ModelChain {
     this._group = []
     this._lock = null
 
-    this._isRaw = !!def.isRaw
+    this._isRaw = false
     this._executed = false
   }
 
@@ -50,7 +49,7 @@ class ModelChain {
   _ensureActive() {
     if (this._executed) {
       throw new Error(
-        `[NeoPG] ModelChain for '${this.tableName}' has already been executed. ` +
+        `[NeoPG] ModelChain for '${this.def.tableName}' has already been executed. ` +
         `Do NOT reuse the chain variable. Use .clone() if you need to fork queries.`
       )
     }
@@ -266,7 +265,7 @@ class ModelChain {
   }
 
   _buildSelectQuery() {
-    const t = this.sql(this.tableName)
+    const t = this.sql(this.def.tableName)
     const c = this._columns ? this.sql(this._columns) : this.sql`*`
     
     const w = this._buildWhere()
@@ -310,7 +309,7 @@ class ModelChain {
       const dataQuery = this._buildSelectQuery()
 
       // 2. 总数查询
-      const t = this.sql(this.tableName)
+      const t = this.sql(this.def.tableName)
       const w = this._buildWhere()
       const j = this._buildJoins()
       const g = this._buildGroup()
@@ -338,7 +337,7 @@ class ModelChain {
   async count() {
     this._ensureActive()
     try {
-      const t = this.sql(this.tableName)
+      const t = this.sql(this.def.tableName)
       const w = this._buildWhere()
       const j = this._buildJoins()
       const g = this._buildGroup()
@@ -366,11 +365,11 @@ class ModelChain {
       const inputs = isArray ? data : [data]
       if (inputs.length === 0) throw new Error('[NeoPG] Insert data cannot be empty')
 
-      if (this.def) {
+      if (!this._isRaw) {
         this._prepareDataForInsert(inputs)
       }
 
-      const fullTable = this.sql`${this.sql(this.schema)}.${this.sql(this.tableName)}`
+      const fullTable = this.sql`${this.sql(this.schema)}.${this.sql(this.def.tableName)}`
       const retFragment = this._buildReturning()
 
       const result = await this.sql`INSERT INTO ${fullTable} ${this.sql(inputs)} ${retFragment}`
@@ -389,10 +388,14 @@ class ModelChain {
     this._ensureActive()
     try {
       if (!data || Object.keys(data).length === 0) throw new Error('[NeoPG] Update data cannot be empty')
-      if (this.def) { this._prepareDataForUpdate(data) }
+      
+        if (!this._isRaw) {
+        this._prepareDataForUpdate(data)
+      }
+
       if (this._conditions.length === 0) throw new Error('[NeoPG] UPDATE requires a WHERE condition')
       
-      const fullTable = this.sql`${this.sql(this.schema)}.${this.sql(this.tableName)}`
+      const fullTable = this.sql`${this.sql(this.schema)}.${this.sql(this.def.tableName)}`
       const whereFragment = this._buildWhere()
       const retFragment = this._buildReturning()
       
@@ -412,7 +415,7 @@ class ModelChain {
     this._ensureActive()
     try {
       if (this._conditions.length === 0) throw new Error('[NeoPG] DELETE requires a WHERE condition')
-      const fullTable = this.sql`${this.sql(this.schema)}.${this.sql(this.tableName)}`
+      const fullTable = this.sql`${this.sql(this.schema)}.${this.sql(this.def.tableName)}`
       const whereFragment = this._buildWhere()
       const retFragment = this._buildReturning()
         
@@ -432,7 +435,7 @@ class ModelChain {
     try {
         if (!field) throw new Error(`[NeoPG] ${func} requires a field name.`)
 
-        const t = this.sql(this.tableName)
+        const t = this.sql(this.def.tableName)
         const w = this._buildWhere()
         const j = this._buildJoins()
         const ft = this.sql`${this.sql(this.schema)}.${t}`
@@ -524,9 +527,11 @@ class ModelChain {
       if (autoId && row[pk] === undefined) {
         row[pk] = this.def.makeId(pkLen)
       }
+
       if (make_timestamp) {
         for (const t of ts.insert) makeTimestamp(row, t)
       }
+
       for (const key in row) {
         this.def.validateField(key, row[key])
       }
@@ -538,10 +543,15 @@ class ModelChain {
     if (ts.update && ts.update.length > 0) {
       for (const t of ts.update) makeTimestamp(row, t)
     }
+
     for (const key in row) {
       this.def.validateField(key, row[key])
     }
   }
+
+  makeId(len=16) {
+    return this.def ? this.def.makeId(this.def.pkLen) : serialId(len)
+  }
 }
 
 module.exports = ModelChain

package/lib/NeoPG.js

@@ -35,7 +35,9 @@ class NeoPG {
 
   table(tableName, schema = null) {
     const target = schema || this.defaultSchema
-    return new this.ModelChain(this, {tableName, isRaw: true}, target)
+    let m = new this.ModelChain(this, {tableName, isRaw: true}, target)
+    m._isRaw = true
+    return m
   }
 
   model(name, schema = null) {
@@ -43,7 +45,16 @@ class NeoPG {
     if (!item) throw new Error(`[NeoPG] Model '${name}' not found.`)
     
     const target = schema || this.defaultSchema
-    return new item.Class(this, item.def, target)
+    let m = new item.Class(this, item.def, target)
+
+    if (!m.def) {
+      m.ctx = this
+      m.sql = this.sql
+      m.def = item.def
+      m.schema = target
+    }
+
+    return m
   }
 
   // --- 注册 ---
@@ -80,7 +91,6 @@ class NeoPG {
         // 此时说明modelName无法确定，但是tableName也没有指定
         throw new Error(`\x1b[31m[NeoPG] Missing modelName and tableName\x1b[0m`)
       }
-      // 3. 如果依然无法确定，稍后 ModelDef 可能会报错，或者你可以选择在这里抛出
     }
 
     //经过以上处理，modelName已经确定了，此时若没有指定tableName则把modelName转换为小写作为tableName
@@ -144,7 +154,7 @@ class NeoPG {
       let model = this.registry.get(options.model)
 
       if (!model) {
-        throw new Error(`[NeoPG] sync: ${modelname} not found.`)
+        throw new Error(`[NeoPG] sync: ${options.model} not found.`)
       }
 
       return await SchemaSync.execute(this.driver, model.def, this, options)

package/package.json

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

package/test/test-db.js

@@ -162,6 +162,10 @@ db.add(User)
         }
       }
     }
+
+    constructor() {
+      super()
+    }
   }
 
   db.define(ShopOrder)
@@ -190,6 +194,23 @@ db.add(User)
 
   db.sync({force: true, debug: true, model: 'ShopOrder'})
 
+  await db.model('ShopOrder').where('1=1').delete()
+  await db.model('ShopOrder').insert([
+    {
+      name: 'topbit',
+      order_no: Math.random().toString(16)
+    },
+
+    {
+      name: 'neopg',
+      order_no: Math.random().toString(16)
+    }
+  ])
+
+  console.log('get shoporder...\n',
+    await db.model('ShopOrder').where('1=1').find()
+  )
+
   await db.model('User').where('1=1').delete()
 
   try {