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/sqlserver/SqlServerQueryRunner.js CHANGED
@@ -2019,7 +2019,7 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
2019
2019
  */
2020
2020
  SqlServerQueryRunner.prototype.clearDatabase = function (database) {
2021
2021
  return __awaiter(this, void 0, void 0, function () {
2022
- var isDatabaseExist, allViewsSql, allViewsResults, allTablesSql, allTablesResults, tablesByCatalog, foreignKeysSql, foreignKeys, error_1, rollbackError_1;
2022
+ var isDatabaseExist, isAnotherTransactionActive, allViewsSql, allViewsResults, allTablesSql, allTablesResults, tablesByCatalog, foreignKeysSql, foreignKeys, error_1, rollbackError_1;
2023
2023
  var _this = this;
2024
2024
  return __generator(this, function (_a) {
2025
2025
  switch (_a.label) {
@@ -2031,12 +2031,15 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
2031
2031
  if (!isDatabaseExist)
2032
2032
  return [2 /*return*/, Promise.resolve()];
2033
2033
  _a.label = 2;
2034
- case 2: return [4 /*yield*/, this.startTransaction()];
2034
+ case 2:
2035
+ isAnotherTransactionActive = this.isTransactionActive;
2036
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 4];
2037
+ return [4 /*yield*/, this.startTransaction()];
2035
2038
  case 3:
2036
2039
  _a.sent();
2037
2040
  _a.label = 4;
2038
2041
  case 4:
2039
- _a.trys.push([4, 13, , 18]);
2042
+ _a.trys.push([4, 14, , 20]);
2040
2043
  allViewsSql = database
2041
2044
  ? "SELECT * FROM \"" + database + "\".\"INFORMATION_SCHEMA\".\"VIEWS\""
2042
2045
  : "SELECT * FROM \"INFORMATION_SCHEMA\".\"VIEWS\"";
@@ -2108,24 +2111,29 @@ var SqlServerQueryRunner = /** @class */ (function (_super) {
2108
2111
  case 10:
2109
2112
  _a.sent();
2110
2113
  _a.label = 11;
2111
- case 11: return [4 /*yield*/, this.commitTransaction()];
2114
+ case 11:
2115
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 13];
2116
+ return [4 /*yield*/, this.commitTransaction()];
2112
2117
  case 12:
2113
2118
  _a.sent();
2114
- return [3 /*break*/, 18];
2115
- case 13:
2116
- error_1 = _a.sent();
2117
- _a.label = 14;
2119
+ _a.label = 13;
2120
+ case 13: return [3 /*break*/, 20];
2118
2121
  case 14:
2119
- _a.trys.push([14, 16, , 17]);
2120
- return [4 /*yield*/, this.rollbackTransaction()];
2122
+ error_1 = _a.sent();
2123
+ _a.label = 15;
2121
2124
  case 15:
2122
- _a.sent();
2123
- return [3 /*break*/, 17];
2125
+ _a.trys.push([15, 18, , 19]);
2126
+ if (!!isAnotherTransactionActive) return [3 /*break*/, 17];
2127
+ return [4 /*yield*/, this.rollbackTransaction()];
2124
2128
  case 16:
2129
+ _a.sent();
2130
+ _a.label = 17;
2131
+ case 17: return [3 /*break*/, 19];
2132
+ case 18:
2125
2133
  rollbackError_1 = _a.sent();
2126
- return [3 /*break*/, 17];
2127
- case 17: throw error_1;
2128
- case 18: return [2 /*return*/];
2134
+ return [3 /*break*/, 19];
2135
+ case 19: throw error_1;
2136
+ case 20: return [2 /*return*/];
2129
2137
  }
2130
2138
  });
2131
2139
  });