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

package/driver/postgres/PostgresQueryRunner.js

@@ -18,7 +18,6 @@ var View_1 = require("../../schema-builder/view/View");
 var Broadcaster_1 = require("../../subscriber/Broadcaster");
 var OrmUtils_1 = require("../../util/OrmUtils");
 var Query_1 = require("../Query");
-var BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 var VersionUtils_1 = require("../../util/VersionUtils");
 var error_1 = require("../../error");
 var QueryResult_1 = require("../../query-runner/QueryResult");
@@ -117,38 +116,27 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.startTransaction = function (isolationLevel) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var beforeBroadcastResult, afterBroadcastResult;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         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)];
+                        return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionStart')];
                     case 1:
                         _a.sent();
-                        _a.label = 2;
-                    case 2:
                         this.isTransactionActive = true;
                         return [4 /*yield*/, this.query("START TRANSACTION")];
-                    case 3:
+                    case 2:
                         _a.sent();
-                        if (!isolationLevel) return [3 /*break*/, 5];
+                        if (!isolationLevel) return [3 /*break*/, 4];
                         return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel)];
-                    case 4:
+                    case 3:
                         _a.sent();
-                        _a.label = 5;
+                        _a.label = 4;
+                    case 4: return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionStart')];
                     case 5:
-                        afterBroadcastResult = new BroadcasterResult_1.BroadcasterResult();
-                        this.broadcaster.broadcastAfterTransactionStartEvent(afterBroadcastResult);
-                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 7];
-                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
-                    case 6:
                         _a.sent();
-                        _a.label = 7;
-                    case 7: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });
@@ -159,31 +147,22 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.commitTransaction = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var beforeBroadcastResult, afterBroadcastResult;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         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)];
+                        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_1.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*/];
                 }
             });
         });
@@ -194,31 +173,22 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.rollbackTransaction = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var beforeBroadcastResult, afterBroadcastResult;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         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)];
+                        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_1.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*/];
                 }
             });
         });
@@ -284,16 +254,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      * Returns raw data stream.
      */
     PostgresQueryRunner.prototype.stream = function (query, parameters, onEnd, onError) {
-        var _this = this;
-        var QueryStream = this.driver.loadStreamDependency();
-        if (this.isReleased)
-            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
-        return new Promise(function (ok, fail) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-            var databaseConnection, stream, err_2;
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var QueryStream, databaseConnection, stream;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
+                        QueryStream = this.driver.loadStreamDependency();
+                        if (this.isReleased)
+                            throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
                         return [4 /*yield*/, this.connect()];
                     case 1:
                         databaseConnection = _a.sent();
@@ -303,16 +271,10 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                             stream.on("end", onEnd);
                         if (onError)
                             stream.on("error", onError);
-                        ok(stream);
-                        return [3 /*break*/, 3];
-                    case 2:
-                        err_2 = _a.sent();
-                        fail(err_2);
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+                        return [2 /*return*/, stream];
                 }
             });
-        }); });
+        });
     };
     /**
      * Returns all available database names including system databases.