typeorm 0.3.29-dev.cc07c90 → 1.0.0-beta.1

package/driver/oracle/OracleQueryRunner.js

@@ -30,7 +30,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     constructor(driver, mode) {
         super();
         this.driver = driver;
-        this.connection = driver.connection;
+        this.dataSource = driver.dataSource;
         this.broadcaster = new Broadcaster_1.Broadcaster(this);
         this.mode = mode;
     }
@@ -78,6 +78,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Starts transaction.
+     * @param isolationLevel
      */
     async startTransaction(isolationLevel = "READ COMMITTED") {
         if (this.isReleased)
@@ -139,12 +140,15 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Executes a given SQL query.
+     * @param query
+     * @param parameters
+     * @param useStructuredResult
      */
     async query(query, parameters, useStructuredResult = false) {
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
         const databaseConnection = await this.connect();
-        this.driver.connection.logger.logQuery(query, parameters, this);
+        this.driver.dataSource.logger.logQuery(query, parameters, this);
         await this.broadcaster.broadcast("BeforeQuery", query, parameters);
         const broadcasterResult = new BroadcasterResult_1.BroadcasterResult();
         const queryStartTime = Date.now();
@@ -161,7 +165,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, true, queryExecutionTime, raw, undefined);
             if (maxQueryExecutionTime &&
                 queryExecutionTime > maxQueryExecutionTime)
-                this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
+                this.driver.dataSource.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
             const result = new QueryResult_1.QueryResult();
             result.raw =
                 raw.rows ||
@@ -190,7 +194,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             }
         }
         catch (err) {
-            this.driver.connection.logger.logQueryError(err, query, parameters, this);
+            this.driver.dataSource.logger.logQueryError(err, query, parameters, this);
             this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, false, undefined, undefined, err);
             throw new QueryFailedError_1.QueryFailedError(query, parameters, err);
         }
