typeorm 0.2.39-dev.ef33cf4 → 0.2.40-dev.ae858ad

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 (84) hide show
  1. package/README.md +0 -3
  2. package/browser/driver/cockroachdb/CockroachDriver.js +23 -14
  3. package/browser/driver/cockroachdb/CockroachDriver.js.map +1 -1
  4. package/browser/driver/cockroachdb/CockroachQueryRunner.js +63 -69
  5. package/browser/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
  6. package/browser/driver/cordova/CordovaDriver.d.ts +1 -1
  7. package/browser/driver/cordova/CordovaDriver.js +25 -18
  8. package/browser/driver/cordova/CordovaDriver.js.map +1 -1
  9. package/browser/driver/cordova/CordovaQueryRunner.js +50 -43
  10. package/browser/driver/cordova/CordovaQueryRunner.js.map +1 -1
  11. package/browser/driver/postgres/PostgresDriver.d.ts +2 -2
  12. package/browser/driver/postgres/PostgresDriver.js +31 -40
  13. package/browser/driver/postgres/PostgresDriver.js.map +1 -1
  14. package/browser/driver/postgres/PostgresQueryRunner.js +7 -15
  15. package/browser/driver/postgres/PostgresQueryRunner.js.map +1 -1
  16. package/browser/driver/sap/SapQueryRunner.js +10 -28
  17. package/browser/driver/sap/SapQueryRunner.js.map +1 -1
  18. package/browser/driver/sqljs/SqljsDriver.js +5 -22
  19. package/browser/driver/sqljs/SqljsDriver.js.map +1 -1
  20. package/browser/driver/sqljs/SqljsQueryRunner.js +9 -10
  21. package/browser/driver/sqljs/SqljsQueryRunner.js.map +1 -1
  22. package/browser/find-options/FindOptionsUtils.d.ts +2 -0
  23. package/browser/find-options/FindOptionsUtils.js +19 -1
  24. package/browser/find-options/FindOptionsUtils.js.map +1 -1
  25. package/browser/migration/MigrationExecutor.d.ts +1 -1
  26. package/browser/migration/MigrationExecutor.js +2 -14
  27. package/browser/migration/MigrationExecutor.js.map +1 -1
  28. package/browser/persistence/SubjectExecutor.js +3 -3
  29. package/browser/persistence/SubjectExecutor.js.map +1 -1
  30. package/browser/persistence/subject-builder/OneToManySubjectBuilder.js +10 -4
  31. package/browser/persistence/subject-builder/OneToManySubjectBuilder.js.map +1 -1
  32. package/browser/query-builder/QueryExpressionMap.d.ts +6 -0
  33. package/browser/query-builder/QueryExpressionMap.js.map +1 -1
  34. package/browser/query-builder/SelectQueryBuilder.d.ts +7 -1
  35. package/browser/query-builder/SelectQueryBuilder.js +37 -5
  36. package/browser/query-builder/SelectQueryBuilder.js.map +1 -1
  37. package/browser/query-runner/BaseQueryRunner.js +3 -2
  38. package/browser/query-runner/BaseQueryRunner.js.map +1 -1
  39. package/browser/repository/TreeRepository.d.ts +3 -3
  40. package/browser/repository/TreeRepository.js +28 -39
  41. package/browser/repository/TreeRepository.js.map +1 -1
  42. package/commands/InitCommand.js +2 -1
  43. package/commands/InitCommand.js.map +1 -1
  44. package/driver/cockroachdb/CockroachDriver.js +23 -14
  45. package/driver/cockroachdb/CockroachDriver.js.map +1 -1
  46. package/driver/cockroachdb/CockroachQueryRunner.js +63 -69
  47. package/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
  48. package/driver/cordova/CordovaDriver.d.ts +1 -1
  49. package/driver/cordova/CordovaDriver.js +25 -18
  50. package/driver/cordova/CordovaDriver.js.map +1 -1
  51. package/driver/cordova/CordovaQueryRunner.js +50 -43
  52. package/driver/cordova/CordovaQueryRunner.js.map +1 -1
  53. package/driver/postgres/PostgresDriver.d.ts +2 -2
  54. package/driver/postgres/PostgresDriver.js +31 -40
  55. package/driver/postgres/PostgresDriver.js.map +1 -1
  56. package/driver/postgres/PostgresQueryRunner.js +7 -15
  57. package/driver/postgres/PostgresQueryRunner.js.map +1 -1
  58. package/driver/sap/SapQueryRunner.js +10 -28
  59. package/driver/sap/SapQueryRunner.js.map +1 -1
  60. package/driver/sqljs/SqljsDriver.js +5 -22
  61. package/driver/sqljs/SqljsDriver.js.map +1 -1
  62. package/driver/sqljs/SqljsQueryRunner.js +9 -10
  63. package/driver/sqljs/SqljsQueryRunner.js.map +1 -1
  64. package/find-options/FindOptionsUtils.d.ts +2 -0
  65. package/find-options/FindOptionsUtils.js +19 -1
  66. package/find-options/FindOptionsUtils.js.map +1 -1
  67. package/migration/MigrationExecutor.d.ts +1 -1
  68. package/migration/MigrationExecutor.js +2 -14
  69. package/migration/MigrationExecutor.js.map +1 -1
  70. package/package.json +1 -1
  71. package/persistence/SubjectExecutor.js +3 -3
  72. package/persistence/SubjectExecutor.js.map +1 -1
  73. package/persistence/subject-builder/OneToManySubjectBuilder.js +10 -4
  74. package/persistence/subject-builder/OneToManySubjectBuilder.js.map +1 -1
  75. package/query-builder/QueryExpressionMap.d.ts +6 -0
  76. package/query-builder/QueryExpressionMap.js.map +1 -1
  77. package/query-builder/SelectQueryBuilder.d.ts +7 -1
  78. package/query-builder/SelectQueryBuilder.js +37 -5
  79. package/query-builder/SelectQueryBuilder.js.map +1 -1
  80. package/query-runner/BaseQueryRunner.js +3 -2
  81. package/query-runner/BaseQueryRunner.js.map +1 -1
  82. package/repository/TreeRepository.d.ts +3 -3
  83. package/repository/TreeRepository.js +27 -38
  84. package/repository/TreeRepository.js.map +1 -1
