typeorm 0.2.44 → 0.2.45-dev.0fc093d

package/driver/aurora-data-api/AuroraDataApiQueryRunner.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuroraDataApiQueryRunner = 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");
@@ -63,20 +62,36 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
      */
     AuroraDataApiQueryRunner.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*/, 6];
                         return [4 /*yield*/, this.client.startTransaction()];
-                    case 2:
+                    case 5:
+                        _a.sent();
+                        return [3 /*break*/, 8];
+                    case 6: return [4 /*yield*/, this.query("SAVEPOINT typeorm_" + this.transactionDepth)];
+                    case 7:
                         _a.sent();
+                        _a.label = 8;
+                    case 8:
+                        this.transactionDepth += 1;
                         return [4 /*yield*/, this.broadcaster.broadcast('AfterTransactionStart')];
-                    case 3:
+                    case 9:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -97,12 +112,20 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionCommit')];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, this.client.commitTransaction()];
+                        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.client.commitTransaction()];
+                    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*/];
                 }
@@ -123,12 +146,20 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.broadcaster.broadcast('BeforeTransactionRollback')];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, this.client.rollbackTransaction()];
+                        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.client.rollbackTransaction()];
+                    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*/];
                 }
@@ -174,7 +205,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
         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_1;
+            var databaseConnection, stream, err_2;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -190,8 +221,8 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         ok(stream);
                         return [3 /*break*/, 3];
                     case 2:
-                        err_1 = _a.sent();
-                        fail(err_1);
+                        err_2 = _a.sent();
+                        fail(err_2);
                         return [3 /*break*/, 3];
                     case 3: return [2 /*return*/];
                 }
@@ -1566,7 +1597,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
      */
     AuroraDataApiQueryRunner.prototype.clearDatabase = function (database) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var dbName, isDatabaseExist, selectViewDropsQuery, dropViewQueries, disableForeignKeysCheckQuery, dropTablesQuery, enableForeignKeysCheckQuery, dropQueries, error_2, rollbackError_1;
+            var dbName, isDatabaseExist, isAnotherTransactionActive, selectViewDropsQuery, dropViewQueries, disableForeignKeysCheckQuery, dropTablesQuery, enableForeignKeysCheckQuery, dropQueries, error_2, rollbackError_1;
             var _this = this;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
@@ -1580,12 +1611,15 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                             return [2 /*return*/, Promise.resolve()];
                         return [3 /*break*/, 3];
                     case 2: throw new error_1.TypeORMError("Can not clear database. No database is specified");
-                    case 3: return [4 /*yield*/, this.startTransaction()];
+                    case 3:
+                        isAnotherTransactionActive = this.isTransactionActive;
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.startTransaction()];
                     case 4:
                         _a.sent();
                         _a.label = 5;
                     case 5:
-                        _a.trys.push([5, 13, , 18]);
+                        _a.trys.push([5, 14, , 20]);
                         selectViewDropsQuery = "SELECT concat('DROP VIEW IF EXISTS `', table_schema, '`.`', table_name, '`') AS `query` FROM `INFORMATION_SCHEMA`.`VIEWS` WHERE `TABLE_SCHEMA` = '" + dbName + "'";
                         return [4 /*yield*/, this.query(selectViewDropsQuery)];
                     case 6:
@@ -1608,24 +1642,28 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.query(enableForeignKeysCheckQuery)];
                     case 11:
                         _a.sent();
+                        if (!!isAnotherTransactionActive) return [3 /*break*/, 13];
                         return [4 /*yield*/, this.commitTransaction()];
                     case 12:
                         _a.sent();
-                        return [3 /*break*/, 18];
-                    case 13:
-                        error_2 = _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_2 = _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_2;
-                    case 18: return [2 /*return*/];
+                        return [3 /*break*/, 19];
+                    case 19: throw error_2;
+                    case 20: return [2 /*return*/];
                 }
             });
         });