taon-typeorm 18.0.18 → 18.0.20

package/lib/typeorm/driver/cockroachdb/CockroachDriver.js

@@ -1,165 +1,208 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CockroachDriver = void 0;
-var tslib_1 = require("tslib");
-var ConnectionIsNotSetError_1 = require("../../error/ConnectionIsNotSetError");
-var DriverPackageNotInstalledError_1 = require("../../error/DriverPackageNotInstalledError");
-var DriverUtils_1 = require("../DriverUtils");
-var DateUtils_1 = require("../../util/DateUtils");
-var PlatformTools_1 = require("../../platform/PlatformTools");
-var RdbmsSchemaBuilder_1 = require("../../schema-builder/RdbmsSchemaBuilder");
-var OrmUtils_1 = require("../../util/OrmUtils");
-var CockroachQueryRunner_1 = require("./CockroachQueryRunner");
-var ApplyValueTransformers_1 = require("../../util/ApplyValueTransformers");
-var error_1 = require("../../error");
-var ObjectUtils_1 = require("../../util/ObjectUtils");
-var InstanceChecker_1 = require("../../util/InstanceChecker");
+const ConnectionIsNotSetError_1 = require("../../error/ConnectionIsNotSetError");
+const DriverPackageNotInstalledError_1 = require("../../error/DriverPackageNotInstalledError");
+const DriverUtils_1 = require("../DriverUtils");
+const DateUtils_1 = require("../../util/DateUtils");
+const PlatformTools_1 = require("../../platform/PlatformTools");
+const RdbmsSchemaBuilder_1 = require("../../schema-builder/RdbmsSchemaBuilder");
+const OrmUtils_1 = require("../../util/OrmUtils");
+const CockroachQueryRunner_1 = require("./CockroachQueryRunner");
+const ApplyValueTransformers_1 = require("../../util/ApplyValueTransformers");
+const error_1 = require("../../error");
+const ObjectUtils_1 = require("../../util/ObjectUtils");
+const InstanceChecker_1 = require("../../util/InstanceChecker");
 /**
  * Organizes communication with Cockroach DBMS.
  */
