taon-typeorm 18.0.19 → 18.0.20

package/lib/typeorm/driver/oracle/OracleDriver.js

@@ -1,170 +1,199 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OracleDriver = void 0;
-var tslib_1 = require("tslib");
-var ConnectionIsNotSetError_1 = require("../../error/ConnectionIsNotSetError");
-var DriverPackageNotInstalledError_1 = require("../../error/DriverPackageNotInstalledError");
-var OracleQueryRunner_1 = require("./OracleQueryRunner");
-var DateUtils_1 = require("../../util/DateUtils");
-var PlatformTools_1 = require("../../platform/PlatformTools");
-var RdbmsSchemaBuilder_1 = require("../../schema-builder/RdbmsSchemaBuilder");
-var DriverUtils_1 = require("../DriverUtils");
-var OrmUtils_1 = require("../../util/OrmUtils");
-var ApplyValueTransformers_1 = require("../../util/ApplyValueTransformers");
-var error_1 = require("../../error");
-var InstanceChecker_1 = require("../../util/InstanceChecker");
+const ConnectionIsNotSetError_1 = require("../../error/ConnectionIsNotSetError");
+const DriverPackageNotInstalledError_1 = require("../../error/DriverPackageNotInstalledError");
+const OracleQueryRunner_1 = require("./OracleQueryRunner");
+const DateUtils_1 = require("../../util/DateUtils");
+const PlatformTools_1 = require("../../platform/PlatformTools");
+const RdbmsSchemaBuilder_1 = require("../../schema-builder/RdbmsSchemaBuilder");
+const DriverUtils_1 = require("../DriverUtils");
+const OrmUtils_1 = require("../../util/OrmUtils");
+const ApplyValueTransformers_1 = require("../../util/ApplyValueTransformers");
+const error_1 = require("../../error");
+const InstanceChecker_1 = require("../../util/InstanceChecker");
 /**
  * Organizes communication with Oracle RDBMS.
  */
