typeorm 0.2.39-dev.d8c5812 → 0.2.39-dev.f79ae58

package/browser/driver/sqlserver/SqlServerQueryRunner.js

@@ -16,7 +16,6 @@ import { Broadcaster } from "../../subscriber/Broadcaster";
 import { OrmUtils } from "../../util/OrmUtils";
 import { Query } from "../Query";
 import { MssqlParameter } from "./MssqlParameter";
-import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 import { TypeORMError } from "../../error";
 import { QueryLock } from "../../query-runner/QueryLock";
 /**
@@ -62,7 +61,6 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.startTransaction = function (isolationLevel) {
         return __awaiter(this, void 0, void 0, function () {
-            var beforeBroadcastResult;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -71,52 +69,44 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                             throw new QueryRunnerAlreadyReleasedError();
                         if (this.isTransactionActive)
                             throw new TransactionAlreadyStartedError();
-                        beforeBroadcastResult = new BroadcasterResult();
-                        this.broadcaster.broadcastBeforeTransactionStartEvent(beforeBroadcastResult);
-                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
+                        return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionStart')];
                     case 1:
                         _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, new Promise(function (ok, fail) { return __awaiter(_this, void 0, void 0, function () {
-                            var pool, transactionCallback, afterBroadcastResult;
-                            var _this = this;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        this.isTransactionActive = true;
-                                        return [4 /*yield*/, (this.mode === "slave" ? this.driver.obtainSlaveConnection() : this.driver.obtainMasterConnection())];
-                                    case 1:
-                                        pool = _a.sent();
-                                        this.databaseConnection = pool.transaction();
-                                        transactionCallback = function (err) {
-                                            if (err) {
-                                                _this.isTransactionActive = false;
-                                                return fail(err);
-                                            }
-                                            ok();
-                                            _this.connection.logger.logQuery("BEGIN TRANSACTION");
+                        return [2 /*return*/, new Promise(function (ok, fail) { return __awaiter(_this, void 0, void 0, function () {
+                                var pool, transactionCallback;
+                                var _this = this;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            this.isTransactionActive = true;
+                                            return [4 /*yield*/, (this.mode === "slave" ? this.driver.obtainSlaveConnection() : this.driver.obtainMasterConnection())];
+                                        case 1:
+                                            pool = _a.sent();
+                                            this.databaseConnection = pool.transaction();
+                                            transactionCallback = function (err) {
+                                                if (err) {
+                                                    _this.isTransactionActive = false;
+                                                    return fail(err);
+                                                }
+                                                ok();
+                                                _this.connection.logger.logQuery("BEGIN TRANSACTION");
+                                                if (isolationLevel) {
+                                                    _this.connection.logger.logQuery("SET TRANSACTION ISOLATION LEVEL " + isolationLevel);
+                                                }
+                                            };
                                             if (isolationLevel) {
-                                                _this.connection.logger.logQuery("SET TRANSACTION ISOLATION LEVEL " + isolationLevel);
+                                                this.databaseConnection.begin(this.convertIsolationLevel(isolationLevel), transactionCallback);
                                             }
-                                        };
-                                        if (isolationLevel) {
-                                            this.databaseConnection.begin(this.convertIsolationLevel(isolationLevel), transactionCallback);
-                                        }
-                                        else {
-                                            this.databaseConnection.begin(transactionCallback);
-                                        }
-                                        afterBroadcastResult = new BroadcasterResult();
-                                        this.broadcaster.broadcastAfterTransactionStartEvent(afterBroadcastResult);
-                                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 3];
-                                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
-                                    case 2:
-                                        _a.sent();
-                                        _a.label = 3;
-                                    case 3: return [2 /*return*/];
-                                }
-                            });
-                        }); })];
+                                            else {
+                                                this.databaseConnection.begin(transactionCallback);
+                                            }
+                                            return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionStart')];
+                                        case 2:
+                                            _a.sent();
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); })];
                 }
             });
         });
@@ -127,7 +117,6 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.commitTransaction = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var beforeBroadcastResult;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -136,38 +125,28 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                             throw new QueryRunnerAlreadyReleasedError();
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError();
-                        beforeBroadcastResult = new BroadcasterResult();
-                        this.broadcaster.broadcastBeforeTransactionCommitEvent(beforeBroadcastResult);
-                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
+                        return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionCommit')];
                     case 1:
                         _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, new Promise(function (ok, fail) {
-                            _this.databaseConnection.commit(function (err) { return __awaiter(_this, void 0, void 0, function () {
-                                var afterBroadcastResult;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            if (err)
-                                                return [2 /*return*/, fail(err)];
-                                            this.isTransactionActive = false;
-                                            this.databaseConnection = null;
-                                            afterBroadcastResult = new BroadcasterResult();
-                                            this.broadcaster.broadcastAfterTransactionCommitEvent(afterBroadcastResult);
-                                            if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
-                                        case 1:
-                                            _a.sent();
-                                            _a.label = 2;
-                                        case 2:
-                                            ok();
-                                            this.connection.logger.logQuery("COMMIT");
-                                            return [2 /*return*/];
-                                    }
-                                });
-                            }); });
-                        })];
+                        return [2 /*return*/, new Promise(function (ok, fail) {
+                                _this.databaseConnection.commit(function (err) { return __awaiter(_this, void 0, void 0, function () {
+                                    return __generator(this, function (_a) {
+                                        switch (_a.label) {
+                                            case 0:
+                                                if (err)
+                                                    return [2 /*return*/, fail(err)];
+                                                this.isTransactionActive = false;
+                                                this.databaseConnection = null;
+                                                return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionCommit')];
+                                            case 1:
+                                                _a.sent();
+                                                ok();
+                                                this.connection.logger.logQuery("COMMIT");
+                                                return [2 /*return*/];
+                                        }
+                                    });
+                                }); });
+                            })];
                 }
             });
         });
@@ -178,7 +157,6 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.rollbackTransaction = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var beforeBroadcastResult;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -187,38 +165,28 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
                             throw new QueryRunnerAlreadyReleasedError();
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError();
-                        beforeBroadcastResult = new BroadcasterResult();
-                        this.broadcaster.broadcastBeforeTransactionRollbackEvent(beforeBroadcastResult);
-                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
+                        return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionRollback')];
                     case 1:
                         _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, new Promise(function (ok, fail) {
-                            _this.databaseConnection.rollback(function (err) { return __awaiter(_this, void 0, void 0, function () {
-                                var afterBroadcastResult;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            if (err)
-                                                return [2 /*return*/, fail(err)];
-                                            this.isTransactionActive = false;
-                                            this.databaseConnection = null;
-                                            afterBroadcastResult = new BroadcasterResult();
-                                            this.broadcaster.broadcastAfterTransactionRollbackEvent(afterBroadcastResult);
-                                            if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
-                                        case 1:
-                                            _a.sent();
-                                            _a.label = 2;
-                                        case 2:
-                                            ok();
-                                            this.connection.logger.logQuery("ROLLBACK");
-                                            return [2 /*return*/];
-                                    }
-                                });
-                            }); });
-                        })];
+                        return [2 /*return*/, new Promise(function (ok, fail) {
+                                _this.databaseConnection.rollback(function (err) { return __awaiter(_this, void 0, void 0, function () {
+                                    return __generator(this, function (_a) {
+                                        switch (_a.label) {
+                                            case 0:
+                                                if (err)
+                                                    return [2 /*return*/, fail(err)];
+                                                this.isTransactionActive = false;
+                                                this.databaseConnection = null;
+                                                return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionRollback')];
+                                            case 1:
+                                                _a.sent();
+                                                ok();
+                                                this.connection.logger.logQuery("ROLLBACK");
+                                                return [2 /*return*/];
+                                        }
+                                    });
+                                }); });
+                            })];
                 }
             });
         });