-var CockroachDriver = /** @class */ (function () {
+class CockroachDriver {
+    // -------------------------------------------------------------------------
+    // Public Properties
+    // -------------------------------------------------------------------------
+    /**
+     * Connection used by driver.
+     */
+    connection;
+    /**
+     * Cockroach underlying library.
+     */
+    postgres;
+    /**
+     * Pool for master database.
+     */
+    master;
+    /**
+     * Pool for slave databases.
+     * Used in replication.
+     */
+    slaves = [];
+    /**
+     * We store all created query runners because we need to release them.
+     */
+    connectedQueryRunners = [];
+    // -------------------------------------------------------------------------
+    // Public Implemented Properties
+    // -------------------------------------------------------------------------
+    /**
+     * Connection options.
+     */
+    options;
+    /**
+     * Database name used to perform all write queries.
+     */
+    database;
+    /**
+     * Schema name used to perform all write queries.
+     */
+    schema;
+    /**
+     * Schema that's used internally by Postgres for object resolution.
+     *
+     * Because we never set this we have to track it in separately from the `schema` so
+     * we know when we have to specify the full schema or not.
+     *
+     * In most cases this will be `public`.
+     */
+    searchSchema;
+    /**
+     * Indicates if replication is enabled.
+     */
+    isReplicated = false;
+    /**
+     * Indicates if tree tables are supported by this driver.
+     */
+    treeSupport = true;
+    /**
+     * Represent transaction support by this driver
+     */
+    transactionSupport = "nested";
+    /**
+     * Gets list of supported column data types by a driver.
+     *
+     * @see https://www.cockroachlabs.com/docs/stable/data-types.html
+     */
+    supportedDataTypes = [
+        "array",
+        "bool",
+        "boolean",
+        "bytes",
+        "bytea",
+        "blob",
+        "date",
+        "numeric",
+        "decimal",
+        "dec",
+        "float",
+        "float4",
+        "float8",
+        "double precision",
+        "real",
+        "inet",
+        "int",
+        "int4",
+        "integer",
+        "int2",
+        "int8",
+        "int64",
+        "smallint",
+        "bigint",
+        "interval",
+        "string",
+        "character varying",
+        "character",
+        "char",
+        "char varying",
+        "varchar",
+        "text",
+        "time",
+        "time without time zone",
+        "timestamp",
+        "timestamptz",
+        "timestamp without time zone",
+        "timestamp with time zone",
+        "json",
+        "jsonb",
+        "uuid",
+    ];
+    /**
+     * Returns type of upsert supported by driver if any
+     */
+    supportedUpsertType = "on-conflict-do-update";
+    /**
+     * Gets list of spatial column data types.
+     */
+    spatialTypes = [];
+    /**
+     * Gets list of column data types that support length by a driver.
+     */
+    withLengthColumnTypes = [
+        "character varying",
+        "char varying",
+        "varchar",
+        "character",
+        "char",
+        "string",
+    ];
+    /**
+     * Gets list of column data types that support precision by a driver.
+     */
+    withPrecisionColumnTypes = ["numeric", "decimal", "dec"];
+    /**
+     * Gets list of column data types that support scale by a driver.
+     */
+    withScaleColumnTypes = ["numeric", "decimal", "dec"];
+    /**
+     * Orm has special columns and we need to know what database column types should be for those types.
+     * Column types are driver dependant.
+     */
+    mappedDataTypes = {
+        createDate: "timestamptz",
+        createDateDefault: "now()",
+        updateDate: "timestamptz",
+        updateDateDefault: "now()",
+        deleteDate: "timestamptz",
+        deleteDateNullable: true,
+        version: Number,
+        treeLevel: Number,
+        migrationId: Number,
+        migrationName: "varchar",
+        migrationTimestamp: "int8",
+        cacheId: Number,
+        cacheIdentifier: "varchar",
+        cacheTime: "int8",
+        cacheDuration: Number,
+        cacheQuery: "string",
+        cacheResult: "string",
+        metadataType: "varchar",
+        metadataDatabase: "varchar",
+        metadataSchema: "varchar",
+        metadataTable: "varchar",
+        metadataName: "varchar",
+        metadataValue: "string",
+    };
+    /**
+     * Default values of length, precision and scale depends on column data type.
+     * Used in the cases when length/precision/scale is not specified by user.
+     */
+    dataTypeDefaults = {
+        char: { length: 1 },
+    };
+    /**
+     * No documentation specifying a maximum length for identifiers could be found
+     * for CockroarchDb.
+     */
+    maxAliasLength;
+    cteCapabilities = {
+        enabled: true,
+        writable: true,
+        materializedHint: true,
+        requiresRecursiveHint: true,
+    };
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function CockroachDriver(connection) {
-        /**
-         * Pool for slave databases.
-         * Used in replication.
-         */
-        this.slaves = [];
-        /**
-         * We store all created query runners because we need to release them.
-         */
-        this.connectedQueryRunners = [];
-        /**
-         * Indicates if replication is enabled.
-         */
-        this.isReplicated = false;
-        /**
-         * Indicates if tree tables are supported by this driver.
-         */
-        this.treeSupport = true;
-        /**
-         * Represent transaction support by this driver
-         */
-        this.transactionSupport = "nested";
-        /**
-         * Gets list of supported column data types by a driver.
-         *
-         * @see https://www.cockroachlabs.com/docs/stable/data-types.html
-         */
-        this.supportedDataTypes = [
-            "array",
-            "bool",
-            "boolean",
-            "bytes",
-            "bytea",
-            "blob",
-            "date",
-            "numeric",
-            "decimal",
-            "dec",
-            "float",
-            "float4",
-            "float8",
-            "double precision",
-            "real",
-            "inet",
-            "int",
-            "int4",
-            "integer",
-            "int2",
-            "int8",
-            "int64",
-            "smallint",
-            "bigint",
-            "interval",
-            "string",
-            "character varying",
-            "character",
-            "char",
-            "char varying",
-            "varchar",
-            "text",
-            "time",
-            "time without time zone",
-            "timestamp",
-            "timestamptz",
-            "timestamp without time zone",
-            "timestamp with time zone",
-            "json",
-            "jsonb",
-            "uuid",
-        ];
-        /**
-         * Returns type of upsert supported by driver if any
-         */
-        this.supportedUpsertType = "on-conflict-do-update";
-        /**
-         * Gets list of spatial column data types.
-         */
-        this.spatialTypes = [];
-        /**
-         * Gets list of column data types that support length by a driver.
-         */
-        this.withLengthColumnTypes = [
-            "character varying",
-            "char varying",
-            "varchar",
-            "character",
-            "char",
-            "string",
-        ];
-        /**
-         * Gets list of column data types that support precision by a driver.
-         */
-        this.withPrecisionColumnTypes = ["numeric", "decimal", "dec"];
-        /**
-         * Gets list of column data types that support scale by a driver.
-         */
-        this.withScaleColumnTypes = ["numeric", "decimal", "dec"];
-        /**
-         * Orm has special columns and we need to know what database column types should be for those types.
-         * Column types are driver dependant.
-         */
-        this.mappedDataTypes = {
-            createDate: "timestamptz",
-            createDateDefault: "now()",
-            updateDate: "timestamptz",
-            updateDateDefault: "now()",
-            deleteDate: "timestamptz",
-            deleteDateNullable: true,
-            version: Number,
-            treeLevel: Number,
-            migrationId: Number,
-            migrationName: "varchar",
-            migrationTimestamp: "int8",
-            cacheId: Number,
-            cacheIdentifier: "varchar",
-            cacheTime: "int8",
-            cacheDuration: Number,
-            cacheQuery: "string",
-            cacheResult: "string",
-            metadataType: "varchar",
-            metadataDatabase: "varchar",
-            metadataSchema: "varchar",
-            metadataTable: "varchar",
-            metadataName: "varchar",
-            metadataValue: "string",
-        };
-        /**
-         * Default values of length, precision and scale depends on column data type.
-         * Used in the cases when length/precision/scale is not specified by user.
-         */
-        this.dataTypeDefaults = {
-            char: { length: 1 },
-        };
-        this.cteCapabilities = {
-            enabled: true,
-            writable: true,
-            materializedHint: true,
-            requiresRecursiveHint: true,
-        };
+    constructor(connection) {
         this.connection = connection;
         this.options = connection.options;
         this.isReplicated = this.options.replication ? true : false;
@@ -187,112 +230,63 @@ var CockroachDriver = /** @class */ (function () {
      * Based on pooling options, it can either create connection immediately,
      * either create a pool and create connection when needed.
      */
-    CockroachDriver.prototype.connect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, _c, queryRunner, _d, _e;
-            var _this = this;
-            return tslib_1.__generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0:
-                        if (!this.options.replication) return [3 /*break*/, 3];
-                        _a = this;
-                        return [4 /*yield*/, Promise.all(this.options.replication.slaves.map(function (slave) {
-                                return _this.createPool(_this.options, slave);
-                            }))];
-                    case 1:
-                        _a.slaves = _f.sent();
-                        _b = this;
-                        return [4 /*yield*/, this.createPool(this.options, this.options.replication.master)];
-                    case 2:
-                        _b.master = _f.sent();
-                        return [3 /*break*/, 5];
-                    case 3:
-                        _c = this;
-                        return [4 /*yield*/, this.createPool(this.options, this.options)];
-                    case 4:
-                        _c.master = _f.sent();
-                        _f.label = 5;
-                    case 5:
-                        if (!(!this.database || !this.searchSchema)) return [3 /*break*/, 12];
-                        return [4 /*yield*/, this.createQueryRunner("master")];
-                    case 6:
-                        queryRunner = _f.sent();
-                        if (!!this.database) return [3 /*break*/, 8];
-                        _d = this;
-                        return [4 /*yield*/, queryRunner.getCurrentDatabase()];
-                    case 7:
-                        _d.database = _f.sent();
-                        _f.label = 8;
-                    case 8:
-                        if (!!this.searchSchema) return [3 /*break*/, 10];
-                        _e = this;
-                        return [4 /*yield*/, queryRunner.getCurrentSchema()];
-                    case 9:
-                        _e.searchSchema = _f.sent();
-                        _f.label = 10;
-                    case 10: return [4 /*yield*/, queryRunner.release()];
-                    case 11:
-                        _f.sent();
-                        _f.label = 12;
-                    case 12:
-                        if (!this.schema) {
-                            this.schema = this.searchSchema;
-                        }
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async connect() {
+        if (this.options.replication) {
+            this.slaves = await Promise.all(this.options.replication.slaves.map((slave) => {
+                return this.createPool(this.options, slave);
+            }));
+            this.master = await this.createPool(this.options, this.options.replication.master);
+        }
+        else {
+            this.master = await this.createPool(this.options, this.options);
+        }
+        if (!this.database || !this.searchSchema) {
+            const queryRunner = await this.createQueryRunner("master");
+            if (!this.database) {
+                this.database = await queryRunner.getCurrentDatabase();
+            }
+            if (!this.searchSchema) {
+                this.searchSchema = await queryRunner.getCurrentSchema();
+            }
+            await queryRunner.release();
+        }
+        if (!this.schema) {
+            this.schema = this.searchSchema;
+        }
+    }
     /**
      * Makes any action after connection (e.g. create extensions in Postgres driver).
      */
-    CockroachDriver.prototype.afterConnect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, Promise.resolve()];
-            });
-        });
-    };
+    async afterConnect() {
+        return Promise.resolve();
+    }
     /**
      * Closes connection with database.
      */
-    CockroachDriver.prototype.disconnect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.master)
-                            return [2 /*return*/, Promise.reject(new ConnectionIsNotSetError_1.ConnectionIsNotSetError("cockroachdb"))];
-                        return [4 /*yield*/, this.closePool(this.master)];
-                    case 1:
-                        _a.sent();
-                        return [4 /*yield*/, Promise.all(this.slaves.map(function (slave) { return _this.closePool(slave); }))];
-                    case 2:
-                        _a.sent();
-                        this.master = undefined;
-                        this.slaves = [];
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async disconnect() {
+        if (!this.master)
+            return Promise.reject(new ConnectionIsNotSetError_1.ConnectionIsNotSetError("cockroachdb"));
+        await this.closePool(this.master);
+        await Promise.all(this.slaves.map((slave) => this.closePool(slave)));
+        this.master = undefined;
+        this.slaves = [];
+    }
     /**
      * Creates a schema builder used to build and sync a schema.
      */
