typeorm 0.2.44-dev.8742e33 → 0.2.45-dev.0fc093d

package/browser/driver/postgres/PostgresQueryRunner.js

@@ -1,7 +1,6 @@
 import { __awaiter, __extends, __generator, __read, __spreadArray, __values } from "tslib";
 import { QueryFailedError } from "../../error/QueryFailedError";
 import { QueryRunnerAlreadyReleasedError } from "../../error/QueryRunnerAlreadyReleasedError";
-import { TransactionAlreadyStartedError } from "../../error/TransactionAlreadyStartedError";
 import { TransactionNotStartedError } from "../../error/TransactionNotStartedError";
 import { BaseQueryRunner } from "../../query-runner/BaseQueryRunner";
 import { Table } from "../../schema-builder/table/Table";
@@ -114,25 +113,41 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.startTransaction = function (isolationLevel) {
         return __awaiter(this, void 0, void 0, function () {
+            var err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (this.isTransactionActive)
-                            throw new TransactionAlreadyStartedError();
-                        return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionStart')];
+                        this.isTransactionActive = true;
+                        _a.label = 1;
                     case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionStart')];
+                    case 2:
                         _a.sent();
-                        this.isTransactionActive = true;
+                        return [3 /*break*/, 4];
+                    case 3:
+                        err_1 = _a.sent();
+                        this.isTransactionActive = false;
+                        throw err_1;
+                    case 4:
+                        if (!(this.transactionDepth === 0)) return [3 /*break*/, 8];
                         return [4 /*yield*/, this.query("START TRANSACTION")];
-                    case 2:
+                    case 5:
                         _a.sent();
-                        if (!isolationLevel) return [3 /*break*/, 4];
+                        if (!isolationLevel) return [3 /*break*/, 7];
                         return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel)];
-                    case 3:
+                    case 6:
                         _a.sent();
-                        _a.label = 4;
-                    case 4: return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionStart')];
-                    case 5:
+                        _a.label = 7;
+                    case 7: return [3 /*break*/, 10];
+                    case 8: return [4 /*yield*/, this.query("SAVEPOINT typeorm_" + this.transactionDepth)];
+                    case 9:
+                        _a.sent();
+                        _a.label = 10;
+                    case 10:
+                        this.transactionDepth += 1;
+                        return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionStart')];
+                    case 11:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -153,12 +168,20 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionCommit')];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, this.query("COMMIT")];
+                        if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_" + (this.transactionDepth - 1))];
                     case 2:
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, this.query("COMMIT")];
+                    case 4:
                         _a.sent();
                         this.isTransactionActive = false;
+                        _a.label = 5;
+                    case 5:
+                        this.transactionDepth -= 1;
                         return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionCommit')];
-                    case 3:
+                    case 6:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -179,12 +202,20 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionRollback')];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, this.query("ROLLBACK")];
+                        if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT typeorm_" + (this.transactionDepth - 1))];
                     case 2:
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, this.query("ROLLBACK")];
+                    case 4:
                         _a.sent();
                         this.isTransactionActive = false;
+                        _a.label = 5;
+                    case 5:
+                        this.transactionDepth -= 1;
                         return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionRollback')];
-                    case 3:
+                    case 6:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -197,7 +228,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
     PostgresQueryRunner.prototype.query = function (query, parameters, useStructuredResult) {
         if (useStructuredResult === void 0) { useStructuredResult = false; }
         return __awaiter(this, void 0, void 0, function () {
-            var databaseConnection, queryStartTime, raw, maxQueryExecutionTime, queryEndTime, queryExecutionTime, result, err_1;
+            var databaseConnection, queryStartTime, raw, maxQueryExecutionTime, queryEndTime, queryExecutionTime, result, err_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -242,9 +273,9 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         }
                         return [2 /*return*/, result];
                     case 4:
-                        err_1 = _a.sent();
-                        this.driver.connection.logger.logQueryError(err_1, query, parameters, this);
-                        throw new QueryFailedError(query, parameters, err_1);
+                        err_2 = _a.sent();
+                        this.driver.connection.logger.logQueryError(err_2, query, parameters, this);
+                        throw new QueryFailedError(query, parameters, err_2);
                     case 5: return [2 /*return*/];
                 }
             });
@@ -2319,7 +2350,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
      */
     PostgresQueryRunner.prototype.clearDatabase = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var schemas, schemaNamesString, version, selectViewDropsQuery, dropViewQueries, selectMatViewDropsQuery, dropMatViewQueries, selectTableDropsQuery, dropTableQueries, error_1, rollbackError_1;
+            var schemas, schemaNamesString, isAnotherTransactionActive, version, selectViewDropsQuery, dropViewQueries, selectMatViewDropsQuery, dropMatViewQueries, selectTableDropsQuery, dropTableQueries, error_1, rollbackError_1;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -2336,12 +2367,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                         schemaNamesString = schemas.map(function (name) {
                             return name === "current_schema()" ? name : "'" + name + "'";
                         }).join(", ");
+                        isAnotherTransactionActive = this.isTransactionActive;
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.startTransaction()];
                     case 1:
                         _a.sent();
                         _a.label = 2;
                     case 2:
-                        _a.trys.push([2, 13, , 18]);
+                        _a.trys.push([2, 14, , 20]);
                         return [4 /*yield*/, this.getVersion()
                             // drop views
                         ];
@@ -2378,24 +2411,28 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
                     case 11:
                         // drop enum types
                         _a.sent();
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 13];
                         return [4 /*yield*/, this.commitTransaction()];
                     case 12:
                         _a.sent();
-                        return [3 /*break*/, 18];
-                    case 13:
-                        error_1 = _a.sent();
-                        _a.label = 14;
+                        _a.label = 13;
+                    case 13: return [3 /*break*/, 20];
                     case 14:
-                        _a.trys.push([14, 16, , 17]);
-                        return [4 /*yield*/, this.rollbackTransaction()];
+                        error_1 = _a.sent();
+                        _a.label = 15;
                     case 15:
-                        _a.sent();
-                        return [3 /*break*/, 17];
+                        _a.trys.push([15, 18, , 19]);
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 17];
+                        return [4 /*yield*/, this.rollbackTransaction()];
                     case 16:
+                        _a.sent();
+                        _a.label = 17;
+                    case 17: return [3 /*break*/, 19];
+                    case 18:
                         rollbackError_1 = _a.sent();
-                        return [3 /*break*/, 17];
-                    case 17: throw error_1;
-                    case 18: return [2 /*return*/];
+                        return [3 /*break*/, 19];
+                    case 19: throw error_1;
+                    case 20: return [2 /*return*/];
                 }
             });
         });