typeorm 0.2.45-dev.ea16ac2 → 0.2.45-dev.f3cfdd2

package/driver/mysql/MysqlQueryRunner.js

@@ -1652,7 +1652,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      */
     MysqlQueryRunner.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) {
@@ -1666,12 +1666,15 @@ var MysqlQueryRunner = /** @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:
@@ -1694,24 +1697,28 @@ var MysqlQueryRunner = /** @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*/];
                 }
             });
         });