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