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