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/sap/SapQueryRunner.js CHANGED
@@ -1947,7 +1947,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
1947
1947
  */
1948
1948
  SapQueryRunner.prototype.clearDatabase = function () {
1949
1949
  return __awaiter(this, void 0, void 0, function () {
1950
- var schemas, schemaNamesString, selectTableDropsQuery, dropTableQueries, error_1, rollbackError_1;
1950
+ var schemas, schemaNamesString, isAnotherTransactionActive, selectTableDropsQuery, dropTableQueries, error_1, rollbackError_1;
1951
1951
  var _this = this;
1952
1952
  return __generator(this, function (_a) {
1953
1953
  switch (_a.label) {
@@ -1964,12 +1964,14 @@ var SapQueryRunner = /** @class */ (function (_super) {
1964
1964
  schemaNamesString = schemas.map(function (name) {
1965
1965
  return name === "current_schema" ? name : "'" + name + "'";
1966
1966
  }).join(", ");
1967
+ isAnotherTransactionActive = this.isTransactionActive;
1968
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 2];
1967
1969
  return [4 /*yield*/, this.startTransaction()];
1968
1970
  case 1:
1969
1971
  _a.sent();
1970
1972
  _a.label = 2;
1971
1973
  case 2:
1972
- _a.trys.push([2, 6, , 11]);
1974
+ _a.trys.push([2, 7, , 13]);
1973
1975
  selectTableDropsQuery = "SELECT 'DROP TABLE \"' || schema_name || '\".\"' || table_name || '\" CASCADE;' as \"query\" FROM \"SYS\".\"TABLES\" WHERE \"SCHEMA_NAME\" IN (" + schemaNamesString + ") AND \"TABLE_NAME\" NOT IN ('SYS_AFL_GENERATOR_PARAMETERS') AND \"IS_COLUMN_TABLE\" = 'TRUE'";
1974
1976
  return [4 /*yield*/, this.query(selectTableDropsQuery)];
1975
1977
  case 3:
@@ -1977,24 +1979,28 @@ var SapQueryRunner = /** @class */ (function (_super) {
1977
1979
  return [4 /*yield*/, Promise.all(dropTableQueries.map(function (q) { return _this.query(q["query"]); }))];
1978
1980
  case 4:
1979
1981
  _a.sent();
1982
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 6];
1980
1983
  return [4 /*yield*/, this.commitTransaction()];
1981
1984
  case 5:
1982
1985
  _a.sent();
1983
- return [3 /*break*/, 11];
1984
- case 6:
1985
- error_1 = _a.sent();
1986
- _a.label = 7;
1986
+ _a.label = 6;
1987
+ case 6: return [3 /*break*/, 13];
1987
1988
  case 7:
1988
- _a.trys.push([7, 9, , 10]);
1989
- return [4 /*yield*/, this.rollbackTransaction()];
1989
+ error_1 = _a.sent();
1990
+ _a.label = 8;
1990
1991
  case 8:
1991
- _a.sent();
1992
- return [3 /*break*/, 10];
1992
+ _a.trys.push([8, 11, , 12]);
1993
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 10];
1994
+ return [4 /*yield*/, this.rollbackTransaction()];
1993
1995
  case 9:
1996
+ _a.sent();
1997
+ _a.label = 10;
1998
+ case 10: return [3 /*break*/, 12];
1999
+ case 11:
1994
2000
  rollbackError_1 = _a.sent();
1995
- return [3 /*break*/, 10];
1996
- case 10: throw error_1;
1997
- case 11: return [2 /*return*/];
2001
+ return [3 /*break*/, 12];
2002
+ case 12: throw error_1;
2003
+ case 13: return [2 /*return*/];
1998
2004
  }
1999
2005
  });
2000
2006
  });