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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/browser/decorator/options/ViewColumnOptions.d.ts +6 -0
  2. package/browser/decorator/options/ViewColumnOptions.js.map +1 -1
  3. package/browser/driver/aurora-data-api/AuroraDataApiQueryRunner.js +21 -14
  4. package/browser/driver/aurora-data-api/AuroraDataApiQueryRunner.js.map +1 -1
  5. package/browser/driver/cockroachdb/CockroachQueryRunner.js +19 -13
  6. package/browser/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
  7. package/browser/driver/mysql/MysqlQueryRunner.js +21 -14
  8. package/browser/driver/mysql/MysqlQueryRunner.js.map +1 -1
  9. package/browser/driver/oracle/OracleQueryRunner.js +21 -14
  10. package/browser/driver/oracle/OracleQueryRunner.js.map +1 -1
  11. package/browser/driver/postgres/PostgresQueryRunner.js +19 -13
  12. package/browser/driver/postgres/PostgresQueryRunner.js.map +1 -1
  13. package/browser/driver/sap/SapQueryRunner.js +19 -13
  14. package/browser/driver/sap/SapQueryRunner.js.map +1 -1
  15. package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +21 -15
  16. package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
  17. package/browser/driver/sqlserver/SqlServerQueryRunner.js +23 -15
  18. package/browser/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
  19. package/browser/naming-strategy/DefaultNamingStrategy.d.ts +1 -1
  20. package/browser/naming-strategy/DefaultNamingStrategy.js.map +1 -1
  21. package/decorator/options/ViewColumnOptions.d.ts +6 -0
  22. package/decorator/options/ViewColumnOptions.js.map +1 -1
  23. package/driver/aurora-data-api/AuroraDataApiQueryRunner.js +21 -14
  24. package/driver/aurora-data-api/AuroraDataApiQueryRunner.js.map +1 -1
  25. package/driver/cockroachdb/CockroachQueryRunner.js +19 -13
  26. package/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
  27. package/driver/mysql/MysqlQueryRunner.js +21 -14
  28. package/driver/mysql/MysqlQueryRunner.js.map +1 -1
  29. package/driver/oracle/OracleQueryRunner.js +21 -14
  30. package/driver/oracle/OracleQueryRunner.js.map +1 -1
  31. package/driver/postgres/PostgresQueryRunner.js +19 -13
  32. package/driver/postgres/PostgresQueryRunner.js.map +1 -1
  33. package/driver/sap/SapQueryRunner.js +19 -13
  34. package/driver/sap/SapQueryRunner.js.map +1 -1
  35. package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +21 -15
  36. package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
  37. package/driver/sqlserver/SqlServerQueryRunner.js +23 -15
  38. package/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
  39. package/naming-strategy/DefaultNamingStrategy.d.ts +1 -1
  40. package/naming-strategy/DefaultNamingStrategy.js.map +1 -1
  41. package/package.json +1 -1
package/browser/driver/postgres/PostgresQueryRunner.js CHANGED
@@ -2350,7 +2350,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
2350
2350
  */
2351
2351
  PostgresQueryRunner.prototype.clearDatabase = function () {
2352
2352
  return __awaiter(this, void 0, void 0, function () {
2353
- var schemas, schemaNamesString, version, selectViewDropsQuery, dropViewQueries, selectMatViewDropsQuery, dropMatViewQueries, selectTableDropsQuery, dropTableQueries, error_1, rollbackError_1;
2353
+ var schemas, schemaNamesString, isAnotherTransactionActive, version, selectViewDropsQuery, dropViewQueries, selectMatViewDropsQuery, dropMatViewQueries, selectTableDropsQuery, dropTableQueries, error_1, rollbackError_1;
2354
2354
  var _this = this;
2355
2355
  return __generator(this, function (_a) {
2356
2356
  switch (_a.label) {
@@ -2367,12 +2367,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
2367
2367
  schemaNamesString = schemas.map(function (name) {
2368
2368
  return name === "current_schema()" ? name : "'" + name + "'";
2369
2369
  }).join(", ");
2370
+ isAnotherTransactionActive = this.isTransactionActive;
2371
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 2];
2370
2372
  return [4 /*yield*/, this.startTransaction()];
2371
2373
  case 1:
2372
2374
  _a.sent();
2373
2375
  _a.label = 2;
2374
2376
  case 2:
2375
- _a.trys.push([2, 13, , 18]);
2377
+ _a.trys.push([2, 14, , 20]);
2376
2378
  return [4 /*yield*/, this.getVersion()
2377
2379
  // drop views
2378
2380
  ];
@@ -2409,24 +2411,28 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
2409
2411
  case 11:
2410
2412
  // drop enum types
2411
2413
  _a.sent();
2414
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 13];
2412
2415
  return [4 /*yield*/, this.commitTransaction()];
2413
2416
  case 12:
2414
2417
  _a.sent();
2415
- return [3 /*break*/, 18];
2416
- case 13:
2417
- error_1 = _a.sent();
2418
- _a.label = 14;
2418
+ _a.label = 13;
2419
+ case 13: return [3 /*break*/, 20];
2419
2420
  case 14:
2420
- _a.trys.push([14, 16, , 17]);
2421
- return [4 /*yield*/, this.rollbackTransaction()];
2421
+ error_1 = _a.sent();
2422
+ _a.label = 15;
2422
2423
  case 15:
2423
- _a.sent();
2424
- return [3 /*break*/, 17];
2424
+ _a.trys.push([15, 18, , 19]);
2425
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 17];
2426
+ return [4 /*yield*/, this.rollbackTransaction()];
2425
2427
  case 16:
2428
+ _a.sent();
2429
+ _a.label = 17;
2430
+ case 17: return [3 /*break*/, 19];
2431
+ case 18:
2426
2432
  rollbackError_1 = _a.sent();
2427
- return [3 /*break*/, 17];
2428
- case 17: throw error_1;
2429
- case 18: return [2 /*return*/];
2433
+ return [3 /*break*/, 19];
2434
+ case 19: throw error_1;
2435
+ case 20: return [2 /*return*/];
2430
2436
  }
2431
2437
  });
2432
2438
  });