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

package/driver/cockroachdb/CockroachQueryRunner.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CockroachQueryRunner = void 0;
 var tslib_1 = require("tslib");
 var QueryResult_1 = require("../../query-runner/QueryResult");
-var TransactionAlreadyStartedError_1 = require("../../error/TransactionAlreadyStartedError");
 var TransactionNotStartedError_1 = require("../../error/TransactionNotStartedError");
 var TableColumn_1 = require("../../schema-builder/table/TableColumn");
 var Table_1 = require("../../schema-builder/table/Table");
@@ -96,30 +95,45 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.startTransaction = function (isolationLevel) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var err_1;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (this.isTransactionActive)
-                            throw new TransactionAlreadyStartedError_1.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*/, 9];
                         return [4 /*yield*/, this.query("START TRANSACTION")];
-                    case 2:
+                    case 5:
                         _a.sent();
                         return [4 /*yield*/, this.query("SAVEPOINT cockroach_restart")];
-                    case 3:
+                    case 6:
                         _a.sent();
-                        if (!isolationLevel) return [3 /*break*/, 5];
+                        if (!isolationLevel) return [3 /*break*/, 8];
                         return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel)];
-                    case 4:
+                    case 7:
                         _a.sent();
-                        _a.label = 5;
-                    case 5:
+                        _a.label = 8;
+                    case 8: return [3 /*break*/, 11];
+                    case 9: return [4 /*yield*/, this.query("SAVEPOINT typeorm_" + this.transactionDepth)];
+                    case 10:
+                        _a.sent();
+                        _a.label = 11;
+                    case 11:
+                        this.transactionDepth += 1;
                         this.storeQueries = true;
                         return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionStart')];
-                    case 6:
+                    case 12:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -142,58 +156,66 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionCommit')];
                     case 1:
                         _d.sent();
-                        this.storeQueries = false;
-                        _d.label = 2;
+                        if (!(this.transactionDepth > 1)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.query("RELEASE SAVEPOINT typeorm_" + (this.transactionDepth - 1))];
                     case 2:
-                        _d.trys.push([2, 5, , 17]);
-                        return [4 /*yield*/, this.query("RELEASE SAVEPOINT cockroach_restart")];
+                        _d.sent();
+                        this.transactionDepth -= 1;
+                        return [3 /*break*/, 19];
                     case 3:
+                        this.storeQueries = false;
+                        _d.label = 4;
+                    case 4:
+                        _d.trys.push([4, 7, , 19]);
+                        return [4 /*yield*/, this.query("RELEASE SAVEPOINT cockroach_restart")];
+                    case 5:
                         _d.sent();
                         return [4 /*yield*/, this.query("COMMIT")];
-                    case 4:
+                    case 6:
                         _d.sent();
                         this.queries = [];
                         this.isTransactionActive = false;
-                        return [3 /*break*/, 17];
-                    case 5:
+                        this.transactionDepth -= 1;
+                        return [3 /*break*/, 19];
+                    case 7:
                         e_1 = _d.sent();
-                        if (!(e_1.code === "40001")) return [3 /*break*/, 16];
+                        if (!(e_1.code === "40001")) return [3 /*break*/, 18];
                         return [4 /*yield*/, this.query("ROLLBACK TO SAVEPOINT cockroach_restart")];
-                    case 6:
+                    case 8:
                         _d.sent();
-                        _d.label = 7;
-                    case 7:
-                        _d.trys.push([7, 12, 13, 14]);
+                        _d.label = 9;
+                    case 9:
+                        _d.trys.push([9, 14, 15, 16]);
                         _a = (0, tslib_1.__values)(this.queries), _b = _a.next();
-                        _d.label = 8;
-                    case 8:
-                        if (!!_b.done) return [3 /*break*/, 11];
+                        _d.label = 10;
+                    case 10:
+                        if (!!_b.done) return [3 /*break*/, 13];
                         q = _b.value;
                         return [4 /*yield*/, this.query(q.query, q.parameters)];
-                    case 9:
+                    case 11:
                         _d.sent();
-                        _d.label = 10;
-                    case 10:
-                        _b = _a.next();
-                        return [3 /*break*/, 8];
-                    case 11: return [3 /*break*/, 14];
+                        _d.label = 12;
                     case 12:
+                        _b = _a.next();
+                        return [3 /*break*/, 10];
+                    case 13: return [3 /*break*/, 16];
+                    case 14:
                         e_2_1 = _d.sent();
                         e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 14];
