typeorm 0.2.39-dev.0bc194c → 0.2.39-dev.dd94c9d

package/browser/driver/sap/SapQueryRunner.js

@@ -13,7 +13,6 @@ import { View } from "../../schema-builder/view/View";
 import { Broadcaster } from "../../subscriber/Broadcaster";
 import { OrmUtils } from "../../util/OrmUtils";
 import { Query } from "../Query";
-import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 import { QueryFailedError, TypeORMError } from "../../error";
 import { QueryResult } from "../../query-runner/QueryResult";
 import { QueryLock } from "../../query-runner/QueryLock";
@@ -74,7 +73,6 @@ var SapQueryRunner = /** @class */ (function (_super) {
      */
     SapQueryRunner.prototype.startTransaction = function (isolationLevel) {
         return __awaiter(this, void 0, void 0, function () {
-            var beforeBroadcastResult, afterBroadcastResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -82,29 +80,19 @@ var SapQueryRunner = /** @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:
                         this.isTransactionActive = true;
-                        if (!isolationLevel) return [3 /*break*/, 4];
+                        if (!isolationLevel) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + (isolationLevel || ""))];
-                    case 3:
+                    case 2:
                         _a.sent();
-                        _a.label = 4;
+                        _a.label = 3;
+                    case 3: return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionStart')];
                     case 4:
-                        afterBroadcastResult = new BroadcasterResult();
-                        this.broadcaster.broadcastAfterTransactionStartEvent(afterBroadcastResult);
-                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
-                    case 5:
                         _a.sent();
-                        _a.label = 6;
-                    case 6: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });
@@ -115,7 +103,6 @@ var SapQueryRunner = /** @class */ (function (_super) {
      */
     SapQueryRunner.prototype.commitTransaction = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var beforeBroadcastResult, afterBroadcastResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -123,25 +110,17 @@ var SapQueryRunner = /** @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 [4 /*yield*/, this.query("COMMIT")];
-                    case 3:
+                        return [4 /*yield*/, this.query("COMMIT")];
+                    case 2:
                         _a.sent();
                         this.isTransactionActive = false;
-                        afterBroadcastResult = new BroadcasterResult();
-                        this.broadcaster.broadcastAfterTransactionCommitEvent(afterBroadcastResult);
-                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
-                    case 4:
+                        return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionCommit')];
+                    case 3:
                         _a.sent();
-                        _a.label = 5;
-                    case 5: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });
@@ -152,7 +131,6 @@ var SapQueryRunner = /** @class */ (function (_super) {
      */
     SapQueryRunner.prototype.rollbackTransaction = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var beforeBroadcastResult, afterBroadcastResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -160,25 +138,17 @@ var SapQueryRunner = /** @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 [4 /*yield*/, this.query("ROLLBACK")];
-                    case 3:
+                        return [4 /*yield*/, this.query("ROLLBACK")];
+                    case 2:
                         _a.sent();
                         this.isTransactionActive = false;
-                        afterBroadcastResult = new BroadcasterResult();
-                        this.broadcaster.broadcastAfterTransactionRollbackEvent(afterBroadcastResult);
-                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
-                    case 4:
+                        return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionRollback')];
+                    case 3:
                         _a.sent();
-                        _a.label = 5;
-                    case 5: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });