Fix error on transaction

src/model/_base.js

@@ -1,6 +1,9 @@
 'use strict';
 
 import Validator from '../core/think_validate.js';
+
+let forceNewNum = 1;
+
 /**
  * base model class
  */
@@ -120,12 +123,16 @@ export default class extends think.base {
    * get db instance
    * @return {Object} []
    */
-  db(){
-    if (this._db) {
+  db(forceNew = false){
+    if (this._db && !forceNew) {
       return this._db;
     }
     let DB = think.adapter('db', this.config.type || 'mysql');
-    this._db = new DB(this.config);
+    let config = this.config;
+    if(forceNew){
+      config = think.extend({}, config, {forceNewNum: forceNewNum++});
+    }
+    this._db = new DB(config);
     return this._db;
   }
   /**

src/model/base.js

@@ -597,21 +597,27 @@ export default class extends Base {
    * @return {Promise} []
    */
   startTrans(){
-    return this.db().startTrans();
+    return this.db(true).startTrans();
   }
   /**
    * commit transcation
    * @return {Promise} []
    */
-  commit(){
-    return this.db().commit();
+  async commit(){
+    let data = await this.db().commit();
+    this.close();
+    this._db = null;
+    return data;
   }
   /**
    * rollback transaction
    * @return {Promise} []
    */
-  rollback(){
-    return this.db().rollback();
+  async rollback(){
+    let data = await this.db().rollback();
+    this.close();
+    this._db = null;
+    return data;
   }
   /**
    * transaction exec functions

test/model/base.js

@@ -1104,16 +1104,18 @@ describe('model/base.js', function(){
       return instance.commit();
     }).then(function(data){
       var sql = instance.getLastSql();
-      assert.equal(sql, 'COMMIT');
+      assert.equal(sql, '');
       done();
+    }).catch(function(err){
+      console.log(err)
     })
   })
   it('rollback', function(done){
     instance.startTrans().then(function(){
       return instance.rollback();
     }).then(function(data){
       var sql = instance.getLastSql();
-      assert.equal(sql, 'ROLLBACK');
+      assert.equal(sql, '');
       done();
     })
   })
@@ -1125,7 +1127,7 @@ describe('model/base.js', function(){
       })
     }).then(function(){
       var sql = instance.getLastSql();
-      assert.equal(sql, 'COMMIT');
+      assert.equal(sql, '');
       done();
     })
   })
@@ -1134,7 +1136,7 @@ describe('model/base.js', function(){
       return Promise.reject(new Error('error'))
     }).then(function(){
       var sql = instance.getLastSql();
-      assert.equal(sql, 'ROLLBACK');
+      assert.equal(sql, '');
       done();
     })
   })