package/driver/sap/SapQueryRunner.js CHANGED
@@ -162,8 +162,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
162
162
  SapQueryRunner.prototype.query = function (query, parameters, useStructuredResult) {
163
163
  if (useStructuredResult === void 0) { useStructuredResult = false; }
164
164
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
165
- var release, statement, result, databaseConnection_1, queryStartTime_1, isInsertQuery, raw, lastIdQuery_1, identityValueResult, e_1;
166
- var _this = this;
165
+ var release, statement, result, databaseConnection_1, queryStartTime, isInsertQuery, raw, maxQueryExecutionTime, queryEndTime, queryExecutionTime, lastIdQuery_1, identityValueResult, e_1;
167
166
  return (0, tslib_1.__generator)(this, function (_a) {
168
167
  switch (_a.label) {
169
168
  case 0:
@@ -182,29 +181,20 @@ var SapQueryRunner = /** @class */ (function (_super) {
182
181
  // we disable autocommit because ROLLBACK does not work in autocommit mode
183
182
  databaseConnection_1.setAutoCommit(!this.isTransactionActive);
184
183
  this.driver.connection.logger.logQuery(query, parameters, this);
185
- queryStartTime_1 = +new Date();
184
+ queryStartTime = +new Date();
186
185
  isInsertQuery = query.substr(0, 11) === "INSERT INTO";
187
186
  statement = databaseConnection_1.prepare(query);
188
187
  return [4 /*yield*/, new Promise(function (ok, fail) {
189
- statement.exec(parameters, function (err, raw) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
190
- var maxQueryExecutionTime, queryEndTime, queryExecutionTime;
191
- return (0, tslib_1.__generator)(this, function (_a) {
192
- maxQueryExecutionTime = this.driver.connection.options.maxQueryExecutionTime;
193
- queryEndTime = +new Date();
194
- queryExecutionTime = queryEndTime - queryStartTime_1;
195
- if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime) {
196
- this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
197
- }
198
- if (err) {
199
- fail(new error_1.QueryFailedError(query, parameters, err));
200
- }
201
- ok(raw);
202
- return [2 /*return*/];
203
- });
204
- }); });
188
+ statement.exec(parameters, function (err, raw) { return err ? fail(new error_1.QueryFailedError(query, parameters, err)) : ok(raw); });
205
189
  })];
206
190
  case 4:
207
191
  raw = _a.sent();
192
+ maxQueryExecutionTime = this.driver.connection.options.maxQueryExecutionTime;
193
+ queryEndTime = +new Date();
194
+ queryExecutionTime = queryEndTime - queryStartTime;
195
+ if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime) {
196
+ this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
197
+ }
208
198
  if (typeof raw === "number") {
209
199
  result.affected = raw;
210
200
  }
@@ -216,15 +206,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
216
206
  lastIdQuery_1 = "SELECT CURRENT_IDENTITY_VALUE() FROM \"SYS\".\"DUMMY\"";
217
207
  this.driver.connection.logger.logQuery(lastIdQuery_1, [], this);
218
208
  return [4 /*yield*/, new Promise(function (ok, fail) {
219
- databaseConnection_1.exec(lastIdQuery_1, function (err, raw) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
220
- return (0, tslib_1.__generator)(this, function (_a) {
221
- if (err) {
222
- fail(new error_1.QueryFailedError(lastIdQuery_1, [], err));
223
- }
224
- ok(raw);
225
- return [2 /*return*/];
226
- });
227
- }); });
209
+ databaseConnection_1.exec(lastIdQuery_1, function (err, raw) { return err ? fail(new error_1.QueryFailedError(lastIdQuery_1, [], err)) : ok(raw); });
228
210
  })];
229
211
  case 5:
230
212
  identityValueResult = _a.sent();