typeorm 0.3.18-dev.ad5bf11 → 0.3.18-dev.b5ec088

package/browser/driver/sqlserver/SqlServerQueryRunner.js

@@ -17,6 +17,7 @@ import { TypeORMError } from "../../error";
 import { QueryLock } from "../../query-runner/QueryLock";
 import { MetadataTableType } from "../types/MetadataTableType";
 import { InstanceChecker } from "../../util/InstanceChecker";
+import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 /**
  * Runs queries on a single SQL Server database connection.
  */
@@ -76,6 +77,7 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
                 ok();
             };
             if (this.transactionDepth === 0) {
+                this.transactionDepth += 1;
                 const pool = await (this.mode === "slave"
                     ? this.driver.obtainSlaveConnection()
                     : this.driver.obtainMasterConnection());
@@ -90,10 +92,10 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
                 }
             }
             else {
-                await this.query(`SAVE TRANSACTION typeorm_${this.transactionDepth}`);
+                this.transactionDepth += 1;
+                await this.query(`SAVE TRANSACTION typeorm_${this.transactionDepth - 1}`);
                 ok();
             }
-            this.transactionDepth += 1;
         });
         await this.broadcaster.broadcast("AfterTransactionStart");
     }
@@ -109,6 +111,7 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
         await this.broadcaster.broadcast("BeforeTransactionCommit");
         if (this.transactionDepth === 1) {
             return new Promise((ok, fail) => {
+                this.transactionDepth -= 1;
                 this.databaseConnection.commit(async (err) => {
                     if (err)
                         return fail(err);
@@ -117,7 +120,6 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
                     await this.broadcaster.broadcast("AfterTransactionCommit");
                     ok();
                     this.connection.logger.logQuery("COMMIT");
-                    this.transactionDepth -= 1;
                 });
             });
         }
@@ -134,11 +136,12 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
             throw new TransactionNotStartedError();
         await this.broadcaster.broadcast("BeforeTransactionRollback");
         if (this.transactionDepth > 1) {
-            await this.query(`ROLLBACK TRANSACTION typeorm_${this.transactionDepth - 1}`);
             this.transactionDepth -= 1;
+            await this.query(`ROLLBACK TRANSACTION typeorm_${this.transactionDepth}`);
         }
         else {
             return new Promise((ok, fail) => {
+                this.transactionDepth -= 1;
                 this.databaseConnection.rollback(async (err) => {
                     if (err)
                         return fail(err);
@@ -147,7 +150,6 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
                     await this.broadcaster.broadcast("AfterTransactionRollback");
                     ok();
                     this.connection.logger.logQuery("ROLLBACK");
-                    this.transactionDepth -= 1;
                 });
             });
         }
@@ -159,8 +161,10 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError();
         const release = await this.lock.acquire();
+        const broadcasterResult = new BroadcasterResult();
         try {
             this.driver.connection.logger.logQuery(query, parameters, this);
+            this.broadcaster.broadcastBeforeQueryEvent(broadcasterResult, query, parameters);
             const pool = await (this.mode === "slave"
                 ? this.driver.obtainSlaveConnection()
                 : this.driver.obtainMasterConnection());
@@ -189,6 +193,7 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
                     const maxQueryExecutionTime = this.driver.options.maxQueryExecutionTime;
                     const queryEndTime = +new Date();
                     const queryExecutionTime = queryEndTime - queryStartTime;
+                    this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, true, queryExecutionTime, raw, undefined);
                     if (maxQueryExecutionTime &&
                         queryExecutionTime > maxQueryExecutionTime) {
                         this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
@@ -224,9 +229,11 @@ export class SqlServerQueryRunner extends BaseQueryRunner {
         }
         catch (err) {
             this.driver.connection.logger.logQueryError(err, query, parameters, this);
+            this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, false, undefined, undefined, err);
             throw err;
         }
         finally {
+            await broadcasterResult.wait();
             release();
         }
     }