typeorm 0.2.39-dev.503d1dc → 0.2.39-dev.9692930

package/browser/driver/cockroachdb/CockroachQueryRunner.js

@@ -228,103 +228,97 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      * Executes a given SQL query.
      */
     CockroachQueryRunner.prototype.query = function (query, parameters, useStructuredResult) {
-        var _this = this;
         if (useStructuredResult === void 0) { useStructuredResult = false; }
-        if (this.isReleased)
-            throw new QueryRunnerAlreadyReleasedError();
-        return new Promise(function (ok, fail) { return __awaiter(_this, void 0, void 0, function () {
-            var databaseConnection, queryStartTime_1, err_1;
-            var _this = this;
+        return __awaiter(this, void 0, void 0, function () {
+            var databaseConnection, queryStartTime, raw, maxQueryExecutionTime, queryEndTime, queryExecutionTime, result, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
+                        if (this.isReleased)
+                            throw new QueryRunnerAlreadyReleasedError();
                         return [4 /*yield*/, this.connect()];
                     case 1:
                         databaseConnection = _a.sent();
                         this.driver.connection.logger.logQuery(query, parameters, this);
-                        queryStartTime_1 = +new Date();
-                        databaseConnection.query(query, parameters, function (err, raw) {
-                            if (_this.isTransactionActive && _this.storeQueries)
-                                _this.queries.push({ query: query, parameters: parameters });
-                            // log slow queries if maxQueryExecution time is set
-                            var maxQueryExecutionTime = _this.driver.options.maxQueryExecutionTime;
-                            var queryEndTime = +new Date();
-                            var queryExecutionTime = queryEndTime - queryStartTime_1;
-                            if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime)
-                                _this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, _this);
-                            if (err) {
-                                if (err.code !== "40001")
-                                    _this.driver.connection.logger.logQueryError(err, query, parameters, _this);
-                                fail(new QueryFailedError(query, parameters, err));
-                            }
-                            else {
-                                var result = new QueryResult();
-                                if (raw.hasOwnProperty('rowCount')) {
-                                    result.affected = raw.rowCount;
-                                }
-                                if (raw.hasOwnProperty('rows')) {
-                                    result.records = raw.rows;
-                                }
-                                switch (raw.command) {
-                                    case "DELETE":
-                                        // for DELETE query additionally return number of affected rows
-                                        result.raw = [raw.rows, raw.rowCount];
-                                        break;
-                                    default:
-                                        result.raw = raw.rows;
-                                }
-                                if (useStructuredResult) {
-                                    ok(result);
-                                }
-                                else {
-                                    ok(result.raw);
-                                }
-                            }
-                        });
-                        return [3 /*break*/, 3];
+                        queryStartTime = +new Date();
+                        if (this.isTransactionActive && this.storeQueries) {
+                            this.queries.push({ query: query, parameters: parameters });
+                        }
+                        _a.label = 2;
                     case 2:
+                        _a.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, new Promise(function (ok, fail) {
+                                databaseConnection.query(query, parameters, function (err, raw) { return err ? fail(err) : ok(raw); });
+                            })];
+                    case 3:
+                        raw = _a.sent();
+                        maxQueryExecutionTime = this.driver.options.maxQueryExecutionTime;
+                        queryEndTime = +new Date();
+                        queryExecutionTime = queryEndTime - queryStartTime;
+                        if (maxQueryExecutionTime && queryExecutionTime > maxQueryExecutionTime) {
+                            this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
+                        }
+                        result = new QueryResult();
+                        if (raw.hasOwnProperty('rowCount')) {
+                            result.affected = raw.rowCount;
+                        }
+                        if (raw.hasOwnProperty('rows')) {
+                            result.records = raw.rows;
+                        }
+                        switch (raw.command) {
+                            case "DELETE":
+                                // for DELETE query additionally return number of affected rows
+                                result.raw = [raw.rows, raw.rowCount];
+                                break;
+                            default:
+                                result.raw = raw.rows;
+                        }
+                        if (useStructuredResult) {
+                            return [2 /*return*/, result];
+                        }
+                        else {
+                            return [2 /*return*/, result.raw];
+                        }
+                        return [3 /*break*/, 5];
+                    case 4:
                         err_1 = _a.sent();
-                        fail(err_1);
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+                        if (err_1.code !== "40001") {
+                            this.driver.connection.logger.logQueryError(err_1, query, parameters, this);
+                        }
+                        throw new QueryFailedError(query, parameters, err_1);
+                    case 5: return [2 /*return*/];
                 }
             });
-        }); });
+        });
     };
     /**
      * Returns raw data stream.
      */
     CockroachQueryRunner.prototype.stream = function (query, parameters, onEnd, onError) {
-        var _this = this;
-        var QueryStream = this.driver.loadStreamDependency();
-        if (this.isReleased)
-            throw new QueryRunnerAlreadyReleasedError();
-        return new Promise(function (ok, fail) { return __awaiter(_this, void 0, void 0, function () {
-            var databaseConnection, stream, err_2;
+        return __awaiter(this, void 0, void 0, function () {
+            var QueryStream, databaseConnection, stream;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
+                        QueryStream = this.driver.loadStreamDependency();
+                        if (this.isReleased) {
+                            throw new QueryRunnerAlreadyReleasedError();
+                        }
                         return [4 /*yield*/, this.connect()];
                     case 1:
                         databaseConnection = _a.sent();
                         this.driver.connection.logger.logQuery(query, parameters, this);
                         stream = databaseConnection.query(new QueryStream(query, parameters));
-                        if (onEnd)
+                        if (onEnd) {
                             stream.on("end", onEnd);
-                        if (onError)
+                        }
+                        if (onError) {
                             stream.on("error", onError);
-                        ok(stream);
-                        return [3 /*break*/, 3];
-                    case 2:
-                        err_2 = _a.sent();
-                        fail(err_2);
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+                        }
+                        return [2 /*return*/, stream];
                 }
             });
-        }); });
+        });
     };
     /**
      * Returns all available database names including system databases.
@@ -2323,7 +2317,7 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                                                                 tableColumn.generationStrategy = "uuid";
                                                             }
                                                             else {
-                                                                tableColumn.default = dbColumn["column_default"].replace(/:::.*/, "");
+                                                                tableColumn.default = dbColumn["column_default"].replace(/:::[\w\s\[\]\"]+/g, "");
                                                                 tableColumn.default = tableColumn.default.replace(/^(-?[\d\.]+)$/, "($1)");
                                                             }
                                                         }