-var OracleDriver = /** @class */ (function () {
+class OracleDriver {
+    // -------------------------------------------------------------------------
+    // Public Properties
+    // -------------------------------------------------------------------------
+    /**
+     * Connection used by driver.
+     */
+    connection;
+    /**
+     * Underlying oracle library.
+     */
+    oracle;
+    /**
+     * Pool for master database.
+     */
+    master;
+    /**
+     * Pool for slave databases.
+     * Used in replication.
+     */
+    slaves = [];
+    // -------------------------------------------------------------------------
+    // Public Implemented Properties
+    // -------------------------------------------------------------------------
+    /**
+     * Connection options.
+     */
+    options;
+    /**
+     * Database name used to perform all write queries.
+     */
+    database;
+    /**
+     * Schema name used to perform all write queries.
+     */
+    schema;
+    /**
+     * 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.techonthenet.com/oracle/datatypes.php
+     * @see https://docs.oracle.com/cd/B28359_01/server.111/b28318/datatype.htm#CNCPT012
+     */
+    supportedDataTypes = [
+        "char",
+        "nchar",
+        "nvarchar2",
+        "varchar2",
+        "long",
+        "raw",
+        "long raw",
+        "number",
+        "numeric",
+        "float",
+        "dec",
+        "decimal",
+        "integer",
+        "int",
+        "smallint",
+        "real",
+        "double precision",
+        "date",
+        "timestamp",
+        "timestamp with time zone",
+        "timestamp with local time zone",
+        "interval year to month",
+        "interval day to second",
+        "bfile",
+        "blob",
+        "clob",
+        "nclob",
+        "rowid",
+        "urowid",
+    ];
+    /**
+     * Gets list of spatial column data types.
+     */
+    spatialTypes = [];
+    /**
+     * Gets list of column data types that support length by a driver.
+     */
+    withLengthColumnTypes = [
+        "char",
+        "nchar",
+        "nvarchar2",
+        "varchar2",
+        "varchar",
+        "raw",
+    ];
+    /**
+     * Gets list of column data types that support precision by a driver.
+     */
+    withPrecisionColumnTypes = [
+        "number",
+        "float",
+        "timestamp",
+        "timestamp with time zone",
+        "timestamp with local time zone",
+    ];
+    /**
+     * Gets list of column data types that support scale by a driver.
+     */
+    withScaleColumnTypes = ["number"];
+    /**
+     * 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: "timestamp",
+        createDateDefault: "CURRENT_TIMESTAMP",
+        updateDate: "timestamp",
+        updateDateDefault: "CURRENT_TIMESTAMP",
+        deleteDate: "timestamp",
+        deleteDateNullable: true,
+        version: "number",
+        treeLevel: "number",
+        migrationId: "number",
+        migrationName: "varchar2",
+        migrationTimestamp: "number",
+        cacheId: "number",
+        cacheIdentifier: "varchar2",
+        cacheTime: "number",
+        cacheDuration: "number",
+        cacheQuery: "clob",
+        cacheResult: "clob",
+        metadataType: "varchar2",
+        metadataDatabase: "varchar2",
+        metadataSchema: "varchar2",
+        metadataTable: "varchar2",
+        metadataName: "varchar2",
+        metadataValue: "clob",
+    };
+    /**
+     * 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 },
+        nchar: { length: 1 },
+        varchar: { length: 255 },
+        varchar2: { length: 255 },
+        nvarchar2: { length: 255 },
+        raw: { length: 2000 },
+        float: { precision: 126 },
+        timestamp: { precision: 6 },
+        "timestamp with time zone": { precision: 6 },
+        "timestamp with local time zone": { precision: 6 },
+    };
+    /**
+     * Max length allowed by Oracle for aliases.
+     * @see https://docs.oracle.com/database/121/SQLRF/sql_elements008.htm#SQLRF51129
+     * > The following list of rules applies to both quoted and nonquoted identifiers unless otherwise indicated
+     * > Names must be from 1 to 30 bytes long with these exceptions:
+     * > [...]
+     *
+     * Since Oracle 12.2 (with a compatible driver/client), the limit has been set to 128.
+     * @see https://docs.oracle.com/en/database/oracle/oracle-database/12.2/sqlrf/Database-Object-Names-and-Qualifiers.html
+     *
+     * > If COMPATIBLE is set to a value of 12.2 or higher, then names must be from 1 to 128 bytes long with these exceptions
+     */
+    maxAliasLength = 29;
+    cteCapabilities = {
+        enabled: false, // TODO: enable
+    };
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function OracleDriver(connection) {
-        /**
-         * Pool for slave databases.
-         * Used in replication.
-         */
-        this.slaves = [];
-        /**
-         * 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.techonthenet.com/oracle/datatypes.php
-         * @see https://docs.oracle.com/cd/B28359_01/server.111/b28318/datatype.htm#CNCPT012
-         */
-        this.supportedDataTypes = [
-            "char",
-            "nchar",
-            "nvarchar2",
-            "varchar2",
-            "long",
-            "raw",
-            "long raw",
-            "number",
-            "numeric",
-            "float",
-            "dec",
-            "decimal",
-            "integer",
-            "int",
-            "smallint",
-            "real",
-            "double precision",
-            "date",
-            "timestamp",
-            "timestamp with time zone",
-            "timestamp with local time zone",
-            "interval year to month",
-            "interval day to second",
-            "bfile",
-            "blob",
-            "clob",
-            "nclob",
-            "rowid",
-            "urowid",
-        ];
-        /**
-         * Gets list of spatial column data types.
-         */
-        this.spatialTypes = [];
-        /**
-         * Gets list of column data types that support length by a driver.
-         */
-        this.withLengthColumnTypes = [
-            "char",
-            "nchar",
-            "nvarchar2",
-            "varchar2",
-            "varchar",
-            "raw",
-        ];
-        /**
-         * Gets list of column data types that support precision by a driver.
-         */
-        this.withPrecisionColumnTypes = [
-            "number",
-            "float",
-            "timestamp",
-            "timestamp with time zone",
-            "timestamp with local time zone",
-        ];
-        /**
-         * Gets list of column data types that support scale by a driver.
-         */
-        this.withScaleColumnTypes = ["number"];
-        /**
-         * 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: "timestamp",
-            createDateDefault: "CURRENT_TIMESTAMP",
-            updateDate: "timestamp",
-            updateDateDefault: "CURRENT_TIMESTAMP",
-            deleteDate: "timestamp",
-            deleteDateNullable: true,
-            version: "number",
-            treeLevel: "number",
-            migrationId: "number",
-            migrationName: "varchar2",
-            migrationTimestamp: "number",
-            cacheId: "number",
-            cacheIdentifier: "varchar2",
-            cacheTime: "number",
-            cacheDuration: "number",
-            cacheQuery: "clob",
-            cacheResult: "clob",
-            metadataType: "varchar2",
-            metadataDatabase: "varchar2",
-            metadataSchema: "varchar2",
-            metadataTable: "varchar2",
-            metadataName: "varchar2",
-            metadataValue: "clob",
-        };
-        /**
-         * 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 },
-            nchar: { length: 1 },
-            varchar: { length: 255 },
-            varchar2: { length: 255 },
-            nvarchar2: { length: 255 },
-            raw: { length: 2000 },
-            float: { precision: 126 },
-            timestamp: { precision: 6 },
-            "timestamp with time zone": { precision: 6 },
-            "timestamp with local time zone": { precision: 6 },
-        };
-        /**
-         * Max length allowed by Oracle for aliases.
-         * @see https://docs.oracle.com/database/121/SQLRF/sql_elements008.htm#SQLRF51129
-         * > The following list of rules applies to both quoted and nonquoted identifiers unless otherwise indicated
-         * > Names must be from 1 to 30 bytes long with these exceptions:
-         * > [...]
-         *
-         * Since Oracle 12.2 (with a compatible driver/client), the limit has been set to 128.
-         * @see https://docs.oracle.com/en/database/oracle/oracle-database/12.2/sqlrf/Database-Object-Names-and-Qualifiers.html
-         *
-         * > If COMPATIBLE is set to a value of 12.2 or higher, then names must be from 1 to 128 bytes long with these exceptions
-         */
-        this.maxAliasLength = 29;
-        this.cteCapabilities = {
-            enabled: false, // TODO: enable
-        };
+    constructor(connection) {
         this.connection = connection;
         this.options = connection.options;
         if (this.options.useUTC === true) {
@@ -194,125 +223,80 @@ var OracleDriver = /** @class */ (function () {
      * Based on pooling options, it can either create connection immediately,
      * either create a pool and create connection when needed.
      */
-    OracleDriver.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:
-                        this.oracle.fetchAsString = [this.oracle.CLOB];
-                        this.oracle.fetchAsBuffer = [this.oracle.BLOB];
-                        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.schema)) 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.schema) return [3 /*break*/, 10];
-                        _e = this;
-                        return [4 /*yield*/, queryRunner.getCurrentSchema()];
-                    case 9:
-                        _e.schema = _f.sent();
-                        _f.label = 10;
-                    case 10: return [4 /*yield*/, queryRunner.release()];
-                    case 11:
-                        _f.sent();
-                        _f.label = 12;
-                    case 12: return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async connect() {
+        this.oracle.fetchAsString = [this.oracle.CLOB];
+        this.oracle.fetchAsBuffer = [this.oracle.BLOB];
+        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.schema) {
+            const queryRunner = await this.createQueryRunner("master");
+            if (!this.database) {
+                this.database = await queryRunner.getCurrentDatabase();
+            }
+            if (!this.schema) {
+                this.schema = await queryRunner.getCurrentSchema();
+            }
+            await queryRunner.release();
+        }
+    }
     /**
      * Makes any action after connection (e.g. create extensions in Postgres driver).
      */
-    OracleDriver.prototype.afterConnect = function () {
+    afterConnect() {
         return Promise.resolve();
-    };
+    }
     /**
      * Closes connection with the database.
      */
-    OracleDriver.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("oracle"))];
-                        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("oracle"));
+        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.
      */
-    OracleDriver.prototype.createSchemaBuilder = function () {
+    createSchemaBuilder() {
         return new RdbmsSchemaBuilder_1.RdbmsSchemaBuilder(this.connection);
-    };
+    }
     /**
      * Creates a query runner used to execute database queries.
      */
-    OracleDriver.prototype.createQueryRunner = function (mode) {
+    createQueryRunner(mode) {
         return new OracleQueryRunner_1.OracleQueryRunner(this, mode);
-    };
+    }
     /**
      * Replaces parameters in the given sql with special escaping character
      * and an array of parameter names to be passed to a query.
      */
-    OracleDriver.prototype.escapeQueryWithParameters = function (sql, parameters, nativeParameters) {
-        var _this = this;
-        var escapedParameters = Object.keys(nativeParameters).map(function (key) {
+    escapeQueryWithParameters(sql, parameters, nativeParameters) {
+        const escapedParameters = Object.keys(nativeParameters).map((key) => {
             if (typeof nativeParameters[key] === "boolean")
                 return nativeParameters[key] ? 1 : 0;
             return 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(", ");
             }
@@ -323,35 +307,35 @@ var OracleDriver = /** @class */ (function () {
                 return value ? "1" : "0";
             }
             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.
      */
-    OracleDriver.prototype.escape = function (columnName) {
-        return "\"".concat(columnName, "\"");
-    };
+    escape(columnName) {
+        return `"${columnName}"`;
+    }
     /**
      * Build full table name with database name, schema name and table name.
      * Oracle does not support table schemas. One user can have only one schema.
      */
-    OracleDriver.prototype.buildTableName = function (tableName, schema, database) {
-        var tablePath = [tableName];
+    buildTableName(tableName, schema, database) {
+        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.
      */
-    OracleDriver.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)) {
-            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,
@@ -359,7 +343,7 @@ var OracleDriver = /** @class */ (function () {
             };
         }
         if (InstanceChecker_1.InstanceChecker.isTableForeignKey(target)) {
-            var parsed = this.parseTableName(target.referencedTableName);
+            const parsed = this.parseTableName(target.referencedTableName);
             return {
                 database: target.referencedDatabase ||
                     parsed.database ||
@@ -376,7 +360,7 @@ var OracleDriver = /** @class */ (function () {
                 tableName: target.tableName,
             };
         }
-        var parts = target.split(".");
+        const parts = target.split(".");
         if (parts.length === 3) {
             return {
                 database: parts[0] || driverDatabase,
@@ -398,11 +382,11 @@ var OracleDriver = /** @class */ (function () {
                 tableName: target,
             };
         }
-    };
+    }
     /**
      * Prepares given value to a value to be persisted, based on its column type and metadata.
      */
-    OracleDriver.prototype.preparePersistentValue = function (value, columnMetadata) {
+    preparePersistentValue(value, columnMetadata) {
         if (columnMetadata.transformer)
             value = ApplyValueTransformers_1.ApplyValueTransformers.transformTo(columnMetadata.transformer, value);
         if (value === null || value === undefined)
@@ -413,9 +397,7 @@ var OracleDriver = /** @class */ (function () {
         else if (columnMetadata.type === "date") {
             if (typeof value === "string")
                 value = value.replace(/[^0-9-]/g, "");
-            return function () {
-                return "TO_DATE('".concat(DateUtils_1.DateUtils.mixedDateToDateString(value), "', 'YYYY-MM-DD')");
-            };
+            return () => `TO_DATE('${DateUtils_1.DateUtils.mixedDateToDateString(value)}', 'YYYY-MM-DD')`;
         }
         else if (columnMetadata.type === Date ||
             columnMetadata.type === "timestamp" ||
@@ -430,11 +412,11 @@ var OracleDriver = /** @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.
      */
-    OracleDriver.prototype.prepareHydratedValue = function (value, columnMetadata) {
+    prepareHydratedValue(value, columnMetadata) {
         if (value === null || value === undefined)
             return columnMetadata.transformer
                 ? ApplyValueTransformers_1.ApplyValueTransformers.transformFrom(columnMetadata.transformer, value)
@@ -470,11 +452,11 @@ var OracleDriver = /** @class */ (function () {
         if (columnMetadata.transformer)
             value = ApplyValueTransformers_1.ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);
         return value;
-    };
+    }
     /**
      * Creates a database type from a given column metadata.
      */
-    OracleDriver.prototype.normalizeType = function (column) {
+    normalizeType(column) {
         if (column.type === Number ||
             column.type === Boolean ||
             column.type === "numeric" ||
@@ -510,12 +492,12 @@ var OracleDriver = /** @class */ (function () {
         else {
             return column.type || "";
         }
-    };
+    }
     /**
      * Normalizes "default" value of the column.
      */
-    OracleDriver.prototype.normalizeDefault = function (columnMetadata) {
-        var defaultValue = columnMetadata.default;
+    normalizeDefault(columnMetadata) {
+        const defaultValue = columnMetadata.default;
         if (typeof defaultValue === "number") {
             return "" + defaultValue;
         }
@@ -526,23 +508,23 @@ var OracleDriver = /** @class */ (function () {
             return defaultValue();
         }
         if (typeof defaultValue === "string") {
-            return "'".concat(defaultValue, "'");
+            return `'${defaultValue}'`;
         }
         if (defaultValue === null || defaultValue === undefined) {
             return undefined;
         }
-        return "".concat(defaultValue);
-    };
+        return `${defaultValue}`;
+    }
     /**
      * Normalizes "isUnique" value of the column.
      */
-    OracleDriver.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);
+    }
     /**
      * Calculates column length taking into account the default length values.
      */
-    OracleDriver.prototype.getColumnLength = function (column) {
+    getColumnLength(column) {
         if (column.length)
             return column.length.toString();
         switch (column.type) {
@@ -558,12 +540,12 @@ var OracleDriver = /** @class */ (function () {
             default:
                 return "";
         }
-    };
-    OracleDriver.prototype.createFullType = function (column) {
-        var type = column.type;
+    }
+    createFullType(column) {
+        let type = column.type;
         // used 'getColumnLength()' method, because in Oracle column length is required for some data types.
         if (this.getColumnLength(column)) {
-            type += "(".concat(this.getColumnLength(column), ")");
+            type += `(${this.getColumnLength(column)})`;
         }
         else if (column.precision !== null &&
             column.precision !== undefined &&
@@ -594,81 +576,77 @@ var OracleDriver = /** @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.
      */
-    OracleDriver.prototype.obtainMasterConnection = function () {
-        var _this = this;
-        return new Promise(function (ok, fail) {
-            if (!_this.master) {
+    obtainMasterConnection() {
+        return new Promise((ok, fail) => {
+            if (!this.master) {
                 return fail(new error_1.TypeORMError("Driver not Connected"));
             }
-            _this.master.getConnection(function (err, connection, release) {
+            this.master.getConnection((err, connection, release) => {
                 if (err)
                     return fail(err);
                 ok(connection);
             });
         });
-    };
+    }
     /**
      * 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.
      */
-    OracleDriver.prototype.obtainSlaveConnection = function () {
-        var _this = this;
+    obtainSlaveConnection() {
         if (!this.slaves.length)
             return this.obtainMasterConnection();
-        return new Promise(function (ok, fail) {
-            var random = Math.floor(Math.random() * _this.slaves.length);
-            _this.slaves[random].getConnection(function (err, connection) {
+        return new Promise((ok, fail) => {
+            const random = Math.floor(Math.random() * this.slaves.length);
+            this.slaves[random].getConnection((err, connection) => {
                 if (err)
                     return fail(err);
                 ok(connection);
             });
         });
-    };
+    }
     /**
      * Creates generated map of values generated or returned by database after INSERT query.
      */
-    OracleDriver.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.
      */
-    OracleDriver.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
-            var isColumnChanged = tableColumn.name !== columnMetadata.databaseName ||
-                tableColumn.type !== _this.normalizeType(columnMetadata) ||
-                tableColumn.length !== _this.getColumnLength(columnMetadata) ||
+            const isColumnChanged = tableColumn.name !== columnMetadata.databaseName ||
+                tableColumn.type !== this.normalizeType(columnMetadata) ||
+                tableColumn.length !== this.getColumnLength(columnMetadata) ||
                 tableColumn.precision !== columnMetadata.precision ||
                 tableColumn.scale !== columnMetadata.scale ||
                 // || tableColumn.comment !== columnMetadata.comment
-                tableColumn.default !== _this.normalizeDefault(columnMetadata) ||
+                tableColumn.default !== this.normalizeDefault(columnMetadata) ||
                 tableColumn.isPrimary !== columnMetadata.isPrimary ||
                 tableColumn.isNullable !== columnMetadata.isNullable ||
                 tableColumn.asExpression !== columnMetadata.asExpression ||
                 tableColumn.generatedType !== columnMetadata.generatedType ||
                 tableColumn.isUnique !==
-                    _this.normalizeIsUnique(columnMetadata) ||
+                    this.normalizeIsUnique(columnMetadata) ||
                 (columnMetadata.generationStrategy !== "uuid" &&
                     tableColumn.isGenerated !== columnMetadata.isGenerated);
             // DEBUG SECTION
@@ -753,35 +731,35 @@ var OracleDriver = /** @class */ (function () {
             // }
             return isColumnChanged;
         });
-    };
+    }
     /**
      * Returns true if driver supports RETURNING / OUTPUT statement.
      */
-    OracleDriver.prototype.isReturningSqlSupported = function () {
+    isReturningSqlSupported() {
         return true;
-    };
+    }
     /**
      * Returns true if driver supports uuid values generation on its own.
      */
-    OracleDriver.prototype.isUUIDGenerationSupported = function () {
+    isUUIDGenerationSupported() {
         return false;
-    };
+    }
     /**
      * Returns true if driver supports fulltext indices.
      */
-    OracleDriver.prototype.isFullTextColumnTypeSupported = function () {
+    isFullTextColumnTypeSupported() {
         return false;
-    };
+    }
     /**
      * Creates an escaped parameter.
      */
-    OracleDriver.prototype.createParameter = function (parameterName, index) {
+    createParameter(parameterName, index) {
         return ":" + (index + 1);
-    };
+    }
     /**
      * Converts column type in to native oracle type.
      */
-    OracleDriver.prototype.columnTypeToNativeParameter = function (type) {
+    columnTypeToNativeParameter(type) {
         switch (this.normalizeType({ type: type })) {
             case "number":
             case "numeric":
@@ -806,83 +784,73 @@ var OracleDriver = /** @class */ (function () {
             case "timestamp with local time zone":
                 return this.oracle.DATE;
         }
-    };
+    }
     // -------------------------------------------------------------------------
     // Protected Methods
     // -------------------------------------------------------------------------
     /**
      * Loads all driver dependencies.
      */
-    OracleDriver.prototype.loadDependencies = function () {
+    loadDependencies() {
         try {
-            var oracle = this.options.driver || PlatformTools_1.PlatformTools.load("oracledb");
+            const oracle = this.options.driver || PlatformTools_1.PlatformTools.load("oracledb");
             this.oracle = oracle;
         }
         catch (e) {
             throw new DriverPackageNotInstalledError_1.DriverPackageNotInstalledError("Oracle", "oracledb");
         }
-    };
+    }
     /**
      * Creates a new connection pool for a given database credentials.
      */
-    OracleDriver.prototype.createPool = function (options, credentials) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var address, connectData, connectString, connectionOptions;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                credentials = Object.assign({}, credentials, DriverUtils_1.DriverUtils.buildDriverOptions(credentials)); // todo: do it better way
-                if (!credentials.connectString) {
-                    address = "(PROTOCOL=TCP)";
-                    if (credentials.host) {
-                        address += "(HOST=".concat(credentials.host, ")");
-                    }
-                    if (credentials.port) {
-                        address += "(PORT=".concat(credentials.port, ")");
-                    }
-                    connectData = "(SERVER=DEDICATED)";
-                    if (credentials.sid) {
-                        connectData += "(SID=".concat(credentials.sid, ")");
-                    }
-                    if (credentials.serviceName) {
-                        connectData += "(SERVICE_NAME=".concat(credentials.serviceName, ")");
-                    }
-                    connectString = "(DESCRIPTION=(ADDRESS=".concat(address, ")(CONNECT_DATA=").concat(connectData, "))");
-                    Object.assign(credentials, { connectString: connectString });
-                }
-                connectionOptions = Object.assign({}, {
-                    user: credentials.username,
-                    password: credentials.password,
-                    connectString: credentials.connectString,
-                }, {
-                    poolMax: options.poolSize,
-                }, options.extra || {});
-                // pooling is enabled either when its set explicitly to true,
-                // either when its not defined at all (e.g. enabled by default)
-                return [2 /*return*/, new Promise(function (ok, fail) {
-                        _this.oracle.createPool(connectionOptions, function (err, pool) {
-                            if (err)
-                                return fail(err);
-                            ok(pool);
-                        });
-                    })];
+    async createPool(options, credentials) {
+        credentials = Object.assign({}, credentials, DriverUtils_1.DriverUtils.buildDriverOptions(credentials)); // todo: do it better way
+        if (!credentials.connectString) {
+            let address = `(PROTOCOL=TCP)`;
+            if (credentials.host) {
+                address += `(HOST=${credentials.host})`;
+            }
+            if (credentials.port) {
+                address += `(PORT=${credentials.port})`;
+            }
+            let connectData = `(SERVER=DEDICATED)`;
+            if (credentials.sid) {
+                connectData += `(SID=${credentials.sid})`;
+            }
+            if (credentials.serviceName) {
+                connectData += `(SERVICE_NAME=${credentials.serviceName})`;
+            }
+            const connectString = `(DESCRIPTION=(ADDRESS=${address})(CONNECT_DATA=${connectData}))`;
+            Object.assign(credentials, { connectString });
+        }
+        // build connection options for the driver
+        const connectionOptions = Object.assign({}, {
+            user: credentials.username,
+            password: credentials.password,
+            connectString: credentials.connectString,
+        }, {
+            poolMax: options.poolSize,
+        }, options.extra || {});
+        // pooling is enabled either when its set explicitly to true,
+        // either when its not defined at all (e.g. enabled by default)
+        return new Promise((ok, fail) => {
+            this.oracle.createPool(connectionOptions, (err, pool) => {
+                if (err)
+                    return fail(err);
+                ok(pool);
             });
         });
-    };
+    }
     /**
      * Closes connection pool.
      */
-    OracleDriver.prototype.closePool = function (pool) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (ok, fail) {
-                        pool.close(function (err) { return (err ? fail(err) : ok()); });
-                        pool = undefined;
-                    })];
-            });
+    async closePool(pool) {
+        return new Promise((ok, fail) => {
+            pool.close((err) => (err ? fail(err) : ok()));
+            pool = undefined;
         });
-    };
-    return OracleDriver;
-}());
+    }
+}
 exports.OracleDriver = OracleDriver;
 //#endregion
 //# sourceMappingURL=OracleDriver.js.map