-    CockroachDriver.prototype.createSchemaBuilder = function () {
+    createSchemaBuilder() {
         return new RdbmsSchemaBuilder_1.RdbmsSchemaBuilder(this.connection);
-    };
+    }
     /**
      * Creates a query runner used to execute database queries.
      */
-    CockroachDriver.prototype.createQueryRunner = function (mode) {
+    createQueryRunner(mode) {
         return new CockroachQueryRunner_1.CockroachQueryRunner(this, mode);
-    };
+    }
     /**
      * Prepares given value to a value to be persisted, based on its column type and metadata.
      */
-    CockroachDriver.prototype.preparePersistentValue = function (value, columnMetadata) {
+    preparePersistentValue(value, columnMetadata) {
         if (columnMetadata.transformer)
             value = ApplyValueTransformers_1.ApplyValueTransformers.transformTo(columnMetadata.transformer, value);
         if (value === null || value === undefined)
@@ -314,7 +308,7 @@ var CockroachDriver = /** @class */ (function () {
             columnMetadata.type === "timestamp without time zone") {
             return DateUtils_1.DateUtils.mixedDateToDate(value);
         }
-        else if (tslib_1.__spreadArray(["json", "jsonb"], tslib_1.__read(this.spatialTypes), false).indexOf(columnMetadata.type) >= 0) {
+        else if (["json", "jsonb", ...this.spatialTypes].indexOf(columnMetadata.type) >= 0) {
             return JSON.stringify(value);
         }
         else if (columnMetadata.type === "simple-array") {
@@ -324,17 +318,17 @@ var CockroachDriver = /** @class */ (function () {
             return DateUtils_1.DateUtils.simpleJsonToString(value);
         }
         return value;
-    };
+    }
     /**
      * Prepares given value to a value to be persisted, based on its column type or metadata.
      */
-    CockroachDriver.prototype.prepareHydratedValue = function (value, columnMetadata) {
+    prepareHydratedValue(value, columnMetadata) {
         if (value === null || value === undefined)
             return columnMetadata.transformer
                 ? ApplyValueTransformers_1.ApplyValueTransformers.transformFrom(columnMetadata.transformer, value)
                 : value;
         // unique_rowid() generates bigint value and should not be converted to number
-        if (([Number, "int4", "smallint", "int2"].some(function (v) { return v === columnMetadata.type; }) &&
+        if (([Number, "int4", "smallint", "int2"].some((v) => v === columnMetadata.type) &&
             !columnMetadata.isArray) ||
             columnMetadata.generationStrategy === "increment") {
             value = parseInt(value);
@@ -365,26 +359,25 @@ var CockroachDriver = /** @class */ (function () {
         if (columnMetadata.transformer)
             value = ApplyValueTransformers_1.ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);
         return value;
-    };
+    }
     /**
      * Replaces parameters in the given sql with special escaping character
      * and an array of parameter names to be passed to a query.
      */
-    CockroachDriver.prototype.escapeQueryWithParameters = function (sql, parameters, nativeParameters) {
-        var _this = this;
-        var escapedParameters = Object.keys(nativeParameters).map(function (key) { return nativeParameters[key]; });
+    escapeQueryWithParameters(sql, parameters, nativeParameters) {
+        const escapedParameters = Object.keys(nativeParameters).map((key) => nativeParameters[key]);
         if (!parameters || !Object.keys(parameters).length)
             return [sql, escapedParameters];
-        sql = sql.replace(/:(\.\.\.)?([A-Za-z0-9_.]+)/g, function (full, isArray, key) {
+        sql = sql.replace(/:(\.\.\.)?([A-Za-z0-9_.]+)/g, (full, isArray, key) => {
             if (!parameters.hasOwnProperty(key)) {
                 return full;
             }
-            var value = parameters[key];
+            let value = parameters[key];
             if (isArray) {
                 return value
-                    .map(function (v) {
+                    .map((v) => {
                     escapedParameters.push(v);
-                    return _this.createParameter(key, escapedParameters.length - 1);
+                    return this.createParameter(key, escapedParameters.length - 1);
                 })
                     .join(", ");
             }
@@ -392,36 +385,36 @@ var CockroachDriver = /** @class */ (function () {
                 return value();
             }
             escapedParameters.push(value);
-            return _this.createParameter(key, escapedParameters.length - 1);
+            return this.createParameter(key, escapedParameters.length - 1);
         }); // todo: make replace only in value statements, otherwise problems
         return [sql, escapedParameters];
-    };
+    }
     /**
      * Escapes a column name.
      */
-    CockroachDriver.prototype.escape = function (columnName) {
+    escape(columnName) {
         return '"' + columnName + '"';
-    };
+    }
     /**
      * Build full table name with schema name and table name.
      * E.g. myDB.mySchema.myTable
      */
-    CockroachDriver.prototype.buildTableName = function (tableName, schema) {
-        var tablePath = [tableName];
+    buildTableName(tableName, schema) {
+        let tablePath = [tableName];
         if (schema) {
             tablePath.unshift(schema);
         }
         return tablePath.join(".");
-    };
+    }
     /**
      * Parse a target table name or other types and return a normalized table definition.
      */
-    CockroachDriver.prototype.parseTableName = function (target) {
-        var driverDatabase = this.database;
-        var driverSchema = this.schema;
+    parseTableName(target) {
+        const driverDatabase = this.database;
+        const driverSchema = this.schema;
         if (InstanceChecker_1.InstanceChecker.isTable(target) || InstanceChecker_1.InstanceChecker.isView(target)) {
             // name is sometimes a path
-            var parsed = this.parseTableName(target.name);
+            const parsed = this.parseTableName(target.name);
             return {
                 database: target.database || parsed.database || driverDatabase,
                 schema: target.schema || parsed.schema || driverSchema,
@@ -430,7 +423,7 @@ var CockroachDriver = /** @class */ (function () {
         }
         if (InstanceChecker_1.InstanceChecker.isTableForeignKey(target)) {
             // referencedTableName is sometimes a path
-            var parsed = this.parseTableName(target.referencedTableName);
+            const parsed = this.parseTableName(target.referencedTableName);
             return {
                 database: target.referencedDatabase ||
                     parsed.database ||
@@ -447,17 +440,17 @@ var CockroachDriver = /** @class */ (function () {
                 tableName: target.tableName,
             };
         }
-        var parts = target.split(".");
+        const parts = target.split(".");
         return {
             database: driverDatabase,
             schema: (parts.length > 1 ? parts[0] : undefined) || driverSchema,
             tableName: parts.length > 1 ? parts[1] : parts[0],
         };
-    };
+    }
     /**
      * Creates a database type from a given column metadata.
      */
-    CockroachDriver.prototype.normalizeType = function (column) {
+    normalizeType(column) {
         if (column.type === Number ||
             column.type === "integer" ||
             column.type === "int" ||
@@ -513,23 +506,23 @@ var CockroachDriver = /** @class */ (function () {
         else {
             return column.type || "";
         }
-    };
+    }
     /**
      * Normalizes "default" value of the column.
      */
-    CockroachDriver.prototype.normalizeDefault = function (columnMetadata) {
-        var defaultValue = columnMetadata.default;
-        var arrayCast = columnMetadata.isArray
-            ? "::".concat(columnMetadata.type, "[]")
+    normalizeDefault(columnMetadata) {
+        const defaultValue = columnMetadata.default;
+        const arrayCast = columnMetadata.isArray
+            ? `::${columnMetadata.type}[]`
             : "";
         if (typeof defaultValue === "number") {
-            return "(".concat(defaultValue, ")");
+            return `(${defaultValue})`;
         }
         if (typeof defaultValue === "boolean") {
             return defaultValue ? "true" : "false";
         }
         if (typeof defaultValue === "function") {
-            var value = defaultValue();
+            const value = defaultValue();
             if (value.toUpperCase() === "CURRENT_TIMESTAMP") {
                 return "current_timestamp()";
             }
@@ -539,33 +532,33 @@ var CockroachDriver = /** @class */ (function () {
             return value;
         }
         if (typeof defaultValue === "string") {
-            return "'".concat(defaultValue, "'").concat(arrayCast);
+            return `'${defaultValue}'${arrayCast}`;
         }
         if (ObjectUtils_1.ObjectUtils.isObject(defaultValue) && defaultValue !== null) {
-            return "'".concat(JSON.stringify(defaultValue), "'");
+            return `'${JSON.stringify(defaultValue)}'`;
         }
         if (defaultValue === undefined || defaultValue === null) {
             return undefined;
         }
-        return "".concat(defaultValue);
-    };
+        return `${defaultValue}`;
+    }
     /**
      * Normalizes "isUnique" value of the column.
      */
-    CockroachDriver.prototype.normalizeIsUnique = function (column) {
-        return column.entityMetadata.uniques.some(function (uq) { return uq.columns.length === 1 && uq.columns[0] === column; });
-    };
+    normalizeIsUnique(column) {
+        return column.entityMetadata.uniques.some((uq) => uq.columns.length === 1 && uq.columns[0] === column);
+    }
     /**
      * Returns default column lengths, which is required on column creation.
      */
-    CockroachDriver.prototype.getColumnLength = function (column) {
+    getColumnLength(column) {
         return column.length ? column.length.toString() : "";
-    };
+    }
     /**
      * Creates column type definition including length, precision and scale
      */
-    CockroachDriver.prototype.createFullType = function (column) {
-        var type = column.type;
+    createFullType(column) {
+        let type = column.type;
         if (column.length) {
             type += "(" + column.length + ")";
         }
@@ -582,73 +575,60 @@ var CockroachDriver = /** @class */ (function () {
         if (column.isArray)
             type += " array";
         return type;
-    };
+    }
     /**
      * Obtains a new database connection to a master server.
      * Used for replication.
      * If replication is not setup then returns default connection's database connection.
      */
-    CockroachDriver.prototype.obtainMasterConnection = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                if (!this.master) {
-                    throw new error_1.TypeORMError("Driver not Connected");
-                }
-                return [2 /*return*/, new Promise(function (ok, fail) {
-                        _this.master.connect(function (err, connection, release) {
-                            err ? fail(err) : ok([connection, release]);
-                        });
-                    })];
+    async obtainMasterConnection() {
+        if (!this.master) {
+            throw new error_1.TypeORMError("Driver not Connected");
+        }
+        return new Promise((ok, fail) => {
+            this.master.connect((err, connection, release) => {
+                err ? fail(err) : ok([connection, release]);
             });
         });
-    };
+    }
     /**
      * Obtains a new database connection to a slave server.
      * Used for replication.
      * If replication is not setup then returns master (default) connection's database connection.
      */
-    CockroachDriver.prototype.obtainSlaveConnection = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var random;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                if (!this.slaves.length)
-                    return [2 /*return*/, this.obtainMasterConnection()];
-                random = Math.floor(Math.random() * this.slaves.length);
-                return [2 /*return*/, new Promise(function (ok, fail) {
-                        _this.slaves[random].connect(function (err, connection, release) {
-                            err ? fail(err) : ok([connection, release]);
-                        });
-                    })];
+    async obtainSlaveConnection() {
+        if (!this.slaves.length)
+            return this.obtainMasterConnection();
+        const random = Math.floor(Math.random() * this.slaves.length);
+        return new Promise((ok, fail) => {
+            this.slaves[random].connect((err, connection, release) => {
+                err ? fail(err) : ok([connection, release]);
             });
         });
-    };
+    }
     /**
      * Creates generated map of values generated or returned by database after INSERT query.
      *
      * todo: slow. optimize Object.keys(), OrmUtils.mergeDeep and column.createValueMap parts
      */
-    CockroachDriver.prototype.createGeneratedMap = function (metadata, insertResult) {
-        var _this = this;
+    createGeneratedMap(metadata, insertResult) {
         if (!insertResult)
             return undefined;
-        return Object.keys(insertResult).reduce(function (map, key) {
-            var column = metadata.findColumnWithDatabaseName(key);
+        return Object.keys(insertResult).reduce((map, key) => {
+            const column = metadata.findColumnWithDatabaseName(key);
             if (column) {
-                OrmUtils_1.OrmUtils.mergeDeep(map, column.createValueMap(_this.prepareHydratedValue(insertResult[key], column)));
+                OrmUtils_1.OrmUtils.mergeDeep(map, column.createValueMap(this.prepareHydratedValue(insertResult[key], column)));
             }
             return map;
         }, {});
-    };
+    }
     /**
      * Differentiate columns of this table and columns from the given column metadatas columns
      * and returns only changed.
      */
-    CockroachDriver.prototype.findChangedColumns = function (tableColumns, columnMetadatas) {
-        var _this = this;
-        return columnMetadatas.filter(function (columnMetadata) {
-            var tableColumn = tableColumns.find(function (c) { return c.name === columnMetadata.databaseName; });
+    findChangedColumns(tableColumns, columnMetadatas) {
+        return columnMetadatas.filter((columnMetadata) => {
+            const tableColumn = tableColumns.find((c) => c.name === columnMetadata.databaseName);
             if (!tableColumn)
                 return false; // we don't need new columns, we only need exist and changed
             // console.log("table:", columnMetadata.entityMetadata.tableName);
@@ -667,87 +647,87 @@ var CockroachDriver = /** @class */ (function () {
             // console.log("isGenerated:", tableColumn.isGenerated, columnMetadata.isGenerated);
             // console.log("==========================================");
             return (tableColumn.name !== columnMetadata.databaseName ||
-                tableColumn.type !== _this.normalizeType(columnMetadata) ||
+                tableColumn.type !== this.normalizeType(columnMetadata) ||
                 tableColumn.length !== columnMetadata.length ||
                 tableColumn.precision !== columnMetadata.precision ||
                 (columnMetadata.scale !== undefined &&
                     tableColumn.scale !== columnMetadata.scale) ||
                 tableColumn.comment !==
-                    _this.escapeComment(columnMetadata.comment) ||
+                    this.escapeComment(columnMetadata.comment) ||
                 (!tableColumn.isGenerated &&
-                    _this.lowerDefaultValueIfNecessary(_this.normalizeDefault(columnMetadata)) !== tableColumn.default) || // we included check for generated here, because generated columns already can have default values
+                    this.lowerDefaultValueIfNecessary(this.normalizeDefault(columnMetadata)) !== tableColumn.default) || // we included check for generated here, because generated columns already can have default values
                 tableColumn.isPrimary !== columnMetadata.isPrimary ||
                 tableColumn.isNullable !== columnMetadata.isNullable ||
                 tableColumn.isUnique !==
-                    _this.normalizeIsUnique(columnMetadata) ||
+                    this.normalizeIsUnique(columnMetadata) ||
                 tableColumn.isGenerated !== columnMetadata.isGenerated ||
                 tableColumn.generatedType !== columnMetadata.generatedType ||
                 (tableColumn.asExpression || "").trim() !==
                     (columnMetadata.asExpression || "").trim());
         });
-    };
-    CockroachDriver.prototype.lowerDefaultValueIfNecessary = function (value) {
+    }
+    lowerDefaultValueIfNecessary(value) {
         if (!value) {
             return value;
         }
         return value
-            .split("'")
-            .map(function (v, i) {
+            .split(`'`)
+            .map((v, i) => {
             return i % 2 === 1 ? v : v.toLowerCase();
         })
-            .join("'");
-    };
+            .join(`'`);
+    }
     /**
      * Returns true if driver supports RETURNING / OUTPUT statement.
      */
-    CockroachDriver.prototype.isReturningSqlSupported = function () {
+    isReturningSqlSupported() {
         return true;
-    };
+    }
     /**
      * Returns true if driver supports uuid values generation on its own.
      */
-    CockroachDriver.prototype.isUUIDGenerationSupported = function () {
+    isUUIDGenerationSupported() {
         return true;
-    };
+    }
     /**
      * Returns true if driver supports fulltext indices.
      */
-    CockroachDriver.prototype.isFullTextColumnTypeSupported = function () {
+    isFullTextColumnTypeSupported() {
         return false;
-    };
+    }
     /**
      * Creates an escaped parameter.
      */
-    CockroachDriver.prototype.createParameter = function (parameterName, index) {
+    createParameter(parameterName, index) {
         return "$" + (index + 1);
-    };
+    }
     // -------------------------------------------------------------------------
     // Public Methods
     // -------------------------------------------------------------------------
     /**
      * Loads postgres query stream package.
      */
-    CockroachDriver.prototype.loadStreamDependency = function () {
+    loadStreamDependency() {
         try {
             return PlatformTools_1.PlatformTools.load("pg-query-stream");
         }
         catch (e) {
             // todo: better error for browser env
-            throw new error_1.TypeORMError("To use streams you should install pg-query-stream package. Please run npm i pg-query-stream --save command.");
+            throw new error_1.TypeORMError(`To use streams you should install pg-query-stream package. Please run npm i pg-query-stream --save command.`);
         }
-    };
+    }
     // -------------------------------------------------------------------------
     // Protected Methods
     // -------------------------------------------------------------------------
     /**
      * If driver dependency is not given explicitly, then try to load it via "require".
      */
-    CockroachDriver.prototype.loadDependencies = function () {
+    loadDependencies() {
         try {
-            var postgres = this.options.driver || PlatformTools_1.PlatformTools.load("pg");
+            const postgres = this.options.driver || PlatformTools_1.PlatformTools.load("pg");
             this.postgres = postgres;
             try {
-                var pgNative = this.options.nativeDriver || PlatformTools_1.PlatformTools.load("pg-native");
+                const pgNative = this.options.nativeDriver || PlatformTools_1.PlatformTools.load("pg-native");
                 if (pgNative && this.postgres.native)
                     this.postgres = this.postgres.native;
             }
@@ -757,76 +737,60 @@ var CockroachDriver = /** @class */ (function () {
             // todo: better error for browser env
             throw new DriverPackageNotInstalledError_1.DriverPackageNotInstalledError("Postgres", "pg");
         }
-    };
+    }
     /**
      * Creates a new connection pool for a given database credentials.
      */
-    CockroachDriver.prototype.createPool = function (options, credentials) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var connectionOptions, pool, logger, poolErrorHandler;
-            return tslib_1.__generator(this, function (_a) {
-                credentials = Object.assign({}, credentials, DriverUtils_1.DriverUtils.buildDriverOptions(credentials)); // todo: do it better way
-                connectionOptions = Object.assign({}, {
-                    host: credentials.host,
-                    user: credentials.username,
-                    password: credentials.password,
-                    database: credentials.database,
-                    port: credentials.port,
-                    ssl: credentials.ssl,
-                    application_name: options.applicationName,
-                    max: options.poolSize,
-                }, options.extra || {});
-                pool = new this.postgres.Pool(connectionOptions);
-                logger = this.connection.logger;
-                poolErrorHandler = options.poolErrorHandler ||
-                    (function (error) {
-                        return logger.log("warn", "Postgres pool raised an error. ".concat(error));
-                    });
-                /*
-                  Attaching an error handler to pool errors is essential, as, otherwise, errors raised will go unhandled and
-                  cause the hosting app to crash.
-                 */
-                pool.on("error", poolErrorHandler);
-                return [2 /*return*/, new Promise(function (ok, fail) {
-                        pool.connect(function (err, connection, release) {
-                            if (err)
-                                return fail(err);
-                            release();
-                            ok(pool);
-                        });
-                    })];
+    async createPool(options, credentials) {
+        credentials = Object.assign({}, credentials, DriverUtils_1.DriverUtils.buildDriverOptions(credentials)); // todo: do it better way
+        // build connection options for the driver
+        const connectionOptions = Object.assign({}, {
+            host: credentials.host,
+            user: credentials.username,
+            password: credentials.password,
+            database: credentials.database,
+            port: credentials.port,
+            ssl: credentials.ssl,
+            application_name: options.applicationName,
+            max: options.poolSize,
+        }, options.extra || {});
+        // create a connection pool
+        const pool = new this.postgres.Pool(connectionOptions);
+        const { logger } = this.connection;
+        const poolErrorHandler = options.poolErrorHandler ||
+            ((error) => logger.log("warn", `Postgres pool raised an error. ${error}`));
+        /*
+          Attaching an error handler to pool errors is essential, as, otherwise, errors raised will go unhandled and
+          cause the hosting app to crash.
+         */
+        pool.on("error", poolErrorHandler);
+        return new Promise((ok, fail) => {
+            pool.connect((err, connection, release) => {
+                if (err)
+                    return fail(err);
+                release();
+                ok(pool);
             });
         });
-    };
+    }
     /**
      * Closes connection pool.
      */
-    CockroachDriver.prototype.closePool = function (pool) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, Promise.all(this.connectedQueryRunners.map(function (queryRunner) {
-                            return queryRunner.release();
-                        }))];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/, new Promise(function (ok, fail) {
-                                pool.end(function (err) { return (err ? fail(err) : ok()); });
-                            })];
-                }
-            });
+    async closePool(pool) {
+        await Promise.all(this.connectedQueryRunners.map((queryRunner) => queryRunner.release()));
+        return new Promise((ok, fail) => {
+            pool.end((err) => (err ? fail(err) : ok()));
         });
-    };
+    }
     /**
      * Escapes a given comment.
      */
-    CockroachDriver.prototype.escapeComment = function (comment) {
+    escapeComment(comment) {
         if (!comment)
             return comment;
         comment = comment.replace(/'/g, "''").replace(/\u0000/g, ""); // Null bytes aren't allowed in comments
         return comment;
-    };
-    return CockroachDriver;
-}());
+    }
+}
 exports.CockroachDriver = CockroachDriver;
 //# sourceMappingURL=CockroachDriver.js.map