typeorm 0.2.45-dev.ea16ac2 → 0.2.46-dev.486f8c5

package/browser/decorator/options/ViewColumnOptions.d.ts

@@ -1,3 +1,4 @@
+import { ValueTransformer } from "./ValueTransformer";
 /**
  * Describes all view column's options.
  */
@@ -6,4 +7,9 @@ export interface ViewColumnOptions {
      * Column name in the database.
      */
     name?: string;
+    /**
+     * Specifies a value transformer(s) that is to be used to unmarshal
+     * this column when reading from the database.
+     */
+    transformer?: ValueTransformer | ValueTransformer[];
 }

package/browser/decorator/options/ViewColumnOptions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../browser/src/decorator/options/ViewColumnOptions.ts"],"names":[],"mappings":"","file":"ViewColumnOptions.js","sourcesContent":["/**\n * Describes all view column's options.\n */\nexport interface ViewColumnOptions {\n    /**\n     * Column name in the database.\n     */\n    name?: string;\n}\n"],"sourceRoot":"../.."}
+{"version":3,"sources":["../browser/src/decorator/options/ViewColumnOptions.ts"],"names":[],"mappings":"","file":"ViewColumnOptions.js","sourcesContent":["import { ValueTransformer } from \"./ValueTransformer\";\n\n/**\n * Describes all view column's options.\n */\nexport interface ViewColumnOptions {\n    /**\n     * Column name in the database.\n     */\n    name?: string;\n\n    /**\n     * Specifies a value transformer(s) that is to be used to unmarshal\n     * this column when reading from the database.\n     */\n     transformer?: ValueTransformer|ValueTransformer[];\n}\n"],"sourceRoot":"../.."}

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

@@ -1594,7 +1594,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
      */
     AuroraDataApiQueryRunner.prototype.clearDatabase = function (database) {
         return __awaiter(this, void 0, void 0, function () {
-            var dbName, isDatabaseExist, selectViewDropsQuery, dropViewQueries, disableForeignKeysCheckQuery, dropTablesQuery, enableForeignKeysCheckQuery, dropQueries, error_1, rollbackError_1;
+            var dbName, isDatabaseExist, isAnotherTransactionActive, selectViewDropsQuery, dropViewQueries, disableForeignKeysCheckQuery, dropTablesQuery, enableForeignKeysCheckQuery, dropQueries, error_1, rollbackError_1;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -1608,12 +1608,15 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                             return [2 /*return*/, Promise.resolve()];
                         return [3 /*break*/, 3];
                     case 2: throw new 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:
@@ -1636,24 +1639,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_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*/];
                 }
             });
         });