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/cockroachdb/CockroachQueryRunner.js CHANGED
@@ -2047,7 +2047,7 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
2047
2047
  */
2048
2048
  CockroachQueryRunner.prototype.clearDatabase = function () {
2049
2049
  return __awaiter(this, void 0, void 0, function () {
2050
- var schemas, schemaNamesString, selectViewDropsQuery, dropViewQueries, selectDropsQuery, dropQueries, selectSequenceDropsQuery, sequenceDropQueries, error_1, rollbackError_1;
2050
+ var schemas, schemaNamesString, isAnotherTransactionActive, selectViewDropsQuery, dropViewQueries, selectDropsQuery, dropQueries, selectSequenceDropsQuery, sequenceDropQueries, error_1, rollbackError_1;
2051
2051
  var _this = this;
2052
2052
  return __generator(this, function (_a) {
2053
2053
  switch (_a.label) {
@@ -2064,12 +2064,14 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
2064
2064
  schemaNamesString = schemas.map(function (name) {
2065
2065
  return name === "current_schema()" ? name : "'" + name + "'";
2066
2066
  }).join(", ");
2067
+ isAnotherTransactionActive = this.isTransactionActive;
2068
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 2];
2067
2069
  return [4 /*yield*/, this.startTransaction()];
2068
2070
  case 1:
2069
2071
  _a.sent();
2070
2072
  _a.label = 2;
2071
2073
  case 2:
2072
- _a.trys.push([2, 10, , 15]);
2074
+ _a.trys.push([2, 11, , 17]);
2073
2075
  selectViewDropsQuery = "SELECT 'DROP VIEW IF EXISTS \"' || schemaname || '\".\"' || viewname || '\" CASCADE;' as \"query\" " +
2074
2076
  ("FROM \"pg_views\" WHERE \"schemaname\" IN (" + schemaNamesString + ")");
2075
2077
  return [4 /*yield*/, this.query(selectViewDropsQuery)];
@@ -2092,24 +2094,28 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
2092
2094
  return [4 /*yield*/, Promise.all(sequenceDropQueries.map(function (q) { return _this.query(q["query"]); }))];
2093
2095
  case 8:
2094
2096
  _a.sent();
2097
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 10];
2095
2098
  return [4 /*yield*/, this.commitTransaction()];
2096
2099
  case 9:
2097
2100
  _a.sent();
2098
- return [3 /*break*/, 15];
2099
- case 10:
2100
- error_1 = _a.sent();
2101
- _a.label = 11;
2101
+ _a.label = 10;
2102
+ case 10: return [3 /*break*/, 17];
2102
2103
  case 11:
2103
- _a.trys.push([11, 13, , 14]);
2104
- return [4 /*yield*/, this.rollbackTransaction()];
2104
+ error_1 = _a.sent();
2105
+ _a.label = 12;
2105
2106
  case 12:
2106
- _a.sent();
2107
- return [3 /*break*/, 14];
2107
+ _a.trys.push([12, 15, , 16]);
2108
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 14];
2109
+ return [4 /*yield*/, this.rollbackTransaction()];
2108
2110
  case 13:
2111
+ _a.sent();
2112
+ _a.label = 14;
2113
+ case 14: return [3 /*break*/, 16];
2114
+ case 15:
2109
2115
  rollbackError_1 = _a.sent();
2110
- return [3 /*break*/, 14];
2111
- case 14: throw error_1;
2112
- case 15: return [2 /*return*/];
2116
+ return [3 /*break*/, 16];
2117
+ case 16: throw error_1;
2118
+ case 17: return [2 /*return*/];
2113
2119
  }
2114
2120
  });
2115
2121
  });