@@ -200,6 +204,10 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Returns raw data stream.
+     * @param query
+     * @param parameters
+     * @param onEnd
+     * @param onError
      */
     async stream(query, parameters, onEnd, onError) {
         if (this.isReleased) {
@@ -210,7 +218,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             outFormat: this.driver.oracle.OUT_FORMAT_OBJECT,
         };
         const databaseConnection = await this.connect();
-        this.driver.connection.logger.logQuery(query, parameters, this);
+        this.driver.dataSource.logger.logQuery(query, parameters, this);
         try {
             const stream = databaseConnection.queryStream(query, parameters, executionOptions);
             if (onEnd) {
@@ -222,7 +230,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             return stream;
         }
         catch (err) {
-            this.driver.connection.logger.logQueryError(err, query, parameters, this);
+            this.driver.dataSource.logger.logQueryError(err, query, parameters, this);
             throw new QueryFailedError_1.QueryFailedError(query, parameters, err);
         }
     }
@@ -235,16 +243,18 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     /**
      * Returns all available schema names including system schemas.
      * If database parameter specified, returns schemas of that database.
+     * @param database
      */
     async getSchemas(database) {
         return Promise.resolve([]);
     }
     /**
      * Checks if database with the given name exist.
+     * @param database
      */
     async hasDatabase(database) {
         try {
-            const query = await this.query(`SELECT 1 AS "exists" FROM global_name@"${database}"`);
+            const query = await this.query(`SELECT 1 AS "exists" FROM global_name@${this.driver.escape(database)}`);
             return query.length > 0;
         }
         catch (e) {
@@ -260,6 +270,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Checks if schema with the given name exist.
+     * @param schema
      */
     async hasSchema(schema) {
         return Promise.resolve(false);
@@ -273,32 +284,37 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Checks if table with the given name exist in the database.
+     * @param tableOrName
      */
     async hasTable(tableOrName) {
         const { tableName } = this.driver.parseTableName(tableOrName);
-        const sql = `SELECT "TABLE_NAME" FROM "USER_TABLES" WHERE "TABLE_NAME" = '${tableName}'`;
-        const result = await this.query(sql);
+        const sql = `SELECT "TABLE_NAME" FROM "USER_TABLES" WHERE "TABLE_NAME" = :1`;
+        const result = await this.query(sql, [tableName]);
         return result.length ? true : false;
     }
     /**
      * Checks if column with the given name exist in the given table.
+     * @param tableOrName
+     * @param columnName
      */
     async hasColumn(tableOrName, columnName) {
         const { tableName } = this.driver.parseTableName(tableOrName);
-        const sql = `SELECT "COLUMN_NAME" FROM "USER_TAB_COLS" WHERE "TABLE_NAME" = '${tableName}' AND "COLUMN_NAME" = '${columnName}'`;
-        const result = await this.query(sql);
+        const sql = `SELECT "COLUMN_NAME" FROM "USER_TAB_COLS" WHERE "TABLE_NAME" = :1 AND "COLUMN_NAME" = :2`;
+        const result = await this.query(sql, [tableName, columnName]);
         return result.length ? true : false;
     }
     /**
      * Creates a new database.
+     * @param database
+     * @param ifNotExists
      */
-    async createDatabase(database, ifNotExist) {
+    async createDatabase(database, ifNotExists) {
         // Even with `IF NOT EXISTS` we get:
         //   ORA-01501: CREATE DATABASE failed
         //   ORA-01100: database already mounted
-        if (ifNotExist) {
+        if (ifNotExists) {
             try {
-                await this.query(`CREATE DATABASE IF NOT EXISTS "${database}";`);
+                await this.query(`CREATE DATABASE IF NOT EXISTS ${this.driver.escape(database)};`);
             }
             catch (e) {
                 // if (e instanceof QueryFailedError) {
@@ -310,32 +326,42 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             }
         }
         else {
-            await this.query(`CREATE DATABASE "${database}"`);
+            await this.query(`CREATE DATABASE ${this.driver.escape(database)}`);
         }
     }
     /**
      * Drops database.
+     * @param database
+     * @param ifExists
      */
-    async dropDatabase(database, ifExist) {
+    async dropDatabase(database, ifExists) {
         return Promise.resolve();
     }
     /**
      * Creates a new table schema.
+     * @param schemaPath
+     * @param ifNotExists
      */
-    async createSchema(schemaPath, ifNotExist) {
+    async createSchema(schemaPath, ifNotExists) {
         throw new error_1.TypeORMError(`Schema create queries are not supported by Oracle driver.`);
     }
     /**
      * Drops table schema.
+     * @param schemaPath
+     * @param ifExists
      */
-    async dropSchema(schemaPath, ifExist) {
+    async dropSchema(schemaPath, ifExists) {
         throw new error_1.TypeORMError(`Schema drop queries are not supported by Oracle driver.`);
     }
     /**
      * Creates a new table.
+     * @param table
+     * @param ifNotExists
+     * @param createForeignKeys
+     * @param createIndices
      */
-    async createTable(table, ifNotExist = false, createForeignKeys = true, createIndices = true) {
-        if (ifNotExist) {
+    async createTable(table, ifNotExists = false, createForeignKeys = true, createIndices = true) {
+        if (ifNotExists) {
             const isTableExist = await this.hasTable(table);
             if (isTableExist)
                 return Promise.resolve();
@@ -352,7 +378,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             table.indices.forEach((index) => {
                 // new index may be passed without name. In this case we generate index name manually.
                 if (!index.name)
-                    index.name = this.connection.namingStrategy.indexName(table, index.columnNames, index.where);
+                    index.name = this.dataSource.namingStrategy.indexName(table, index.columnNames, index.where);
                 upQueries.push(this.createIndexSql(table, index));
                 downQueries.push(this.dropIndexSql(index));
             });
@@ -378,11 +404,15 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops the table.
+     * @param tableOrName
+     * @param ifExists
+     * @param dropForeignKeys
+     * @param dropIndices
      */
-    async dropTable(tableOrName, ifExist, dropForeignKeys = true, dropIndices = true) {
+    async dropTable(tableOrName, ifExists, dropForeignKeys = true, dropIndices = true) {
         // It needs because if table does not exist and dropForeignKeys or dropIndices is true, we don't need
         // to perform drop queries for foreign keys and indices.
-        if (ifExist) {
+        if (ifExists) {
             const isTableExist = await this.hasTable(tableOrName);
             if (!isTableExist)
                 return Promise.resolve();
@@ -427,6 +457,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new view.
+     * @param view
+     * @param syncWithMetadata
      */
     async createView(view, syncWithMetadata = false) {
         const upQueries = [];
@@ -441,10 +473,16 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops the view.
+     * @param target
+     * @param ifExists
      */
-    async dropView(target) {
+    async dropView(target, ifExists) {
         const viewName = InstanceChecker_1.InstanceChecker.isView(target) ? target.name : target;
-        const view = await this.getCachedView(viewName);
+        const view = ifExists
+            ? await this.getCachedView(viewName).catch(() => undefined)
+            : await this.getCachedView(viewName);
+        if (!view)
+            return;
         const upQueries = [];
         const downQueries = [];
         upQueries.push(this.deleteViewDefinitionSql(view));
@@ -455,6 +493,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Renames the given table.
+     * @param oldTableOrName
+     * @param newTableName
      */
     async renameTable(oldTableOrName, newTableName) {
         const upQueries = [];
@@ -472,20 +512,20 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (newTable.primaryColumns.length > 0 &&
             !newTable.primaryColumns[0].primaryKeyConstraintName) {
             const columnNames = newTable.primaryColumns.map((column) => column.name);
-            const oldPkName = this.connection.namingStrategy.primaryKeyName(oldTable, columnNames);
-            const newPkName = this.connection.namingStrategy.primaryKeyName(newTable, columnNames);
+            const oldPkName = this.dataSource.namingStrategy.primaryKeyName(oldTable, columnNames);
+            const newPkName = this.dataSource.namingStrategy.primaryKeyName(newTable, columnNames);
             // build queries
             upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${oldPkName}" TO "${newPkName}"`));
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${newPkName}" TO "${oldPkName}"`));
         }
         // rename unique constraints
         newTable.uniques.forEach((unique) => {
-            const oldUniqueName = this.connection.namingStrategy.uniqueConstraintName(oldTable, unique.columnNames);
+            const oldUniqueName = this.dataSource.namingStrategy.uniqueConstraintName(oldTable, unique.columnNames);
             // Skip renaming if Unique has user defined constraint name
             if (unique.name !== oldUniqueName)
                 return;
             // build new constraint name
-            const newUniqueName = this.connection.namingStrategy.uniqueConstraintName(newTable, unique.columnNames);
+            const newUniqueName = this.dataSource.namingStrategy.uniqueConstraintName(newTable, unique.columnNames);
             // build queries
             upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${unique.name}" TO "${newUniqueName}"`));
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${newUniqueName}" TO "${unique.name}"`));
@@ -494,12 +534,12 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         });
         // rename index constraints
         newTable.indices.forEach((index) => {
-            const oldIndexName = this.connection.namingStrategy.indexName(oldTable, index.columnNames, index.where);
+            const oldIndexName = this.dataSource.namingStrategy.indexName(oldTable, index.columnNames, index.where);
             // Skip renaming if Index has user defined constraint name
             if (index.name !== oldIndexName)
                 return;
             // build new constraint name
-            const newIndexName = this.connection.namingStrategy.indexName(newTable, index.columnNames, index.where);
+            const newIndexName = this.dataSource.namingStrategy.indexName(newTable, index.columnNames, index.where);
             // build queries
             upQueries.push(new Query_1.Query(`ALTER INDEX "${index.name}" RENAME TO "${newIndexName}"`));
             downQueries.push(new Query_1.Query(`ALTER INDEX "${newIndexName}" RENAME TO "${index.name}"`));
@@ -508,12 +548,12 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         });
         // rename foreign key constraints
         newTable.foreignKeys.forEach((foreignKey) => {
-            const oldForeignKeyName = this.connection.namingStrategy.foreignKeyName(oldTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+            const oldForeignKeyName = this.dataSource.namingStrategy.foreignKeyName(oldTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
             // Skip renaming if foreign key has user defined constraint name
             if (foreignKey.name !== oldForeignKeyName)
                 return;
             // build new constraint name
-            const newForeignKeyName = this.connection.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+            const newForeignKeyName = this.dataSource.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
             // build queries
             upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${foreignKey.name}" TO "${newForeignKeyName}"`));
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${newForeignKeyName}" TO "${foreignKey.name}"`));
@@ -527,6 +567,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new column from the column in the table.
+     * @param tableOrName
+     * @param column
      */
     async addColumn(tableOrName, column) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -544,7 +586,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             if (primaryColumns.length > 0) {
                 const pkName = primaryColumns[0].primaryKeyConstraintName
                     ? primaryColumns[0].primaryKeyConstraintName
-                    : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                    : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                 const columnNames = primaryColumns
                     .map((column) => `"${column.name}"`)
                     .join(", ");
@@ -554,7 +596,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             primaryColumns.push(column);
             const pkName = primaryColumns[0].primaryKeyConstraintName
                 ? primaryColumns[0].primaryKeyConstraintName
-                : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
             const columnNames = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
@@ -572,7 +614,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // create unique constraint
         if (column.isUnique) {
             const uniqueConstraint = new TableUnique_1.TableUnique({
-                name: this.connection.namingStrategy.uniqueConstraintName(table, [column.name]),
+                name: this.dataSource.namingStrategy.uniqueConstraintName(table, [column.name]),
                 columnNames: [column.name],
             });
             clonedTable.uniques.push(uniqueConstraint);
@@ -600,6 +642,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new columns from the column in the table.
+     * @param tableOrName
+     * @param columns
      */
     async addColumns(tableOrName, columns) {
         for (const column of columns) {
@@ -608,6 +652,9 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Renames column in the given table.
+     * @param tableOrName
+     * @param oldTableColumnOrName
+     * @param newTableColumnOrName
      */
     async renameColumn(tableOrName, oldTableColumnOrName, newTableColumnOrName) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -618,7 +665,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : table.columns.find((c) => c.name === oldTableColumnOrName);
         if (!oldColumn)
             throw new error_1.TypeORMError(`Column "${oldTableColumnOrName}" was not found in the ${this.escapePath(table)} table.`);
-        let newColumn = undefined;
+        let newColumn;
         if (InstanceChecker_1.InstanceChecker.isTableColumn(newTableColumnOrName)) {
             newColumn = newTableColumnOrName;
         }
@@ -630,6 +677,9 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param oldTableColumnOrName
+     * @param newColumn
      */
     async changeColumn(tableOrName, oldTableColumnOrName, newColumn) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -667,25 +717,25 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     const primaryColumns = clonedTable.primaryColumns;
                     // build old primary constraint name
                     const columnNames = primaryColumns.map((column) => column.name);
-                    const oldPkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
+                    const oldPkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, columnNames);
                     // replace old column name with new column name
                     columnNames.splice(columnNames.indexOf(oldColumn.name), 1);
                     columnNames.push(newColumn.name);
                     // build new primary constraint name
-                    const newPkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
+                    const newPkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, columnNames);
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${oldPkName}" TO "${newPkName}"`));
                     downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${newPkName}" TO "${oldPkName}"`));
                 }
                 // rename unique constraints
                 clonedTable.findColumnUniques(oldColumn).forEach((unique) => {
-                    const oldUniqueName = this.connection.namingStrategy.uniqueConstraintName(clonedTable, unique.columnNames);
+                    const oldUniqueName = this.dataSource.namingStrategy.uniqueConstraintName(clonedTable, unique.columnNames);
                     // Skip renaming if Unique has user defined constraint name
                     if (unique.name !== oldUniqueName)
                         return;
                     // build new constraint name
                     unique.columnNames.splice(unique.columnNames.indexOf(oldColumn.name), 1);
                     unique.columnNames.push(newColumn.name);
-                    const newUniqueName = this.connection.namingStrategy.uniqueConstraintName(clonedTable, unique.columnNames);
+                    const newUniqueName = this.dataSource.namingStrategy.uniqueConstraintName(clonedTable, unique.columnNames);
                     // build queries
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${unique.name}" TO "${newUniqueName}"`));
                     downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${newUniqueName}" TO "${unique.name}"`));
@@ -694,14 +744,14 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 });
                 // rename index constraints
                 clonedTable.findColumnIndices(oldColumn).forEach((index) => {
-                    const oldIndexName = this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
+                    const oldIndexName = this.dataSource.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
                     // Skip renaming if Index has user defined constraint name
                     if (index.name !== oldIndexName)
                         return;
                     // build new constraint name
                     index.columnNames.splice(index.columnNames.indexOf(oldColumn.name), 1);
                     index.columnNames.push(newColumn.name);
-                    const newIndexName = this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
+                    const newIndexName = this.dataSource.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
                     // build queries
                     upQueries.push(new Query_1.Query(`ALTER INDEX "${index.name}" RENAME TO "${newIndexName}"`));
                     downQueries.push(new Query_1.Query(`ALTER INDEX "${newIndexName}" RENAME TO "${index.name}"`));
@@ -712,14 +762,14 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 clonedTable
                     .findColumnForeignKeys(oldColumn)
                     .forEach((foreignKey) => {
-                    const foreignKeyName = this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+                    const foreignKeyName = this.dataSource.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
                     // Skip renaming if foreign key has user defined constraint name
                     if (foreignKey.name !== foreignKeyName)
                         return;
                     // build new constraint name
                     foreignKey.columnNames.splice(foreignKey.columnNames.indexOf(oldColumn.name), 1);
                     foreignKey.columnNames.push(newColumn.name);
-                    const newForeignKeyName = this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+                    const newForeignKeyName = this.dataSource.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
                     // build queries
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${foreignKey.name}" TO "${newForeignKeyName}"`));
                     downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${newForeignKeyName}" TO "${foreignKey.name}"`));
@@ -764,8 +814,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         nullableDown = "NULL";
                     }
                 }
-                upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} MODIFY "${oldColumn.name}" ${this.connection.driver.createFullType(newColumn)} ${defaultUp} ${nullableUp}`));
-                downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} MODIFY "${oldColumn.name}" ${this.connection.driver.createFullType(oldColumn)} ${defaultDown} ${nullableDown}`));
+                upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} MODIFY "${oldColumn.name}" ${this.dataSource.driver.createFullType(newColumn)} ${defaultUp} ${nullableUp}`));
+                downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} MODIFY "${oldColumn.name}" ${this.dataSource.driver.createFullType(oldColumn)} ${defaultDown} ${nullableDown}`));
             }
             if (newColumn.isPrimary !== oldColumn.isPrimary) {
                 const primaryColumns = clonedTable.primaryColumns;
@@ -773,7 +823,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 if (primaryColumns.length > 0) {
                     const pkName = primaryColumns[0].primaryKeyConstraintName
                         ? primaryColumns[0].primaryKeyConstraintName
-                        : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                        : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                     const columnNames = primaryColumns
                         .map((column) => `"${column.name}"`)
                         .join(", ");
@@ -787,7 +837,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     column.isPrimary = true;
                     const pkName = primaryColumns[0].primaryKeyConstraintName
                         ? primaryColumns[0].primaryKeyConstraintName
-                        : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                        : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                     const columnNames = primaryColumns
                         .map((column) => `"${column.name}"`)
                         .join(", ");
@@ -805,7 +855,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         const pkName = primaryColumns[0]
                             .primaryKeyConstraintName
                             ? primaryColumns[0].primaryKeyConstraintName
-                            : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                            : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                         const columnNames = primaryColumns
                             .map((column) => `"${column.name}"`)
                             .join(", ");
@@ -817,7 +867,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             if (newColumn.isUnique !== oldColumn.isUnique) {
                 if (newColumn.isUnique === true) {
                     const uniqueConstraint = new TableUnique_1.TableUnique({
-                        name: this.connection.namingStrategy.uniqueConstraintName(table, [newColumn.name]),
+                        name: this.dataSource.namingStrategy.uniqueConstraintName(table, [newColumn.name]),
                         columnNames: [newColumn.name],
                     });
                     clonedTable.uniques.push(uniqueConstraint);
@@ -840,6 +890,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param changedColumns
      */
     async changeColumns(tableOrName, changedColumns) {
         for (const { oldColumn, newColumn } of changedColumns) {
@@ -848,16 +900,22 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops column in the table.
+     * @param tableOrName
+     * @param columnOrName
+     * @param ifExists
      */
-    async dropColumn(tableOrName, columnOrName) {
+    async dropColumn(tableOrName, columnOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const column = InstanceChecker_1.InstanceChecker.isTableColumn(columnOrName)
             ? columnOrName
             : table.findColumnByName(columnOrName);
-        if (!column)
+        if (!column) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Column "${columnOrName}" was not found in table ${this.escapePath(table)}`);
+        }
         const clonedTable = table.clone();
         const upQueries = [];
         const downQueries = [];
@@ -865,7 +923,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (column.isPrimary) {
             const pkName = column.primaryKeyConstraintName
                 ? column.primaryKeyConstraintName
-                : this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
+                : this.dataSource.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
             const columnNames = clonedTable.primaryColumns
                 .map((primaryColumn) => `"${primaryColumn.name}"`)
                 .join(", ");
@@ -879,7 +937,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 const pkName = clonedTable.primaryColumns[0]
                     .primaryKeyConstraintName
                     ? clonedTable.primaryColumns[0].primaryKeyConstraintName
-                    : this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
+                    : this.dataSource.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
                 const columnNames = clonedTable.primaryColumns
                     .map((primaryColumn) => `"${primaryColumn.name}"`)
                     .join(", ");
@@ -934,14 +992,20 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops the columns in the table.
+     * @param tableOrName
+     * @param columns
+     * @param ifExists
      */
-    async dropColumns(tableOrName, columns) {
+    async dropColumns(tableOrName, columns, ifExists) {
         for (const column of [...columns]) {
-            await this.dropColumn(tableOrName, column);
+            await this.dropColumn(tableOrName, column, ifExists);
         }
     }
     /**
      * Creates a new primary key.
+     * @param tableOrName
+     * @param columnNames
+     * @param constraintName
      */
     async createPrimaryKey(tableOrName, columnNames, constraintName) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -960,6 +1024,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Updates composite primary keys.
+     * @param tableOrName
+     * @param columns
      */
     async updatePrimaryKeys(tableOrName, columns) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -974,7 +1040,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (primaryColumns.length > 0) {
             const pkName = primaryColumns[0].primaryKeyConstraintName
                 ? primaryColumns[0].primaryKeyConstraintName
-                : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
             const columnNamesString = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
@@ -984,10 +1050,12 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // update columns in table.
         clonedTable.columns
             .filter((column) => columnNames.indexOf(column.name) !== -1)
-            .forEach((column) => (column.isPrimary = true));
+            .forEach((column) => {
+            column.isPrimary = true;
+        });
         const pkName = primaryColumns[0].primaryKeyConstraintName
             ? primaryColumns[0].primaryKeyConstraintName
-            : this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
+            : this.dataSource.namingStrategy.primaryKeyName(clonedTable, columnNames);
         const columnNamesString = columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
@@ -998,11 +1066,16 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a primary key.
+     * @param tableOrName
+     * @param constraintName
+     * @param ifExists
      */
-    async dropPrimaryKey(tableOrName, constraintName) {
+    async dropPrimaryKey(tableOrName, constraintName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
+        if (ifExists && table.primaryColumns.length === 0)
+            return;
         const up = this.dropPrimaryKeySql(table);
         const down = this.createPrimaryKeySql(table, table.primaryColumns.map((column) => column.name), constraintName);
         await this.executeQueries(up, down);
@@ -1012,6 +1085,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new unique constraint.
+     * @param tableOrName
+     * @param uniqueConstraint
      */
     async createUniqueConstraint(tableOrName, uniqueConstraint) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1020,7 +1095,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // new unique constraint may be passed without name. In this case we generate unique name manually.
         if (!uniqueConstraint.name)
             uniqueConstraint.name =
-                this.connection.namingStrategy.uniqueConstraintName(table, uniqueConstraint.columnNames);
+                this.dataSource.namingStrategy.uniqueConstraintName(table, uniqueConstraint.columnNames);
         const up = this.createUniqueConstraintSql(table, uniqueConstraint);
         const down = this.dropUniqueConstraintSql(table, uniqueConstraint);
         await this.executeQueries(up, down);
@@ -1028,6 +1103,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
      */
     async createUniqueConstraints(tableOrName, uniqueConstraints) {
         const promises = uniqueConstraints.map((uniqueConstraint) => this.createUniqueConstraint(tableOrName, uniqueConstraint));
@@ -1035,30 +1112,41 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a unique constraint.
+     * @param tableOrName
+     * @param uniqueOrName
+     * @param ifExists
      */
-    async dropUniqueConstraint(tableOrName, uniqueOrName) {
+    async dropUniqueConstraint(tableOrName, uniqueOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const uniqueConstraint = InstanceChecker_1.InstanceChecker.isTableUnique(uniqueOrName)
             ? uniqueOrName
             : table.uniques.find((u) => u.name === uniqueOrName);
-        if (!uniqueConstraint)
+        if (!uniqueConstraint) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied unique constraint was not found in table ${table.name}`);
+        }
         const up = this.dropUniqueConstraintSql(table, uniqueConstraint);
         const down = this.createUniqueConstraintSql(table, uniqueConstraint);
         await this.executeQueries(up, down);
         table.removeUniqueConstraint(uniqueConstraint);
     }
     /**
-     * Creates a unique constraints.
+     * Drops unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
+     * @param ifExists
      */
-    async dropUniqueConstraints(tableOrName, uniqueConstraints) {
-        const promises = uniqueConstraints.map((uniqueConstraint) => this.dropUniqueConstraint(tableOrName, uniqueConstraint));
+    async dropUniqueConstraints(tableOrName, uniqueConstraints, ifExists) {
+        const promises = uniqueConstraints.map((uniqueConstraint) => this.dropUniqueConstraint(tableOrName, uniqueConstraint, ifExists));
         await Promise.all(promises);
     }
     /**
      * Creates new check constraint.
+     * @param tableOrName
+     * @param checkConstraint
      */
     async createCheckConstraint(tableOrName, checkConstraint) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1067,7 +1155,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // new unique constraint may be passed without name. In this case we generate unique name manually.
         if (!checkConstraint.name)
             checkConstraint.name =
-                this.connection.namingStrategy.checkConstraintName(table, checkConstraint.expression);
+                this.dataSource.namingStrategy.checkConstraintName(table, checkConstraint.expression);
         const up = this.createCheckConstraintSql(table, checkConstraint);
         const down = this.dropCheckConstraintSql(table, checkConstraint);
         await this.executeQueries(up, down);
@@ -1075,6 +1163,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates new check constraints.
+     * @param tableOrName
+     * @param checkConstraints
      */
     async createCheckConstraints(tableOrName, checkConstraints) {
         const promises = checkConstraints.map((checkConstraint) => this.createCheckConstraint(tableOrName, checkConstraint));
@@ -1082,16 +1172,22 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops check constraint.
+     * @param tableOrName
+     * @param checkOrName
+     * @param ifExists
      */
-    async dropCheckConstraint(tableOrName, checkOrName) {
+    async dropCheckConstraint(tableOrName, checkOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const checkConstraint = InstanceChecker_1.InstanceChecker.isTableCheck(checkOrName)
             ? checkOrName
             : table.checks.find((c) => c.name === checkOrName);
-        if (!checkConstraint)
+        if (!checkConstraint) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied check constraint was not found in table ${table.name}`);
+        }
         const up = this.dropCheckConstraintSql(table, checkConstraint);
         const down = this.createCheckConstraintSql(table, checkConstraint);
         await this.executeQueries(up, down);
@@ -1099,37 +1195,52 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops check constraints.
+     * @param tableOrName
+     * @param checkConstraints
+     * @param ifExists
      */
-    async dropCheckConstraints(tableOrName, checkConstraints) {
-        const promises = checkConstraints.map((checkConstraint) => this.dropCheckConstraint(tableOrName, checkConstraint));
+    async dropCheckConstraints(tableOrName, checkConstraints, ifExists) {
+        const promises = checkConstraints.map((checkConstraint) => this.dropCheckConstraint(tableOrName, checkConstraint, ifExists));
         await Promise.all(promises);
     }
     /**
      * Creates a new exclusion constraint.
+     * @param tableOrName
+     * @param exclusionConstraint
      */
     async createExclusionConstraint(tableOrName, exclusionConstraint) {
         throw new error_1.TypeORMError(`Oracle does not support exclusion constraints.`);
     }
     /**
      * Creates a new exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
      */
     async createExclusionConstraints(tableOrName, exclusionConstraints) {
         throw new error_1.TypeORMError(`Oracle does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraint.
+     * @param tableOrName
+     * @param exclusionOrName
+     * @param ifExists
      */
-    async dropExclusionConstraint(tableOrName, exclusionOrName) {
+    async dropExclusionConstraint(tableOrName, exclusionOrName, ifExists) {
         throw new error_1.TypeORMError(`Oracle does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
+     * @param ifExists
      */
-    async dropExclusionConstraints(tableOrName, exclusionConstraints) {
+    async dropExclusionConstraints(tableOrName, exclusionConstraints, ifExists) {
         throw new error_1.TypeORMError(`Oracle does not support exclusion constraints.`);
     }
     /**
      * Creates a new foreign key.
+     * @param tableOrName
+     * @param foreignKey
      */
     async createForeignKey(tableOrName, foreignKey) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1137,7 +1248,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : await this.getCachedTable(tableOrName);
         // new FK may be passed without name. In this case we generate FK name manually.
         if (!foreignKey.name)
-            foreignKey.name = this.connection.namingStrategy.foreignKeyName(table, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+            foreignKey.name = this.dataSource.namingStrategy.foreignKeyName(table, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
         const up = this.createForeignKeySql(table, foreignKey);
         const down = this.dropForeignKeySql(table, foreignKey);
         await this.executeQueries(up, down);
@@ -1145,6 +1256,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new foreign keys.
+     * @param tableOrName
+     * @param foreignKeys
      */
     async createForeignKeys(tableOrName, foreignKeys) {
         const promises = foreignKeys.map((foreignKey) => this.createForeignKey(tableOrName, foreignKey));
@@ -1152,16 +1265,25 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a foreign key from the table.
+     * @param tableOrName
+     * @param foreignKeyOrName
+     * @param ifExists
      */
-    async dropForeignKey(tableOrName, foreignKeyOrName) {
+    async dropForeignKey(tableOrName, foreignKeyOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const foreignKey = InstanceChecker_1.InstanceChecker.isTableForeignKey(foreignKeyOrName)
             ? foreignKeyOrName
             : table.foreignKeys.find((fk) => fk.name === foreignKeyOrName);
-        if (!foreignKey)
+        if (!foreignKey) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied foreign key was not found in table ${table.name}`);
+        }
+        if (!foreignKey.name) {
+            foreignKey.name = this.dataSource.namingStrategy.foreignKeyName(table, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+        }
         const up = this.dropForeignKeySql(table, foreignKey);
         const down = this.createForeignKeySql(table, foreignKey);
         await this.executeQueries(up, down);
@@ -1169,13 +1291,18 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a foreign keys from the table.
+     * @param tableOrName
+     * @param foreignKeys
+     * @param ifExists
      */
-    async dropForeignKeys(tableOrName, foreignKeys) {
-        const promises = foreignKeys.map((foreignKey) => this.dropForeignKey(tableOrName, foreignKey));
+    async dropForeignKeys(tableOrName, foreignKeys, ifExists) {
+        const promises = foreignKeys.map((foreignKey) => this.dropForeignKey(tableOrName, foreignKey, ifExists));
         await Promise.all(promises);
     }
     /**
      * Creates a new index.
+     * @param tableOrName
+     * @param index
      */
     async createIndex(tableOrName, index) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1191,6 +1318,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new indices
+     * @param tableOrName
+     * @param indices
      */
     async createIndices(tableOrName, indices) {
         const promises = indices.map((index) => this.createIndex(tableOrName, index));
@@ -1198,16 +1327,22 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops an index from the table.
+     * @param tableOrName
+     * @param indexOrName
+     * @param ifExists
      */
-    async dropIndex(tableOrName, indexOrName) {
+    async dropIndex(tableOrName, indexOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const index = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName)
             ? indexOrName
             : table.indices.find((i) => i.name === indexOrName);
-        if (!index)
+        if (!index) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied index ${indexOrName} was not found in table ${table.name}`);
+        }
         // old index may be passed without name. In this case we generate index name manually.
         if (!index.name)
             index.name = this.generateIndexName(table, index);
@@ -1218,17 +1353,24 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops an indices from the table.
+     * @param tableOrName
+     * @param indices
+     * @param ifExists
      */
-    async dropIndices(tableOrName, indices) {
-        const promises = indices.map((index) => this.dropIndex(tableOrName, index));
+    async dropIndices(tableOrName, indices, ifExists) {
+        const promises = indices.map((index) => this.dropIndex(tableOrName, index, ifExists));
         await Promise.all(promises);
     }
     /**
      * Clears all table contents.
      * Note: this operation uses SQL's TRUNCATE query which cannot be reverted in transactions.
+     * @param tableName
+     * @param options
+     * @param options.cascade
      */
-    async clearTable(tableName) {
-        await this.query(`TRUNCATE TABLE ${this.escapePath(tableName)}`);
+    async clearTable(tableName, options) {
+        const cascade = options?.cascade ? " CASCADE" : "";
+        await this.query(`TRUNCATE TABLE ${this.escapePath(tableName)}${cascade}`);
     }
     /**
      * Removes all tables from the currently connected database.
@@ -1306,6 +1448,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Loads all tables (with given names) from the database and creates a Table from them.
+     * @param tableNames
      */
     async loadTables(tableNames) {
         if (tableNames && tableNames.length === 0) {
@@ -1478,7 +1621,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     const columnNames = anotherPrimaryConstraints.map((constraint) => constraint["COLUMN_NAME"]);
                     columnNames.push(dbColumn["COLUMN_NAME"]);
                     // build default primary key constraint name
-                    const pkName = this.connection.namingStrategy.primaryKeyName(table, columnNames);
+                    const pkName = this.dataSource.namingStrategy.primaryKeyName(table, columnNames);
                     // if primary key has user-defined constraint name, write it in table column
                     if (primaryConstraint["CONSTRAINT_NAME"] !==
                         pkName) {
@@ -1611,6 +1754,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds and returns SQL for create table.
+     * @param table
+     * @param createForeignKeys
      */
     createTableSql(table, createForeignKeys) {
         const columnDefinitions = table.columns
@@ -1624,7 +1769,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 unique.columnNames[0] === column.name);
             if (!isUniqueExist)
                 table.uniques.push(new TableUnique_1.TableUnique({
-                    name: this.connection.namingStrategy.uniqueConstraintName(table, [column.name]),
+                    name: this.dataSource.namingStrategy.uniqueConstraintName(table, [column.name]),
                     columnNames: [column.name],
                 }));
         });
@@ -1633,7 +1778,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .map((unique) => {
                 const uniqueName = unique.name
                     ? unique.name
-                    : this.connection.namingStrategy.uniqueConstraintName(table, unique.columnNames);
+                    : this.dataSource.namingStrategy.uniqueConstraintName(table, unique.columnNames);
                 const columnNames = unique.columnNames
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
@@ -1647,7 +1792,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .map((check) => {
                 const checkName = check.name
                     ? check.name
-                    : this.connection.namingStrategy.checkConstraintName(table, check.expression);
+                    : this.dataSource.namingStrategy.checkConstraintName(table, check.expression);
                 return `CONSTRAINT "${checkName}" CHECK (${check.expression})`;
             })
                 .join(", ");
@@ -1660,7 +1805,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
                 if (!fk.name)
-                    fk.name = this.connection.namingStrategy.foreignKeyName(table, fk.columnNames, this.getTablePath(fk), fk.referencedColumnNames);
+                    fk.name = this.dataSource.namingStrategy.foreignKeyName(table, fk.columnNames, this.getTablePath(fk), fk.referencedColumnNames);
                 const referencedColumnNames = fk.referencedColumnNames
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
@@ -1678,7 +1823,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (primaryColumns.length > 0) {
             const primaryKeyName = primaryColumns[0].primaryKeyConstraintName
                 ? primaryColumns[0].primaryKeyConstraintName
-                : this.connection.namingStrategy.primaryKeyName(table, primaryColumns.map((column) => column.name));
+                : this.dataSource.namingStrategy.primaryKeyName(table, primaryColumns.map((column) => column.name));
             const columnNames = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
@@ -1689,9 +1834,11 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop table sql.
+     * @param tableOrName
+     * @param ifExists
      */
-    dropTableSql(tableOrName, ifExist) {
-        const query = ifExist
+    dropTableSql(tableOrName, ifExists) {
+        const query = ifExists
             ? `DROP TABLE IF EXISTS ${this.escapePath(tableOrName)}`
             : `DROP TABLE ${this.escapePath(tableOrName)}`;
         return new Query_1.Query(query);
@@ -1702,13 +1849,13 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             return new Query_1.Query(`CREATE ${materializedClause}VIEW ${this.escapePath(view)} AS ${view.expression}`);
         }
         else {
-            return new Query_1.Query(`CREATE ${materializedClause}VIEW ${this.escapePath(view)} AS ${view.expression(this.connection).getQuery()}`);
+            return new Query_1.Query(`CREATE ${materializedClause}VIEW ${this.escapePath(view)} AS ${view.expression(this.dataSource).getQuery()}`);
         }
     }
     insertViewDefinitionSql(view) {
         const expression = typeof view.expression === "string"
             ? view.expression.trim()
-            : view.expression(this.connection).getQuery();
+            : view.expression(this.dataSource).getQuery();
         const type = view.materialized
             ? MetadataTableType_1.MetadataTableType.MATERIALIZED_VIEW
             : MetadataTableType_1.MetadataTableType.VIEW;
@@ -1722,6 +1869,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop view sql.
+     * @param view
      */
     dropViewSql(view) {
         const materializedClause = view.materialized ? "MATERIALIZED " : "";
@@ -1729,6 +1877,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds remove view sql.
+     * @param view
      */
     deleteViewDefinitionSql(view) {
         const type = view.materialized
@@ -1738,6 +1887,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create index sql.
+     * @param table
+     * @param index
      */
     createIndexSql(table, index) {
         const columns = index.columnNames
@@ -1747,6 +1898,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop index sql.
+     * @param indexOrName
      */
     dropIndexSql(indexOrName) {
         const indexName = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName)
@@ -1756,11 +1908,14 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create primary key sql.
+     * @param table
+     * @param columnNames
+     * @param constraintName
      */
     createPrimaryKeySql(table, columnNames, constraintName) {
         const primaryKeyName = constraintName
             ? constraintName
-            : this.connection.namingStrategy.primaryKeyName(table, columnNames);
+            : this.dataSource.namingStrategy.primaryKeyName(table, columnNames);
         const columnNamesString = columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
@@ -1768,6 +1923,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop primary key sql.
+     * @param table
      */
     dropPrimaryKeySql(table) {
         if (!table.primaryColumns.length)
@@ -1776,11 +1932,13 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const constraintName = table.primaryColumns[0].primaryKeyConstraintName;
         const primaryKeyName = constraintName
             ? constraintName
-            : this.connection.namingStrategy.primaryKeyName(table, columnNames);
+            : this.dataSource.namingStrategy.primaryKeyName(table, columnNames);
         return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${primaryKeyName}"`);
     }
     /**
      * Builds create unique constraint sql.
+     * @param table
+     * @param uniqueConstraint
      */
     createUniqueConstraintSql(table, uniqueConstraint) {
         const columnNames = uniqueConstraint.columnNames
@@ -1790,6 +1948,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop unique constraint sql.
+     * @param table
+     * @param uniqueOrName
      */
     dropUniqueConstraintSql(table, uniqueOrName) {
         const uniqueName = InstanceChecker_1.InstanceChecker.isTableUnique(uniqueOrName)
@@ -1799,12 +1959,16 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create check constraint sql.
+     * @param table
+     * @param checkConstraint
      */
     createCheckConstraintSql(table, checkConstraint) {
         return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${checkConstraint.name}" CHECK (${checkConstraint.expression})`);
     }
     /**
      * Builds drop check constraint sql.
+     * @param table
+     * @param checkOrName
      */
     dropCheckConstraintSql(table, checkOrName) {
         const checkName = InstanceChecker_1.InstanceChecker.isTableCheck(checkOrName)
@@ -1814,6 +1978,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create foreign key sql.
+     * @param table
+     * @param foreignKey
      */
     createForeignKeySql(table, foreignKey) {
         const columnNames = foreignKey.columnNames
@@ -1832,6 +1998,8 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop foreign key sql.
+     * @param table
+     * @param foreignKeyOrName
      */
     dropForeignKeySql(table, foreignKeyOrName) {
         const foreignKeyName = InstanceChecker_1.InstanceChecker.isTableForeignKey(foreignKeyOrName)
@@ -1841,9 +2009,10 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds a query for create column.
+     * @param column
      */
     buildCreateColumnSql(column) {
-        let c = `"${column.name}" ` + this.connection.driver.createFullType(column);
+        let c = `"${column.name}" ` + this.dataSource.driver.createFullType(column);
         if (column.charset)
             c += " CHARACTER SET " + column.charset;
         if (column.collation)
@@ -1863,6 +2032,7 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Escapes given table or view path.
+     * @param target
      */
     escapePath(target) {
         // Ignore database when escaping paths
@@ -1874,11 +2044,12 @@ class OracleQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Change table comment.
+     * @param tableOrName
+     * @param comment
      */
     changeTableComment(tableOrName, comment) {
         throw new error_1.TypeORMError(`oracle driver does not support change table comment.`);
     }
 }
 exports.OracleQueryRunner = OracleQueryRunner;
-
-//# sourceMappingURL=OracleQueryRunner.js.map
+//# sourceMappingURL=OracleQueryRunner.js.map