typeorm 0.2.38 → 0.2.39-dev.1649882

package/browser/driver/mysql/MysqlQueryRunner.js

@@ -15,7 +15,6 @@ import { TableUnique } from "../../schema-builder/table/TableUnique";
 import { BaseQueryRunner } from "../../query-runner/BaseQueryRunner";
 import { Broadcaster } from "../../subscriber/Broadcaster";
 import { VersionUtils } from "../../util/VersionUtils";
-import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 import { TypeORMError } from "../../error";
 /**
  * Runs queries on a single mysql database connection.
@@ -75,42 +74,31 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      */
     MysqlQueryRunner.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:
                         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*/, 5];
+                        if (!isolationLevel) return [3 /*break*/, 4];
                         return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel)];
-                    case 3:
+                    case 2:
                         _a.sent();
                         return [4 /*yield*/, this.query("START TRANSACTION")];
-                    case 4:
+                    case 3:
                         _a.sent();
-                        return [3 /*break*/, 7];
-                    case 5: return [4 /*yield*/, this.query("START TRANSACTION")];
-                    case 6:
+                        return [3 /*break*/, 6];
+                    case 4: return [4 /*yield*/, this.query("START TRANSACTION")];
+                    case 5:
                         _a.sent();
-                        _a.label = 7;
+                        _a.label = 6;
+                    case 6: return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionStart')];
                     case 7:
-                        afterBroadcastResult = new BroadcasterResult();
-                        this.broadcaster.broadcastAfterTransactionStartEvent(afterBroadcastResult);
-                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 9];
-                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
-                    case 8:
                         _a.sent();
-                        _a.label = 9;
-                    case 9: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });
@@ -121,31 +109,22 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      */
     MysqlQueryRunner.prototype.commitTransaction = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var beforeBroadcastResult, afterBroadcastResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         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*/];
                 }
             });
         });
@@ -156,31 +135,22 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      */
     MysqlQueryRunner.prototype.rollbackTransaction = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var beforeBroadcastResult, afterBroadcastResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         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*/];
                 }
             });
         });
@@ -1784,7 +1754,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                         _d = [[]];
                         return [4 /*yield*/, this.query(tablesSql)];
                     case 2:
-                        _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [_k.sent()])]))]));
+                        _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [_k.sent()]), false]))]));
                         return [3 /*break*/, 5];
                     case 3:
                         tablesSql = tableNames
@@ -1801,7 +1771,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                         _h = [[]];
                         return [4 /*yield*/, this.query(tablesSql)];
                     case 4:
-                        _f.apply(_e, _g.concat([__spreadArray.apply(void 0, _h.concat([__read.apply(void 0, [_k.sent()])]))]));
+                        _f.apply(_e, _g.concat([__spreadArray.apply(void 0, _h.concat([__read.apply(void 0, [_k.sent()]), false]))]));
                         _k.label = 5;
                     case 5:
                         // if tables were not found in the db, no need to proceed