typeorm 0.2.28 → 0.2.29

package/driver/sqlserver/SqlServerQueryRunner.js

@@ -17,6 +17,7 @@ var Broadcaster_1 = require("../../subscriber/Broadcaster");
 var OrmUtils_1 = require("../../util/OrmUtils");
 var Query_1 = require("../Query");
 var MssqlParameter_1 = require("./MssqlParameter");
+var BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 /**
  * Runs queries on a single SQL Server database connection.
  */
@@ -67,44 +68,62 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.startTransaction = function (isolationLevel) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                if (this.isReleased)
-                    throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
-                if (this.isTransactionActive)
-                    throw new TransactionAlreadyStartedError_1.TransactionAlreadyStartedError();
-                return [2 /*return*/, new Promise(function (ok, fail) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        var pool, transactionCallback;
-                        var _this = this;
-                        return tslib_1.__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");
+                switch (_a.label) {
+                    case 0:
+                        if (this.isReleased)
+                            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
+                        if (this.isTransactionActive)
+                            throw new TransactionAlreadyStartedError_1.TransactionAlreadyStartedError();
+                        beforeBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionStartEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [2 /*return*/, new Promise(function (ok, fail) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var pool, transactionCallback, afterBroadcastResult;
+                            var _this = this;
+                            return tslib_1.__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);
-                                    }
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); })];
+                                        else {
+                                            this.databaseConnection.begin(transactionCallback);
+                                        }
+                                        afterBroadcastResult = new BroadcasterResult_1.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*/];
+                                }
+                            });
+                        }); })];
+                }
             });
         });
     };
@@ -114,22 +133,48 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.commitTransaction = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                if (this.isReleased)
-                    throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
-                if (!this.isTransactionActive)
-                    throw new TransactionNotStartedError_1.TransactionNotStartedError();
-                return [2 /*return*/, new Promise(function (ok, fail) {
-                        _this.databaseConnection.commit(function (err) {
-                            if (err)
-                                return fail(err);
-                            _this.isTransactionActive = false;
-                            _this.databaseConnection = null;
-                            ok();
-                            _this.connection.logger.logQuery("COMMIT");
-                        });
-                    })];
+                switch (_a.label) {
+                    case 0:
+                        if (this.isReleased)
+                            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
+                        if (!this.isTransactionActive)
+                            throw new TransactionNotStartedError_1.TransactionNotStartedError();
+                        beforeBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionCommitEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [2 /*return*/, new Promise(function (ok, fail) {
+                            _this.databaseConnection.commit(function (err) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                var afterBroadcastResult;
+                                return tslib_1.__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_1.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*/];
+                                    }
+                                });
+                            }); });
+                        })];
+                }
             });
         });
     };
@@ -139,22 +184,48 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
      */
     SqlServerQueryRunner.prototype.rollbackTransaction = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                if (this.isReleased)
-                    throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
-                if (!this.isTransactionActive)
-                    throw new TransactionNotStartedError_1.TransactionNotStartedError();
-                return [2 /*return*/, new Promise(function (ok, fail) {
-                        _this.databaseConnection.rollback(function (err) {
-                            if (err)
-                                return fail(err);
-                            _this.isTransactionActive = false;
-                            _this.databaseConnection = null;
-                            ok();
-                            _this.connection.logger.logQuery("ROLLBACK");
-                        });
-                    })];
+                switch (_a.label) {
+                    case 0:
+                        if (this.isReleased)
+                            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
+                        if (!this.isTransactionActive)
+                            throw new TransactionNotStartedError_1.TransactionNotStartedError();
+                        beforeBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionRollbackEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [2 /*return*/, new Promise(function (ok, fail) {
+                            _this.databaseConnection.rollback(function (err) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                var afterBroadcastResult;
+                                return tslib_1.__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_1.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*/];
+                                    }
+                                });
+                            }); });
+                        })];
+                }
             });
         });
     };