neopg 0.0.0 → 0.0.1

package/lib/ModelChain.js

@@ -1,7 +1,8 @@
-'use strict';
+'use strict'
 
-const makeId = require('./makeId.js');
-const makeTimestamp = require('./makeTimestamp.js');
+const makeId = require('./makeId.js')
+const makeTimestamp = require('./makeTimestamp.js')
+const TransactionScope = require('./TransactionScope.js')
 
 /**
  * ModelChain - 链式查询构建器
@@ -50,68 +51,54 @@ class ModelChain {
    * 3. .where('age', '>', 18) -> age > 18 (兼容)
    */
   where(arg1, arg2, arg3) {
-    if (!arg1) return this
-
-    // 1. 识别 Postgres Fragment (Query)
-    // 依据指令：直接检测构造函数名称是否为 'Query'
-    if (arg1.constructor && arg1.constructor.name === 'Query') {
+      if (!arg1) return this
+      // 1. Fragment 检测
+      if (arg1.constructor && arg1.constructor.name === 'Query') {
         this._conditions.push(arg1)
         return this
-    }
-
-    // 2. 对象写法 .where({ id: 1, name: 'Neo' })
-    if (typeof arg1 === 'object' && !Array.isArray(arg1)) {
-      const keys = Object.keys(arg1)
-      if (keys.length === 0) return this
-
-      for (const key of keys) {
-        const val = arg1[key];
-        if (val === undefined) continue
-        
-        if (val === null) {
-           this._conditions.push(this.sql`${this.sql(key)} IS NULL`)
-        } else if (Array.isArray(val)) {
-           this._conditions.push(this.sql`${this.sql(key)} IN ${this.sql(val)}`)
-        } else {
-           this._conditions.push(this.sql`${this.sql(key)} = ${val}`)
-        }
       }
+      
+      // 2. Object 写法
+      if (typeof arg1 === 'object' && !Array.isArray(arg1)) {
+        for (const k of Object.keys(arg1)) {
+          const v = arg1[k]
 
-      return this
-    }
+          if (v === undefined) continue
 
-    // 3. 字符串/参数写法
-    if (typeof arg1 === 'string') {
-      // Case A: .where('id', 123)  => id = 123 (默认等于)
-      if (arg2 !== undefined && arg3 === undefined) {
-        this._conditions.push(this.sql`${this.sql(arg1)} = ${arg2}`)
-        return this
-      }
-      
-      // Case B: .where('age', '>', 18)
-      if (arg3 !== undefined) {
-        // 注意：中间的操作符必须用 sql.unsafe，因为它不是变量
-        this._conditions.push(this.sql`${this.sql(arg1)} ${this.sql.unsafe(arg2)} ${arg3}`)
+          if (v === null) this._conditions.push(this.sql`${this.sql(k)} IS NULL`)
+          else if (Array.isArray(v)) this._conditions.push(this.sql`${this.sql(k)} IN ${this.sql(v)}`)
+          else this._conditions.push(this.sql`${this.sql(k)} = ${v}`)
+        }
+  
         return this
       }
 
-      // Case C: .where('id = ?', 123) (简单兼容)
-      if (arg1.includes('?') && arg2 !== undefined) {
-        const parts = arg1.split('?')
-
-        // 只支持单个参数简单替换，复杂的请用 sql``
-        if (parts.length === 2) {
-           this._conditions.push(this.sql`${this.sql.unsafe(parts[0])}${arg2}${this.sql.unsafe(parts[1])}`)
-           return this
-        }
+      // 3. String 写法
+      if (typeof arg1 === 'string') {
+          // .where('age', '>', 18)
+          if (arg3 !== undefined) {
+             this._conditions.push(this.sql`${this.sql(arg1)} ${this.sql.unsafe(arg2)} ${arg3}`)
+             return this
+          }
+          // .where('age', 18) -> age = 18
+          if (arg2 !== undefined) {
+             this._conditions.push(this.sql`${this.sql(arg1)} = ${arg2}`)
+             return this
+          }
+          // .where('id = ?', 123)
+          if (arg1.includes('?') && arg2 !== undefined) {
+             const p = arg1.split('?');
+             if(p.length===2) {
+               this._conditions.push(this.sql`${this.sql.unsafe(p[0])}${arg2}${this.sql.unsafe(p[1])}`)
+               return this
+             }
+          }
+          // .where('1=1') -> Raw SQL
+          // 注意：这里必须用 unsafe，否则 '1=1' 会被当成字符串值处理
+          this._conditions.push(this.sql.unsafe(arg1))
       }
-      
-      // Case D: 纯字符串 (视为 Raw SQL)
-      // .where("status = 'active'")
-      this._conditions.push(this.sql.unsafe(arg1))
-    }
 
-    return this
+      return this
   }
 
   whereIf(condition, arg1, arg2, arg3) {
@@ -131,43 +118,29 @@ class ModelChain {
     return this
   }
 
-  /**
-   * 排序
-   * .order(sql`create_time DESC`)
-   * .order('create_time', 'DESC')
-   * .order({ create_time: 'DESC' })
-   */
-  order(arg1, arg2) {
-    if (!arg1) return this
+  orderby(a, b) {
+      if(!a) return this
 
-    // 1. Fragment
-    if (arg1.constructor && arg1.constructor.name === 'Query') {
-      this._order.push(arg1)
-      return this
-    }
-
-    // 2. Object { id: 'DESC' }
-    if (typeof arg1 === 'object') {
-      for (const key in arg1) {
-        const dir = arg1[key].toUpperCase()
-        this._order.push(this.sql`${this.sql(key)} ${this.sql.unsafe(dir)}`)
+      if(a.constructor && a.constructor.name==='Query') {
+        this._order.push(a)
+        return this
       }
 
-      return this
-    }
+      if(typeof a==='object') {
+        for(const k in a) {
+          this._order.push(this.sql`${this.sql(k)} ${this.sql.unsafe(a[k].toUpperCase())}`)
+        }
+        
+        return this
+      }
 
-    // 3. String ('id', 'DESC')
-    if (typeof arg1 === 'string') {
-      const dir = arg2 ? arg2.toUpperCase() : 'ASC'
-      // 检查 arg1 是否包含空格 (e.g. "id desc")
-      if (arg1.includes(' ')) {
-        this._order.push(this.sql.unsafe(arg1))
-      } else {
-        this._order.push(this.sql`${this.sql(arg1)} ${this.sql.unsafe(dir)}`)
+      if(typeof a==='string') {
+        const d = b ? b.toUpperCase() : 'ASC'
+        if(a.includes(' ')) this._order.push(this.sql.unsafe(a));
+        else this._order.push(this.sql`${this.sql(a)} ${this.sql.unsafe(d)}`);
       }
-    }
 
-    return this
+      return this
   }
 
   limit(count, offset = 0) {
@@ -190,44 +163,58 @@ class ModelChain {
     return this
   }
 
-  // --- 核心：执行方法 ---
+   // --- 辅助：构建 Where 片段 (修复 Bug 的核心) ---
+  _buildWhere() {
+    const len = this._conditions.length
+    if (len === 0) return this.sql``
+    
+    // 只有一个条件，直接返回，零开销
+    if (len === 1) {
+      return this.sql`WHERE ${this._conditions[0]}`
+    }
 
-  async find() {
-    const tableFragment = this.sql(this.tableName)
+    // 预分配数组：N个条件需要 N-1 个 'AND'，总长 2N-1
+    // 使用 new Array 预分配内存，比 push 更快
+    const parts = new Array(len * 2 - 1)
+    const AND = this.sql.unsafe(' AND ')
+
+    for (let i = 0; i < len; i++) {
+      // 偶数位放条件
+      parts[i * 2] = this._conditions[i]
+      // 奇数位放 AND (除了最后一位)
+      if (i < len - 1) {
+        parts[i * 2 + 1] = AND
+      }
+    }
 
-    const colsFragment = this._columns 
-        ? this.sql(this._columns) 
-        : this.sql`*`
+    // postgres.js 会自动展开这个扁平数组，性能极高
+    return this.sql`WHERE ${parts}`
+  }
 
-    const whereFragment = this._conditions.length 
-        ? this.sql`WHERE ${this.sql(this._conditions, ' AND ')}` 
-        : this.sql``
+  // --- 辅助：构建 Order 片段 (修复 Bug) ---
+  _buildOrder() {
+    if (this._order.length === 0) return this.sql``
+    // 数组直接传入模板，postgres.js 默认用逗号连接，这正是 ORDER BY 需要的
+    // 不能用 this.sql(this._order)，那样会试图转义为标识符
+    return this.sql`ORDER BY ${this._order}`
+  }
 
-    const orderFragment = this._order.length 
-        ? this.sql`ORDER BY ${this.sql(this._order)}` 
-        : this.sql``
-        
-    const limitFragment = this._limit 
-        ? this.sql`LIMIT ${this._limit}` 
-        : this.sql``
-        
-    const offsetFragment = this._offset 
-        ? this.sql`OFFSET ${this._offset}` 
-        : this.sql``
+  // --- 核心：执行方法 ---
+
+  async find() {
+    const t = this.sql(this.tableName)
+    const c = this._columns ? this.sql(this._columns) : this.sql`*`
     
-    const lockFragment = this._lock || this.sql``
-
-    const fullTable = this.sql`${this.sql(this.schema)}.${tableFragment}`
-
-    return await this.sql`
-      SELECT ${colsFragment} 
-      FROM ${fullTable}
-      ${whereFragment}
-      ${orderFragment}
-      ${limitFragment}
-      ${offsetFragment}
-      ${lockFragment}
-    `
+    // 修复：使用新方法构建
+    const w = this._buildWhere()
+    const o = this._buildOrder()
+
+    const l = this._limit ? this.sql`LIMIT ${this._limit}` : this.sql``
+    const off = this._offset ? this.sql`OFFSET ${this._offset}` : this.sql``
+    const lck = this._lock || this.sql``
+    const ft = this.sql`${this.sql(this.schema)}.${t}`
+    
+    return await this.sql`SELECT ${c} FROM ${ft} ${w} ${o} ${l} ${off} ${lck}`
   }
 
   // Thenable 接口
@@ -242,22 +229,15 @@ class ModelChain {
   }
 
   async count() {
-    const tableFragment = this.sql(this.tableName);
-    const whereFragment = this._conditions.length 
-        ? this.sql`WHERE ${this.sql(this._conditions, ' AND ')}` 
-        : this.sql``
+    const t = this.sql(this.tableName); 
+    // 修复：使用新方法构建
+    const w = this._buildWhere()
+    const ft = this.sql`${this.sql(this.schema)}.${t}`
     
-    const fullTable = this.sql`${this.sql(this.schema)}.${tableFragment}`
-
-    const result = await this.sql`
-        SELECT count(*) as total FROM ${fullTable} ${whereFragment}
-    `
-
-    return parseInt(result[0].total)
+    const r = await this.sql`SELECT count(*) as total FROM ${ft} ${w}`
+    return parseInt(r[0].total)
   }
 
-  // --- 写入方法 ---
-
   async insert(data) {
     const isArray = Array.isArray(data)
     const inputs = isArray ? data : [data]
@@ -268,54 +248,39 @@ class ModelChain {
     }
 
     const fullTable = this.sql`${this.sql(this.schema)}.${this.sql(this.tableName)}`
-
-    const result = await this.sql`
-      INSERT INTO ${fullTable} ${this.sql(inputs)}
-      RETURNING *
-    `
+    const result = await this.sql`INSERT INTO ${fullTable} ${this.sql(inputs)} RETURNING *`
 
     if (!isArray && result.length > 0) return result[0]
-
     return result
   }
 
   async update(data) {
     if (!data || Object.keys(data).length === 0) throw new Error('[NeoPG] Update data cannot be empty')
-
-    if (this.def) {
-      this._prepareDataForUpdate(data)
-    }
-
-    if (this._conditions.length === 0) {
-        throw new Error('[NeoPG] UPDATE requires a WHERE condition')
-    }
-
+    if (this.def) { 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 whereFragment = this.sql`WHERE ${this.sql(this._conditions, ' AND ')}`
-
-    // 使用 sql(data) 自动处理 set a=1, b=2
-    return await this.sql`
-      UPDATE ${fullTable}
-      SET ${this.sql(data)}
-      ${whereFragment}
-      RETURNING *
-    `
+    // 修复：使用新方法构建
+    const whereFragment = this._buildWhere()
+    
+    return await this.sql`UPDATE ${fullTable} SET ${this.sql(data)} ${whereFragment} RETURNING *`
   }
 
   async delete() {
-    if (this._conditions.length === 0) {
-        throw new Error('[NeoPG] DELETE requires a WHERE condition')
-    }
-
+    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 whereFragment = this._buildWhere()
+    
+    return await this.sql`DELETE FROM ${fullTable} ${whereFragment} RETURNING *`
+  }
 
-    const whereFragment = this.sql`WHERE ${this.sql(this._conditions, ' AND ')}`
-
-    return await this.sql`
-      DELETE FROM ${fullTable}
-      ${whereFragment}
-      RETURNING *
-    `
+  async transaction(callback) {
+    return await this.sql.begin(async (trxSql) => {
+      const scope = new TransactionScope(this.ctx, trxSql)
+      return await callback(scope)
+    })
   }
 
   // --- 内部辅助方法 ---

package/lib/ModelDef.js

@@ -10,6 +10,9 @@ class ModelDef {
     this.modelName = rawSchema.modelName || rawSchema.tableName
     this.primaryKey = rawSchema.primaryKey || 'id'
     this.columns = rawSchema.column || {}
+    this.index = rawSchema.index || []
+    this.unique = rawSchema.unique || []
+    this.removeIndex = rawSchema.removeIndex || []
 
     this._parseColumns()
 
@@ -57,7 +60,7 @@ class ModelDef {
         throw new Error(`[NeoPG] Column name '${k}' in table '${this.tableName}' is FORBIDDEN.`)
       }
 
-      if (!/^[a-z][a-z0-9_]*$/i.test(colName)) {
+      if (!(/^[a-z][a-z0-9_]*$/i).test(k)) {
          throw new Error(`[NeoPG] Column name '${k}' is invalid. Only alphanumeric and underscore allowed, must start with letter.`)
       }
     }

package/lib/NeoPG.js

@@ -20,7 +20,7 @@ class NeoPG {
 
   table(tableName, schema = null) {
     const target = schema || this.defaultSchema
-    return new this.ModelChain(this.driver, {tableName, isRaw: true}, target)
+    return new this.ModelChain(this, {tableName, isRaw: true}, target)
   }
 
   model(name, schema = null) {
@@ -28,7 +28,7 @@ class NeoPG {
     if (!item) throw new Error(`[NeoPG] Model '${name}' not found.`)
     
     const target = schema || this.defaultSchema
-    return new item.Class(this.driver, item.def, target)
+    return new item.Class(this, item.def, target)
   }
 
   // --- 注册 ---
@@ -64,6 +64,12 @@ class NeoPG {
 
   // --- 同步 ---
   async sync(options = {}) {
+    if (!options || typeof options !== 'object') {
+      options = {}
+    }
+
+    if (!options.schema) options.schema = this.defaultSchema
+
     for (const item of this.registry.values()) {
       await SchemaSync.execute(this.driver, item.def, this, options)
     }

package/lib/SchemaSync.js

@@ -32,14 +32,18 @@ const DefaultWithType = ['varchar', 'char', 'text', 'bytea', 'timestamp', 'times
 
 class SchemaSync {
 
+  static async createSchema(sql, schema) {
+    return sql.unsafe(`create schema if not exists ${schema};`)
+  }
+
   /**
    * 入口方法
    */
   static async execute(sql, def, ctx, options = {}) {
     const debug = options.debug || false;
     const force = options.force || false;
-    const dropNotExistCol = options.dropNotExistCol || false;
-    const schema = ctx.defaultSchema || 'public';
+    const dropNotExistCol = force || options.dropNotExistCol || false;
+    const schema = options.schema || ctx.defaultSchema || 'public';
     const tableName = def.tableName;
     const curTableName = `${schema}.${tableName}`;
 
@@ -130,7 +134,7 @@ class SchemaSync {
 
         if (col.default !== undefined) {
           if (col.default === null) line += ' default null';
-          else line += ` default $${qtag}$${col.default}$${qtag}$`;
+          else line += ` default $_${qtag}_$${col.default}$_${qtag}_$`;
         }
       }
       colSqls.push(line);
@@ -190,7 +194,7 @@ class SchemaSync {
 
         if (col.default !== undefined) {
             if (col.default === null) addSql += ' default null';
-            else addSql += ` default $${qtag}$${col.default}$${qtag}$`;
+            else addSql += ` default $_${qtag}_$${col.default}$_${qtag}_$`;
         }
 
         if (debug) console.log(addSql);
@@ -215,7 +219,7 @@ class SchemaSync {
              await sql.unsafe(`ALTER TABLE ${curTableName} DROP COLUMN ${this.fmtColName(k)}`);
              let reAddSql = `ALTER TABLE ${curTableName} ADD COLUMN ${this.fmtColName(k)} ${col.type}`;
              if (col.notNull !== false) reAddSql += ' not null';
-             if (col.default !== undefined) reAddSql += ` default $${qtag}$${col.default}$${qtag}$`;
+             if (col.default !== undefined) reAddSql += ` default $_${qtag}_$${col.default}$_${qtag}_$`;
              await sql.unsafe(reAddSql);
              col.changed = true; // 标记变更，供外键处理使用
              continue;
@@ -240,7 +244,7 @@ class SchemaSync {
         // 简单比对逻辑 (注：PG存储的默认值格式可能不同，这里仅作简单触发)
         // 实际生产中可能需要更复杂的解析，这里保留原逻辑结构
         // 原逻辑用了 _realDefault 方法，这里我们简单处理，仅当需要时设置
-        let default_val_sql = col.default === null ? 'null' : `$${qtag}$${col.default}$${qtag}$`;
+        let default_val_sql = col.default === null ? 'null' : `$_${qtag}_$${col.default}$_${qtag}_$`;
         // 这里为了简化，每次都重设默认值（开销很小），或者你需要实现 _realDefault
         await sql.unsafe(`ALTER TABLE ${curTableName} ALTER COLUMN ${this.fmtColName(k)} SET DEFAULT ${default_val_sql}`);
       }
@@ -271,12 +275,12 @@ class SchemaSync {
   static async syncIndex(sql, def, schema, curTableName, debug) {
     // 假设索引定义在 def.rawSchema.index (数组)
     // ModelDef 需要暴露这个属性，或 def.indices
-    const indices = def.rawSchema && def.rawSchema.index ? def.rawSchema.index : [];
+    const indices = def.index || [];
     if (!Array.isArray(indices)) return;
 
     for (const indname of indices) {
         // 检查 removeIndex 配置
-        const removeIndex = def.rawSchema.removeIndex || [];
+        const removeIndex = def.removeIndex || [];
         if (removeIndex.includes(indname)) continue;
 
         // 检查列是否存在
@@ -310,7 +314,7 @@ class SchemaSync {
   }
 
   static async syncUnique(sql, def, schema, curTableName, debug) {
-      const uniques = def.rawSchema && def.rawSchema.unique ? def.rawSchema.unique : [];
+      const uniques = def.unique || [];
       if (!Array.isArray(uniques)) return;
 
       for (const indname of uniques) {
@@ -347,8 +351,8 @@ class SchemaSync {
       const currentIdxNames = allIdx.map(i => i.indexname);
       
       // 2. 计算应该保留的索引名
-      const indices = def.rawSchema && def.rawSchema.index ? def.rawSchema.index : [];
-      const uniques = def.rawSchema && def.rawSchema.unique ? def.rawSchema.unique : [];
+      const indices = def.index || [];
+      const uniques = def.unique || [];
       
       const keepSet = new Set();
       const makeName = (n) => `${tableName}_${n.split(',').map(x=>x.trim()).filter(x=>x).join('_')}_idx`;

package/lib/TransactionScope.js

@@ -9,14 +9,14 @@ class TransactionScope {
 
   table(tableName, schema = null) {
     const target = schema || this.parent.defaultSchema
-    return new this.parent.ModelChain(this.driver, {tableName, isRaw: true}, target)
+    return new this.parent.ModelChain(this, {tableName, isRaw: true}, target)
   }
 
   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.driver, item.def, target)
+    return new item.Class(this, item.def, target)
   }
 
   async transaction(callback) {

package/package.json

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

package/test/test-db.js

@@ -1,44 +1,177 @@
 // index.js
 const NeoPG = require('../lib/NeoPG.js')
-const ModelChain = NeoPG.ModelChain
+const {dataTypes, ModelChain} = NeoPG
 
 // 1. 初始化
 const db = new NeoPG({
   host: '127.0.0.1',
-  database: 'eoms',
-  schema: 'ai' // 全局默认 Schema
+  user: 'wy',
+  database: 'wdata',
+  schema: 'test'
 });
 
 // 2. 定义模型
-const UserSchema = {
+const User = {
   modelName: 'User',
-  tableName: 'sys_users',
+  tableName: 'users',
+  primaryKey: 'id',
+
   column: {
-    id: { type: 'varchar', primaryKey: true },
-    name: { type: 'varchar', notNull: true },
-    age: { type: 'int', default: 18 }
-  }
-};
+    id : {
+      type: dataTypes.UID
+    },
+
+    /**
+     * @type {column}
+     */
+    username: {
+      type: dataTypes.STRING(50)
+    },
+
+    mobile: {
+      type: dataTypes.STRING(16)
+    },
+
+    mobile_state: {
+      type: dataTypes.SMALLINT,
+      default: 0
+    },
+
+    //真实姓名
+    realname: {
+      type: dataTypes.STRING(50),
+      default: ''
+    },
+
+    sex: {
+      type: dataTypes.SMALLINT,
+      default: 0
+    },
+
+    //其他信息，以JSON格式存储
+    info: {
+      type: dataTypes.TEXT,
+      default: ''
+    },
+
+    /**
+     * @type {column}
+     */
+    passwd: {
+      type: dataTypes.STRING(240)
+    },
+
+    //当验证失败，需要进行重复密码验证
+    repasswd: {
+      type: dataTypes.STRING(240)
+    },
+
+    //通过触摸手势或轨迹生成的密码
+    touchpass: {
+      type: dataTypes.STRING(300)
+    },
+
+    is_external: {
+      type: dataTypes.SMALLINT,
+      default: 0
+    },
+
+    /**
+     * @type {column}
+     */
+    level: {
+      type: 'smallint',
+      default: 1,
+      validate: v => {
+        return v >= 0 && v < 99
+      }
+    },
+
+    /**
+     * @type {column}
+     */
+    email: {
+      type: dataTypes.STRING(60),
+      default: ''
+    },
+
+    email_state: {
+      type: dataTypes.SMALLINT,
+      default: 0
+    },
+
+    create_time: {
+      type: dataTypes.BIGINT,
+      default: 0,
+      timestamp: 'insert'
+    },
+
+    update_time: {
+      type: dataTypes.BIGINT,
+      default: 0,
+      timestamp: 'update'
+    },
+
+    failed_count: {
+      type: dataTypes.INT,
+      default: 0
+    },
+
+    failed_time: {
+      type: dataTypes.BIGINT,
+      default: 0
+    },
+
+    forbid: {
+      type: dataTypes.SMALLINT,
+      default: 0
+    },
+
+    is_root: {
+      type: dataTypes.SMALLINT,
+      default: 0
+    }
+  },
+
+  //索引
+  index: [
+    'create_time',
+    'level',
+    'is_root'
+  ],
+
+  //唯一索引
+  unique: [
+    'username',
+    'email',
+    'mobile'
+  ]
+}
 
 // 3. 注册
-db.add(UserSchema);
+db.add(User);
 
 ;(async () => {
+  await db.sync({force: true, debug: true})
   // 插入
-  await db.model('User').insert({ name: 'Neo' });
 
-  // 动态切换 Schema
-  await db.model('User', 'tenant_a').select();
-  
-  // 链式切换
-  await db.model('User').schema('tenant_b').where({ age: 20 }).select();
+  await db.model('User').insert({username: 'Neo', level: Math.floor((Math.random() * 101))})
 
   // 事务
   await db.transaction(async tx => {
-    await tx.model('User').update({ age: 99 });
+    let data = {
+      level: Math.floor(Math.random() * 101),
+      info: `age=${Math.floor(Math.random() * 10 + 20)}`
+    }
+
+    console.log('update', data)
+    await tx.model('User').where(tx.sql`level > 10`).update(data)
+
     // 嵌套
-    await tx.transaction(async subTx => {
+    /* await tx.transaction(async subTx => {
        await subTx.table('logs').insert({ msg: 'log' });
-    });
+    }); */
   });
+
+  db.close()
 })();