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/driver/postgres/PostgresQueryRunner.js CHANGED
@@ -2353,7 +2353,7 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
2353
2353
  */
2354
2354
  PostgresQueryRunner.prototype.clearDatabase = function () {
2355
2355
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
2356
- var schemas, schemaNamesString, version, selectViewDropsQuery, dropViewQueries, selectMatViewDropsQuery, dropMatViewQueries, selectTableDropsQuery, dropTableQueries, error_2, rollbackError_1;
2356
+ var schemas, schemaNamesString, isAnotherTransactionActive, version, selectViewDropsQuery, dropViewQueries, selectMatViewDropsQuery, dropMatViewQueries, selectTableDropsQuery, dropTableQueries, error_2, rollbackError_1;
2357
2357
  var _this = this;
2358
2358
  return (0, tslib_1.__generator)(this, function (_a) {
2359
2359
  switch (_a.label) {
@@ -2370,12 +2370,14 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
2370
2370
  schemaNamesString = schemas.map(function (name) {
2371
2371
  return name === "current_schema()" ? name : "'" + name + "'";
2372
2372
  }).join(", ");
2373
+ isAnotherTransactionActive = this.isTransactionActive;
2374
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 2];
2373
2375
  return [4 /*yield*/, this.startTransaction()];
2374
2376
  case 1:
2375
2377
  _a.sent();
2376
2378
  _a.label = 2;
2377
2379
  case 2:
2378
- _a.trys.push([2, 13, , 18]);
2380
+ _a.trys.push([2, 14, , 20]);
2379
2381
  return [4 /*yield*/, this.getVersion()
2380
2382
  // drop views
2381
2383
  ];
@@ -2412,24 +2414,28 @@ var PostgresQueryRunner = /** @class */ (function (_super) {
2412
2414
  case 11:
2413
2415
  // drop enum types
2414
2416
  _a.sent();
2417
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 13];
2415
2418
  return [4 /*yield*/, this.commitTransaction()];
2416
2419
  case 12:
2417
2420
  _a.sent();
2418
- return [3 /*break*/, 18];
2419
- case 13:
2420
- error_2 = _a.sent();
2421
- _a.label = 14;
2421
+ _a.label = 13;
2422
+ case 13: return [3 /*break*/, 20];
2422
2423
  case 14:
2423
- _a.trys.push([14, 16, , 17]);
2424
- return [4 /*yield*/, this.rollbackTransaction()];
2424
+ error_2 = _a.sent();
2425
+ _a.label = 15;
2425
2426
  case 15:
2426
- _a.sent();
2427
- return [3 /*break*/, 17];
2427
+ _a.trys.push([15, 18, , 19]);
2428
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 17];
2429
+ return [4 /*yield*/, this.rollbackTransaction()];
2428
2430
  case 16:
2431
+ _a.sent();
2432
+ _a.label = 17;
2433
+ case 17: return [3 /*break*/, 19];
2434
+ case 18:
2429
2435
  rollbackError_1 = _a.sent();
2430
- return [3 /*break*/, 17];
2431
- case 17: throw error_2;
2432
- case 18: return [2 /*return*/];
2436
+ return [3 /*break*/, 19];
2437
+ case 19: throw error_2;
2438
+ case 20: return [2 /*return*/];
2433
2439
  }
2434
2440
  });
2435
2441
  });