typeorm 0.3.0-rc.9 → 0.3.0

package/browser/driver/oracle/OracleDriver.js

@@ -1,4 +1,3 @@
-import * as tslib_1 from "tslib";
 import { ConnectionIsNotSetError } from "../../error/ConnectionIsNotSetError";
 import { DriverPackageNotInstalledError } from "../../error/DriverPackageNotInstalledError";
 import { OracleQueryRunner } from "./OracleQueryRunner";
@@ -8,14 +7,16 @@ import { RdbmsSchemaBuilder } from "../../schema-builder/RdbmsSchemaBuilder";
 import { DriverUtils } from "../DriverUtils";
 import { OrmUtils } from "../../util/OrmUtils";
 import { ApplyValueTransformers } from "../../util/ApplyValueTransformers";
+import { TypeORMError } from "../../error";
+import { InstanceChecker } from "../../util/InstanceChecker";
 /**
  * Organizes communication with Oracle RDBMS.
  */
-var OracleDriver = /** @class */ (function () {
+export class OracleDriver {
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function OracleDriver(connection) {
+    constructor(connection) {
         /**
          * Pool for slave databases.
          * Used in replication.
@@ -29,6 +30,10 @@ var OracleDriver = /** @class */ (function () {
          * 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.
          *
@@ -64,7 +69,7 @@ var OracleDriver = /** @class */ (function () {
             "clob",
             "nclob",
             "rowid",
-            "urowid"
+            "urowid",
         ];
         /**
          * Gets list of spatial column data types.
@@ -79,7 +84,7 @@ var OracleDriver = /** @class */ (function () {
             "nvarchar2",
             "varchar2",
             "varchar",
-            "raw"
+            "raw",
         ];
         /**
          * Gets list of column data types that support precision by a driver.
@@ -89,14 +94,12 @@ var OracleDriver = /** @class */ (function () {
             "float",
             "timestamp",
             "timestamp with time zone",
-            "timestamp with local time zone"
+            "timestamp with local time zone",
         ];
         /**
          * Gets list of column data types that support scale by a driver.
          */
-        this.withScaleColumnTypes = [
-            "number"
-        ];
+        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.
@@ -106,6 +109,8 @@ var OracleDriver = /** @class */ (function () {
             createDateDefault: "CURRENT_TIMESTAMP",
             updateDate: "timestamp",
             updateDateDefault: "CURRENT_TIMESTAMP",
+            deleteDate: "timestamp",
+            deleteDateNullable: true,
             version: "number",
             treeLevel: "number",
             migrationId: "number",
@@ -129,16 +134,16 @@ var OracleDriver = /** @class */ (function () {
          * 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 },
+            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 }
+            "timestamp with local time zone": { precision: 6 },
         };
         /**
          * Max length allowed by Oracle for aliases.
@@ -152,13 +157,18 @@ var OracleDriver = /** @class */ (function () {
          *
          * > 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 = 30;
+        this.maxAliasLength = 29;
         this.connection = connection;
         this.options = connection.options;
+        if (this.options.useUTC === true) {
+            process.env.ORA_SDTZ = "UTC";
+        }
         // load oracle package
         this.loadDependencies();
-        // extra oracle setup
-        this.oracle.outFormat = this.oracle.OBJECT;
+        this.database = DriverUtils.buildDriverOptions(this.options.replication
+            ? this.options.replication.master
+            : this.options).database;
+        this.schema = DriverUtils.buildDriverOptions(this.options).schema;
         // Object.assign(connection.options, DriverUtils.buildDriverOptions(connection.options)); // todo: do it better way
         // validate options to make sure everything is set
         // if (!this.options.host)
@@ -177,142 +187,170 @@ 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;
-            var _this = this;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.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 = _d.sent();
-                        _b = this;
-                        return [4 /*yield*/, this.createPool(this.options, this.options.replication.master)];
-                    case 2:
-                        _b.master = _d.sent();
-                        this.database = this.options.replication.master.database;
-                        return [3 /*break*/, 5];
-                    case 3:
-                        _c = this;
-                        return [4 /*yield*/, this.createPool(this.options, this.options)];
-                    case 4:
-                        _c.master = _d.sent();
-                        this.database = this.options.database;
-                        _d.label = 5;
-                    case 5: 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("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("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(this.connection);
-    };
+    }
     /**
      * Creates a query runner used to execute database queries.
      */
-    OracleDriver.prototype.createQueryRunner = function (mode) {
-        if (mode === void 0) { mode = "master"; }
+    createQueryRunner(mode) {
         return new 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 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];
-        var keys = Object.keys(parameters).map(function (parameter) { return "(:(\\.\\.\\.)?" + parameter + "\\b)"; }).join("|");
-        sql = sql.replace(new RegExp(keys, "g"), function (key) {
-            var value;
-            var isArray = false;
-            if (key.substr(0, 4) === ":...") {
-                isArray = true;
-                value = parameters[key.substr(4)];
-            }
-            else {
-                value = parameters[key.substr(1)];
+        sql = sql.replace(/:(\.\.\.)?([A-Za-z0-9_.]+)/g, (full, isArray, key) => {
+            if (!parameters.hasOwnProperty(key)) {
+                return full;
             }
+            let value = parameters[key];
             if (isArray) {
-                return value.map(function (v, index) {
+                return value
+                    .map((v) => {
                     escapedParameters.push(v);
-                    return ":" + key.substr(4) + index;
-                }).join(", ");
+                    return this.createParameter(key, escapedParameters.length - 1);
+                })
+                    .join(", ");
             }
-            else if (value instanceof Function) {
+            if (typeof value === "function") {
                 return value();
             }
-            else if (typeof value === "boolean") {
-                return value ? 1 : 0;
-            }
-            else {
-                escapedParameters.push(value);
-                return key;
+            if (typeof value === "boolean") {
+                return value ? "1" : "0";
             }
+            escapedParameters.push(value);
+            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 "\"" + 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) {
-        return 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.
+     */
+    parseTableName(target) {
+        const driverDatabase = this.database;
+        const driverSchema = this.schema;
+        if (InstanceChecker.isTable(target) || InstanceChecker.isView(target)) {
+            const parsed = this.parseTableName(target.name);
+            return {
+                database: target.database || parsed.database || driverDatabase,
+                schema: target.schema || parsed.schema || driverSchema,
+                tableName: parsed.tableName,
+            };
+        }
+        if (InstanceChecker.isTableForeignKey(target)) {
+            const parsed = this.parseTableName(target.referencedTableName);
+            return {
+                database: target.referencedDatabase ||
+                    parsed.database ||
+                    driverDatabase,
+                schema: target.referencedSchema || parsed.schema || driverSchema,
+                tableName: parsed.tableName,
+            };
+        }
+        if (InstanceChecker.isEntityMetadata(target)) {
+            // EntityMetadata tableName is never a path
+            return {
+                database: target.database || driverDatabase,
+                schema: target.schema || driverSchema,
+                tableName: target.tableName,
+            };
+        }
+        const parts = target.split(".");
+        if (parts.length === 3) {
+            return {
+                database: parts[0] || driverDatabase,
+                schema: parts[1] || driverSchema,
+                tableName: parts[2],
+            };
+        }
+        else if (parts.length === 2) {
+            return {
+                database: driverDatabase,
+                schema: parts[0] || driverSchema,
+                tableName: parts[1],
+            };
+        }
+        else {
+            return {
+                database: driverDatabase,
+                schema: driverSchema,
+                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.transformTo(columnMetadata.transformer, value);
         if (value === null || value === undefined)
@@ -323,12 +361,12 @@ var OracleDriver = /** @class */ (function () {
         else if (columnMetadata.type === "date") {
             if (typeof value === "string")
                 value = value.replace(/[^0-9-]/g, "");
-            return function () { return "TO_DATE('" + DateUtils.mixedDateToDateString(value) + "', 'YYYY-MM-DD')"; };
+            return () => `TO_DATE('${DateUtils.mixedDateToDateString(value)}', 'YYYY-MM-DD')`;
         }
-        else if (columnMetadata.type === Date
-            || columnMetadata.type === "timestamp"
-            || columnMetadata.type === "timestamp with time zone"
-            || columnMetadata.type === "timestamp with local time zone") {
+        else if (columnMetadata.type === Date ||
+            columnMetadata.type === "timestamp" ||
+            columnMetadata.type === "timestamp with time zone" ||
+            columnMetadata.type === "timestamp with local time zone") {
             return DateUtils.mixedDateToDate(value);
         }
         else if (columnMetadata.type === "simple-array") {
@@ -338,13 +376,15 @@ var OracleDriver = /** @class */ (function () {
             return 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.transformFrom(columnMetadata.transformer, value) : value;
+            return columnMetadata.transformer
+                ? ApplyValueTransformers.transformFrom(columnMetadata.transformer, value)
+                : value;
         if (columnMetadata.type === Boolean) {
             value = !!value;
         }
@@ -354,10 +394,10 @@ var OracleDriver = /** @class */ (function () {
         else if (columnMetadata.type === "time") {
             value = DateUtils.mixedTimeToString(value);
         }
-        else if (columnMetadata.type === Date
-            || columnMetadata.type === "timestamp"
-            || columnMetadata.type === "timestamp with time zone"
-            || columnMetadata.type === "timestamp with local time zone") {
+        else if (columnMetadata.type === Date ||
+            columnMetadata.type === "timestamp" ||
+            columnMetadata.type === "timestamp with time zone" ||
+            columnMetadata.type === "timestamp with local time zone") {
             value = DateUtils.normalizeHydratedDate(value);
         }
         else if (columnMetadata.type === "json") {
@@ -372,17 +412,23 @@ var OracleDriver = /** @class */ (function () {
         if (columnMetadata.transformer)
             value = ApplyValueTransformers.transformFrom(columnMetadata.transformer, value);
         return value;
-    };
+    }
     /**
      * Creates a database type from a given column metadata.
      */
-    OracleDriver.prototype.normalizeType = function (column) {
-        if (column.type === Number || column.type === Boolean || column.type === "numeric"
-            || column.type === "dec" || column.type === "decimal" || column.type === "int"
-            || column.type === "integer" || column.type === "smallint") {
+    normalizeType(column) {
+        if (column.type === Number ||
+            column.type === Boolean ||
+            column.type === "numeric" ||
+            column.type === "dec" ||
+            column.type === "decimal" ||
+            column.type === "int" ||
+            column.type === "integer" ||
+            column.type === "smallint") {
             return "number";
         }
-        else if (column.type === "real" || column.type === "double precision") {
+        else if (column.type === "real" ||
+            column.type === "double precision") {
             return "float";
         }
         else if (column.type === String || column.type === "varchar") {
@@ -406,38 +452,39 @@ 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;
         }
-        else if (typeof defaultValue === "boolean") {
-            return defaultValue === true ? "1" : "0";
+        if (typeof defaultValue === "boolean") {
+            return defaultValue ? "1" : "0";
         }
-        else if (typeof defaultValue === "function") {
+        if (typeof defaultValue === "function") {
             return defaultValue();
         }
-        else if (typeof defaultValue === "string") {
-            return "'" + defaultValue + "'";
+        if (typeof defaultValue === "string") {
+            return `'${defaultValue}'`;
         }
-        else {
-            return defaultValue;
+        if (defaultValue === null || defaultValue === undefined) {
+            return undefined;
         }
-    };
+        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) {
@@ -453,123 +500,162 @@ 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 += "(" + this.getColumnLength(column) + ")";
+            type += `(${this.getColumnLength(column)})`;
         }
-        else if (column.precision !== null && column.precision !== undefined && column.scale !== null && column.scale !== undefined) {
+        else if (column.precision !== null &&
+            column.precision !== undefined &&
+            column.scale !== null &&
+            column.scale !== undefined) {
             type += "(" + column.precision + "," + column.scale + ")";
         }
-        else if (column.precision !== null && column.precision !== undefined) {
+        else if (column.precision !== null &&
+            column.precision !== undefined) {
             type += "(" + column.precision + ")";
         }
         if (column.type === "timestamp with time zone") {
-            type = "TIMESTAMP" + (column.precision !== null && column.precision !== undefined ? "(" + column.precision + ")" : "") + " WITH TIME ZONE";
+            type =
+                "TIMESTAMP" +
+                    (column.precision !== null && column.precision !== undefined
+                        ? "(" + column.precision + ")"
+                        : "") +
+                    " WITH TIME ZONE";
         }
         else if (column.type === "timestamp with local time zone") {
-            type = "TIMESTAMP" + (column.precision !== null && column.precision !== undefined ? "(" + column.precision + ")" : "") + " WITH LOCAL TIME ZONE";
+            type =
+                "TIMESTAMP" +
+                    (column.precision !== null && column.precision !== undefined
+                        ? "(" + column.precision + ")"
+                        : "") +
+                    " WITH LOCAL TIME ZONE";
         }
         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) {
-            _this.master.getConnection(function (err, connection, release) {
+    obtainMasterConnection() {
+        return new Promise((ok, fail) => {
+            if (!this.master) {
+                return fail(new TypeORMError("Driver not Connected"));
+            }
+            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.mergeDeep(map, column.createValueMap(_this.prepareHydratedValue(insertResult[key], column)));
+                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
-            return tableColumn.name !== columnMetadata.databaseName
-                || tableColumn.type !== _this.normalizeType(columnMetadata)
-                || tableColumn.length !== columnMetadata.length
-                || tableColumn.precision !== columnMetadata.precision
-                || tableColumn.scale !== columnMetadata.scale
-                // || tableColumn.comment !== columnMetadata.comment || // todo
-                || (_this.normalizeDefault(columnMetadata) !== tableColumn.default
-                    && !(_this.normalizeDefault(columnMetadata) === null && typeof tableColumn.default === "undefined"))
-                || tableColumn.isPrimary !== columnMetadata.isPrimary
-                || tableColumn.isNullable !== columnMetadata.isNullable
-                || tableColumn.isUnique !== _this.normalizeIsUnique(columnMetadata)
-                || (columnMetadata.generationStrategy !== "uuid" && tableColumn.isGenerated !== columnMetadata.isGenerated);
+            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.isPrimary !== columnMetadata.isPrimary ||
+                tableColumn.isNullable !== columnMetadata.isNullable ||
+                tableColumn.isUnique !==
+                    this.normalizeIsUnique(columnMetadata) ||
+                (columnMetadata.generationStrategy !== "uuid" &&
+                    tableColumn.isGenerated !== columnMetadata.isGenerated);
+            // DEBUG SECTION
+            // if (isColumnChanged) {
+            //     console.log("table:", columnMetadata.entityMetadata.tableName);
+            //     console.log("name:", tableColumn.name, columnMetadata.databaseName);
+            //     console.log("type:", tableColumn.type, this.normalizeType(columnMetadata));
+            //     console.log("length:", tableColumn.length, columnMetadata.length);
+            //     console.log("precision:", tableColumn.precision, columnMetadata.precision);
+            //     console.log("scale:", tableColumn.scale, columnMetadata.scale);
+            //     console.log("comment:", tableColumn.comment, columnMetadata.comment);
+            //     console.log("default:", tableColumn.default, this.normalizeDefault(columnMetadata));
+            //     console.log("enum:", tableColumn.enum && columnMetadata.enum && !OrmUtils.isArraysEqual(tableColumn.enum, columnMetadata.enum.map(val => val + "")));
+            //     console.log("onUpdate:", tableColumn.onUpdate, columnMetadata.onUpdate);
+            //     console.log("isPrimary:", tableColumn.isPrimary, columnMetadata.isPrimary);
+            //     console.log("isNullable:", tableColumn.isNullable, columnMetadata.isNullable);
+            //     console.log("isUnique:", tableColumn.isUnique, this.normalizeIsUnique(columnMetadata));
+            //     console.log("isGenerated:", tableColumn.isGenerated, columnMetadata.isGenerated);
+            //     console.log("==========================================");
+            // }
+            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.
+     */
+    isFullTextColumnTypeSupported() {
+        return false;
+    }
     /**
      * Creates an escaped parameter.
      */
-    OracleDriver.prototype.createParameter = function (parameterName, index) {
-        return ":" + parameterName;
-    };
+    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":
@@ -594,62 +680,70 @@ 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 {
-            this.oracle = PlatformTools.load("oracledb");
+            const oracle = this.options.driver || PlatformTools.load("oracledb");
+            this.oracle = oracle;
         }
         catch (e) {
             throw new 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 connectionOptions;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                credentials = Object.assign({}, credentials, DriverUtils.buildDriverOptions(credentials)); // todo: do it better way
-                connectionOptions = Object.assign({}, {
-                    user: credentials.username,
-                    password: credentials.password,
-                    connectString: credentials.connectString ? credentials.connectString : credentials.host + ":" + credentials.port + "/" + credentials.sid,
-                }, 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.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,
+        }, 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;
-}());
-export { OracleDriver };
+    }
+}
 
 //# sourceMappingURL=OracleDriver.js.map