typeorm 0.2.39-dev.ef33cf4 → 0.2.40-dev.3f98197

package/browser/driver/sap/SapQueryRunner.js

@@ -159,8 +159,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
     SapQueryRunner.prototype.query = function (query, parameters, useStructuredResult) {
         if (useStructuredResult === void 0) { useStructuredResult = false; }
         return __awaiter(this, void 0, void 0, function () {
-            var release, statement, result, databaseConnection_1, queryStartTime_1, isInsertQuery, raw, lastIdQuery_1, identityValueResult, e_1;
-            var _this = this;
+            var release, statement, result, databaseConnection_1, queryStartTime, isInsertQuery, raw, maxQueryExecutionTime, queryEndTime, queryExecutionTime, lastIdQuery_1, identityValueResult, e_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -179,29 +178,20 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         // we disable autocommit because ROLLBACK does not work in autocommit mode
                         databaseConnection_1.setAutoCommit(!this.isTransactionActive);
                         this.driver.connection.logger.logQuery(query, parameters, this);
-                        queryStartTime_1 = +new Date();
+                        queryStartTime = +new Date();
                         isInsertQuery = query.substr(0, 11) === "INSERT INTO";
                         statement = databaseConnection_1.prepare(query);
                         return [4 /*yield*/, new Promise(function (ok, fail) {
-                                statement.exec(parameters, function (err, raw) { return __awaiter(_this, void 0, void 0, function () {
-                                    var maxQueryExecutionTime, queryEndTime, queryExecutionTime;
-                                    return __generator(this, function (_a) {
-                                        maxQueryExecutionTime = this.driver.connection.options.maxQueryExecutionTime;
-                                        queryEndTime = +new Date();
-                                        queryExecutionTime = queryEndTime - queryStartTime_1;
-                                        if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime) {
-                                            this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
-                                        }
-                                        if (err) {
-                                            fail(new QueryFailedError(query, parameters, err));
-                                        }
-                                        ok(raw);
-                                        return [2 /*return*/];
-                                    });
-                                }); });
+                                statement.exec(parameters, function (err, raw) { return err ? fail(new QueryFailedError(query, parameters, err)) : ok(raw); });
                             })];
                     case 4:
                         raw = _a.sent();
+                        maxQueryExecutionTime = this.driver.connection.options.maxQueryExecutionTime;
+                        queryEndTime = +new Date();
+                        queryExecutionTime = queryEndTime - queryStartTime;
+                        if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime) {
+                            this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
+                        }
                         if (typeof raw === "number") {
                             result.affected = raw;
                         }
@@ -213,15 +203,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         lastIdQuery_1 = "SELECT CURRENT_IDENTITY_VALUE() FROM \"SYS\".\"DUMMY\"";
                         this.driver.connection.logger.logQuery(lastIdQuery_1, [], this);
                         return [4 /*yield*/, new Promise(function (ok, fail) {
-                                databaseConnection_1.exec(lastIdQuery_1, function (err, raw) { return __awaiter(_this, void 0, void 0, function () {
-                                    return __generator(this, function (_a) {
-                                        if (err) {
-                                            fail(new QueryFailedError(lastIdQuery_1, [], err));
-                                        }
-                                        ok(raw);
-                                        return [2 /*return*/];
-                                    });
-                                }); });
+                                databaseConnection_1.exec(lastIdQuery_1, function (err, raw) { return err ? fail(new QueryFailedError(lastIdQuery_1, [], err)) : ok(raw); });
                             })];
                     case 5:
                         identityValueResult = _a.sent();