-                    case 13:
+                        return [3 /*break*/, 16];
+                    case 15:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
                         finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
-                    case 14: return [4 /*yield*/, this.commitTransaction()];
-                    case 15:
+                    case 16: return [4 /*yield*/, this.commitTransaction()];
+                    case 17:
                         _d.sent();
-                        _d.label = 16;
-                    case 16: return [3 /*break*/, 17];
-                    case 17: return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionCommit')];
-                    case 18:
+                        _d.label = 18;
+                    case 18: return [3 /*break*/, 19];
+                    case 19: return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionCommit')];
+                    case 20:
                         _d.sent();
                         return [2 /*return*/];
                 }
@@ -214,14 +236,23 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionRollback')];
                     case 1:
                         _a.sent();
+                        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:
                         this.storeQueries = false;
                         return [4 /*yield*/, this.query("ROLLBACK")];
-                    case 2:
+                    case 4:
                         _a.sent();
                         this.queries = [];
                         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*/];
                 }
@@ -234,7 +265,7 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
     CockroachQueryRunner.prototype.query = function (query, parameters, useStructuredResult) {
         if (useStructuredResult === void 0) { useStructuredResult = false; }
         return (0, tslib_1.__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 (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -285,11 +316,11 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                         }
                         return [3 /*break*/, 5];
                     case 4:
-                        err_1 = _a.sent();
-                        if (err_1.code !== "40001") {
-                            this.driver.connection.logger.logQueryError(err_1, query, parameters, this);
+                        err_2 = _a.sent();
+                        if (err_2.code !== "40001") {
+                            this.driver.connection.logger.logQueryError(err_2, query, parameters, this);
                         }
-                        throw new QueryFailedError_1.QueryFailedError(query, parameters, err_1);
+                        throw new QueryFailedError_1.QueryFailedError(query, parameters, err_2);
                     case 5: return [2 /*return*/];
                 }
             });
@@ -2019,7 +2050,7 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.clearDatabase = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var schemas, schemaNamesString, selectViewDropsQuery, dropViewQueries, selectDropsQuery, dropQueries, selectSequenceDropsQuery, sequenceDropQueries, error_2, rollbackError_1;
+            var schemas, schemaNamesString, isAnotherTransactionActive, selectViewDropsQuery, dropViewQueries, selectDropsQuery, dropQueries, selectSequenceDropsQuery, sequenceDropQueries, error_2, rollbackError_1;
             var _this = this;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
@@ -2036,12 +2067,14 @@ var CockroachQueryRunner = /** @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, 10, , 15]);
+                        _a.trys.push([2, 11, , 17]);
                         selectViewDropsQuery = "SELECT 'DROP VIEW IF EXISTS \"' || schemaname || '\".\"' || viewname || '\" CASCADE;' as \"query\" " +
                             ("FROM \"pg_views\" WHERE \"schemaname\" IN (" + schemaNamesString + ")");
                         return [4 /*yield*/, this.query(selectViewDropsQuery)];
@@ -2064,24 +2097,28 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                         return [4 /*yield*/, Promise.all(sequenceDropQueries.map(function (q) { return _this.query(q["query"]); }))];
                     case 8:
                         _a.sent();
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 10];
                         return [4 /*yield*/, this.commitTransaction()];
                     case 9:
                         _a.sent();
-                        return [3 /*break*/, 15];
-                    case 10:
-                        error_2 = _a.sent();
-                        _a.label = 11;
+                        _a.label = 10;
+                    case 10: return [3 /*break*/, 17];
                     case 11:
-                        _a.trys.push([11, 13, , 14]);
-                        return [4 /*yield*/, this.rollbackTransaction()];
+                        error_2 = _a.sent();
+                        _a.label = 12;
                     case 12:
-                        _a.sent();
-                        return [3 /*break*/, 14];
+                        _a.trys.push([12, 15, , 16]);
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 14];
+                        return [4 /*yield*/, this.rollbackTransaction()];
                     case 13:
+                        _a.sent();
+                        _a.label = 14;
+                    case 14: return [3 /*break*/, 16];
+                    case 15:
                         rollbackError_1 = _a.sent();
-                        return [3 /*break*/, 14];
-                    case 14: throw error_2;
-                    case 15: return [2 /*return*/];
+                        return [3 /*break*/, 16];
+                    case 16: throw error_2;
+                    case 17: return [2 /*return*/];
                 }
             });
         });