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

package/browser/driver/cockroachdb/CockroachQueryRunner.js

@@ -1,28 +1,31 @@
-import { TypeORMError } from "../../error";
-import { QueryFailedError } from "../../error/QueryFailedError";
-import { QueryRunnerAlreadyReleasedError } from "../../error/QueryRunnerAlreadyReleasedError";
-import { TransactionNotStartedError } from "../../error/TransactionNotStartedError";
-import { BaseQueryRunner } from "../../query-runner/BaseQueryRunner";
-import { QueryResult } from "../../query-runner/QueryResult";
-import { Table } from "../../schema-builder/table/Table";
-import { TableCheck } from "../../schema-builder/table/TableCheck";
-import { TableColumn } from "../../schema-builder/table/TableColumn";
-import { TableExclusion } from "../../schema-builder/table/TableExclusion";
-import { TableForeignKey } from "../../schema-builder/table/TableForeignKey";
-import { TableIndex } from "../../schema-builder/table/TableIndex";
-import { TableUnique } from "../../schema-builder/table/TableUnique";
-import { View } from "../../schema-builder/view/View";
-import { Broadcaster } from "../../subscriber/Broadcaster";
-import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
-import { InstanceChecker } from "../../util/InstanceChecker";
-import { OrmUtils } from "../../util/OrmUtils";
-import { VersionUtils } from "../../util/VersionUtils";
-import { Query } from "../Query";
-import { MetadataTableType } from "../types/MetadataTableType";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CockroachQueryRunner = void 0;
+const error_1 = require("../../error");
+const QueryFailedError_1 = require("../../error/QueryFailedError");
+const QueryRunnerAlreadyReleasedError_1 = require("../../error/QueryRunnerAlreadyReleasedError");
+const TransactionNotStartedError_1 = require("../../error/TransactionNotStartedError");
+const BaseQueryRunner_1 = require("../../query-runner/BaseQueryRunner");
+const QueryResult_1 = require("../../query-runner/QueryResult");
+const Table_1 = require("../../schema-builder/table/Table");
+const TableCheck_1 = require("../../schema-builder/table/TableCheck");
+const TableColumn_1 = require("../../schema-builder/table/TableColumn");
+const TableExclusion_1 = require("../../schema-builder/table/TableExclusion");
+const TableForeignKey_1 = require("../../schema-builder/table/TableForeignKey");
+const TableIndex_1 = require("../../schema-builder/table/TableIndex");
+const TableUnique_1 = require("../../schema-builder/table/TableUnique");
+const View_1 = require("../../schema-builder/view/View");
+const Broadcaster_1 = require("../../subscriber/Broadcaster");
+const BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
+const InstanceChecker_1 = require("../../util/InstanceChecker");
+const OrmUtils_1 = require("../../util/OrmUtils");
+const VersionUtils_1 = require("../../util/VersionUtils");
+const Query_1 = require("../Query");
+const MetadataTableType_1 = require("../types/MetadataTableType");
 /**
  * Runs queries on a single postgres database connection.
  */
-export class CockroachQueryRunner extends BaseQueryRunner {
+class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
@@ -41,9 +44,9 @@ export class CockroachQueryRunner extends BaseQueryRunner {
          */
         this.transactionRetries = 0;
         this.driver = driver;
-        this.connection = driver.connection;
+        this.dataSource = driver.dataSource;
         this.mode = mode;
-        this.broadcaster = new Broadcaster(this);
+        this.broadcaster = new Broadcaster_1.Broadcaster(this);
     }
     // -------------------------------------------------------------------------
     // Public Methods
@@ -93,6 +96,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     /**
      * Release a connection back to the pool, optionally specifying an Error to release with.
      * Per pg-pool documentation this will prevent the pool from re-using the broken connection.
+     * @param err
      */
     async releaseConnection(err) {
         if (this.isReleased) {
@@ -117,6 +121,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Starts transaction.
+     * @param isolationLevel
      */
     async startTransaction(isolationLevel) {
         this.isTransactionActive = true;
@@ -148,7 +153,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
      */
     async commitTransaction() {
         if (!this.isTransactionActive)
-            throw new TransactionNotStartedError();
+            throw new TransactionNotStartedError_1.TransactionNotStartedError();
         await this.broadcaster.broadcast("BeforeTransactionCommit");
         if (this.transactionDepth > 1) {
             await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth - 1}`);
@@ -171,7 +176,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
      */
     async rollbackTransaction() {
         if (!this.isTransactionActive)
-            throw new TransactionNotStartedError();
+            throw new TransactionNotStartedError_1.TransactionNotStartedError();
         await this.broadcaster.broadcast("BeforeTransactionRollback");
         if (this.transactionDepth > 1) {
             await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth - 1}`);
@@ -188,17 +193,20 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Executes a given SQL query.
+     * @param query
+     * @param parameters
+     * @param useStructuredResult
      */
     async query(query, parameters, useStructuredResult = false) {
         if (this.isReleased)
-            throw new QueryRunnerAlreadyReleasedError();
+            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();
+        const broadcasterResult = new BroadcasterResult_1.BroadcasterResult();
         const queryStartTime = Date.now();
         if (this.isTransactionActive && this.storeQueries) {
-            this.queries.push({ query, parameters });
+            this.queries.push({ query, parameters, useStructuredResult });
         }
         try {
             const raw = await new Promise((ok, fail) => {
@@ -210,9 +218,9 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             const queryExecutionTime = queryEndTime - queryStartTime;
             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();
+            const result = new QueryResult_1.QueryResult();
             if (raw.hasOwnProperty("rowCount")) {
                 result.affected = raw.rowCount;
             }
@@ -250,17 +258,17 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                 await new Promise((resolve) => setTimeout(resolve, sleepTime));
                 let result = undefined;
                 for (const q of this.queries) {
-                    this.driver.connection.logger.logQuery(`Retrying transaction for query "${q.query}"`, q.parameters, this);
-                    result = await this.query(q.query, q.parameters);
+                    this.driver.dataSource.logger.logQuery(`Retrying transaction for query "${q.query}"`, q.parameters, this);
+                    result = await this.query(q.query, q.parameters, q.useStructuredResult);
                 }
                 this.transactionRetries = 0;
                 this.storeQueries = true;
                 return result;
             }
             else {
-                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(query, parameters, err);
+                throw new QueryFailedError_1.QueryFailedError(query, parameters, err);
             }
         }
         finally {
@@ -269,14 +277,18 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Returns raw data stream.
+     * @param query
+     * @param parameters
+     * @param onEnd
+     * @param onError
      */
     async stream(query, parameters, onEnd, onError) {
         const QueryStream = this.driver.loadStreamDependency();
         if (this.isReleased) {
-            throw new QueryRunnerAlreadyReleasedError();
+            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);
         const stream = databaseConnection.query(new QueryStream(query, parameters));
         if (onEnd) {
             stream.on("end", onEnd);
@@ -295,15 +307,17 @@ export class CockroachQueryRunner extends 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) {
-        const result = await this.query(`SELECT * FROM "pg_database" WHERE "datname" = '${database}'`);
+        const result = await this.query(`SELECT * FROM "pg_database" WHERE "datname" = $1`, [database]);
         return result.length ? true : false;
     }
     /**
@@ -315,9 +329,10 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Checks if schema with the given name exist.
+     * @param schema
      */
     async hasSchema(schema) {
-        const result = await this.query(`SELECT * FROM "information_schema"."schemata" WHERE "schema_name" = '${schema}'`);
+        const result = await this.query(`SELECT * FROM "information_schema"."schemata" WHERE "schema_name" = $1`, [schema]);
         return result.length ? true : false;
     }
     /**
@@ -329,75 +344,100 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Checks if table with the given name exist in the database.
+     * @param tableOrName
      */
     async hasTable(tableOrName) {
         const parsedTableName = this.driver.parseTableName(tableOrName);
         if (!parsedTableName.schema) {
             parsedTableName.schema = await this.getCurrentSchema();
         }
-        const sql = `SELECT * FROM "information_schema"."tables" WHERE "table_schema" = '${parsedTableName.schema}' AND "table_name" = '${parsedTableName.tableName}'`;
-        const result = await this.query(sql);
+        const sql = `SELECT * FROM "information_schema"."tables" WHERE "table_schema" = $1 AND "table_name" = $2`;
+        const result = await this.query(sql, [
+            parsedTableName.schema,
+            parsedTableName.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 parsedTableName = this.driver.parseTableName(tableOrName);
         if (!parsedTableName.schema) {
             parsedTableName.schema = await this.getCurrentSchema();
         }
-        const sql = `SELECT * FROM "information_schema"."columns" WHERE "table_schema" = '${parsedTableName.schema}' AND "table_name" = '${parsedTableName.tableName}' AND "column_name" = '${columnName}'`;
-        const result = await this.query(sql);
+        const sql = `SELECT * FROM "information_schema"."columns" WHERE "table_schema" = $1 AND "table_name" = $2 AND "column_name" = $3`;
+        const result = await this.query(sql, [
+            parsedTableName.schema,
+            parsedTableName.tableName,
+            columnName,
+        ]);
         return result.length ? true : false;
     }
     /**
      * Creates a new database.
+     * @param database
+     * @param ifNotExists
      */
-    async createDatabase(database, ifNotExist) {
-        const up = `CREATE DATABASE ${ifNotExist ? "IF NOT EXISTS " : ""} "${database}"`;
-        const down = `DROP DATABASE "${database}"`;
-        await this.executeQueries(new Query(up), new Query(down));
+    async createDatabase(database, ifNotExists) {
+        const up = `CREATE DATABASE ${ifNotExists ? "IF NOT EXISTS " : ""} ${this.driver.escape(database)}`;
+        const down = `DROP DATABASE ${this.driver.escape(database)}`;
+        await this.executeQueries(new Query_1.Query(up), new Query_1.Query(down));
     }
     /**
      * Drops database.
+     * @param database
+     * @param ifExists
      */
-    async dropDatabase(database, ifExist) {
-        const up = `DROP DATABASE ${ifExist ? "IF EXISTS " : ""} "${database}"`;
-        const down = `CREATE DATABASE "${database}"`;
-        await this.executeQueries(new Query(up), new Query(down));
+    async dropDatabase(database, ifExists) {
+        const up = `DROP DATABASE ${ifExists ? "IF EXISTS " : ""} ${this.driver.escape(database)}`;
+        const down = `CREATE DATABASE ${this.driver.escape(database)}`;
+        await this.executeQueries(new Query_1.Query(up), new Query_1.Query(down));
     }
     /**
      * Creates a new table schema.
+     * @param schemaPath
+     * @param ifNotExists
      */
-    async createSchema(schemaPath, ifNotExist) {
+    async createSchema(schemaPath, ifNotExists) {
         const schema = schemaPath.indexOf(".") === -1
             ? schemaPath
             : schemaPath.split(".")[1];
-        const up = ifNotExist
-            ? `CREATE SCHEMA IF NOT EXISTS "${schema}"`
-            : `CREATE SCHEMA "${schema}"`;
-        const down = `DROP SCHEMA "${schema}" CASCADE`;
-        await this.executeQueries(new Query(up), new Query(down));
+        const escapedSchema = this.driver.escape(schema);
+        const up = ifNotExists
+            ? `CREATE SCHEMA IF NOT EXISTS ${escapedSchema}`
+            : `CREATE SCHEMA ${escapedSchema}`;
+        const down = `DROP SCHEMA ${escapedSchema} CASCADE`;
+        await this.executeQueries(new Query_1.Query(up), new Query_1.Query(down));
     }
     /**
      * Drops table schema.
+     * @param schemaPath
+     * @param ifExists
+     * @param isCascade
      */
-    async dropSchema(schemaPath, ifExist, isCascade) {
+    async dropSchema(schemaPath, ifExists, isCascade) {
         const schema = schemaPath.indexOf(".") === -1
             ? schemaPath
             : schemaPath.split(".")[1];
-        const up = ifExist
-            ? `DROP SCHEMA IF EXISTS "${schema}" ${isCascade ? "CASCADE" : ""}`
-            : `DROP SCHEMA "${schema}" ${isCascade ? "CASCADE" : ""}`;
-        const down = `CREATE SCHEMA "${schema}"`;
-        await this.executeQueries(new Query(up), new Query(down));
+        const escapedSchema = this.driver.escape(schema);
+        const up = ifExists
+            ? `DROP SCHEMA IF EXISTS ${escapedSchema} ${isCascade ? "CASCADE" : ""}`
+            : `DROP SCHEMA ${escapedSchema} ${isCascade ? "CASCADE" : ""}`;
+        const down = `CREATE SCHEMA ${escapedSchema}`;
+        await this.executeQueries(new Query_1.Query(up), new Query_1.Query(down));
     }
     /**
      * 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();
@@ -422,8 +462,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             .filter((column) => column.isGenerated &&
             column.generationStrategy === "increment")
             .forEach((column) => {
-            upQueries.push(new Query(`CREATE SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
-            downQueries.push(new Query(`DROP SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
+            upQueries.push(new Query_1.Query(`CREATE SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
+            downQueries.push(new Query_1.Query(`DROP SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
         });
         upQueries.push(this.createTableSql(table, createForeignKeys));
         downQueries.push(this.dropTableSql(table));
@@ -437,7 +477,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                 .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(table, index));
             });
@@ -453,14 +493,14 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             const insertQuery = this.insertTypeormMetadataSql({
                 schema: schema,
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
                 value: column.asExpression,
             });
             const deleteQuery = this.deleteTypeormMetadataSql({
                 schema: schema,
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
             upQueries.push(insertQuery);
@@ -470,11 +510,15 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops the table.
+     * @param target
+     * @param ifExists
+     * @param dropForeignKeys
+     * @param dropIndices
      */
-    async dropTable(target, ifExist, dropForeignKeys = true, dropIndices = true) {
+    async dropTable(target, 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(target);
             if (!isTableExist)
                 return Promise.resolve();
@@ -500,8 +544,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             .filter((column) => column.isGenerated &&
             column.generationStrategy === "increment")
             .forEach((column) => {
-            upQueries.push(new Query(`DROP SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
-            downQueries.push(new Query(`CREATE SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
+            upQueries.push(new Query_1.Query(`DROP SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
+            downQueries.push(new Query_1.Query(`CREATE SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
         });
         // if table had columns with generated type, we must remove the expression from the metadata table
         const generatedColumns = table.columns.filter((column) => column.generatedType && column.asExpression);
@@ -514,13 +558,13 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             const deleteQuery = this.deleteTypeormMetadataSql({
                 schema: schema,
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
             const insertQuery = this.insertTypeormMetadataSql({
                 schema: schema,
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
                 value: column.asExpression,
             });
@@ -531,6 +575,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates a new view.
+     * @param view
+     * @param syncWithMetadata
      */
     async createView(view, syncWithMetadata = false) {
         const upQueries = [];
@@ -545,25 +591,31 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops the view.
+     * @param target
+     * @param ifExists
      */
-    async dropView(target) {
-        const viewName = InstanceChecker.isView(target) ? target.name : target;
+    async dropView(target, ifExists) {
+        const viewName = InstanceChecker_1.InstanceChecker.isView(target) ? target.name : target;
         const view = await this.getCachedView(viewName);
-        const upQueries = [];
-        const downQueries = [];
-        upQueries.push(await this.deleteViewDefinitionSql(view));
-        upQueries.push(this.dropViewSql(view));
-        downQueries.push(await this.insertViewDefinitionSql(view));
-        downQueries.push(this.createViewSql(view));
-        await this.executeQueries(upQueries, downQueries);
+        await this.executeQueries([
+            await this.deleteViewDefinitionSql(view),
+            ifExists
+                ? new Query_1.Query(`DROP VIEW IF EXISTS ${this.escapePath(view)}`)
+                : this.dropViewSql(view),
+        ], [
+            await this.insertViewDefinitionSql(view),
+            this.createViewSql(view),
+        ]);
     }
     /**
      * Renames the given table.
+     * @param oldTableOrName
+     * @param newTableName
      */
     async renameTable(oldTableOrName, newTableName) {
         const upQueries = [];
         const downQueries = [];
-        const oldTable = InstanceChecker.isTable(oldTableOrName)
+        const oldTable = InstanceChecker_1.InstanceChecker.isTable(oldTableOrName)
             ? oldTableOrName
             : await this.getCachedTable(oldTableOrName);
         const newTable = oldTable.clone();
@@ -571,40 +623,40 @@ export class CockroachQueryRunner extends BaseQueryRunner {
         newTable.name = schemaName
             ? `${schemaName}.${newTableName}`
             : newTableName;
-        upQueries.push(new Query(`ALTER TABLE ${this.escapePath(oldTable)} RENAME TO "${newTableName}"`));
-        downQueries.push(new Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME TO "${oldTableName}"`));
+        upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(oldTable)} RENAME TO "${newTableName}"`));
+        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME TO "${oldTableName}"`));
         // rename column primary key constraint
         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);
-            upQueries.push(new Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${oldPkName}" TO "${newPkName}"`));
-            downQueries.push(new Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${newPkName}" TO "${oldPkName}"`));
+            const oldPkName = this.dataSource.namingStrategy.primaryKeyName(oldTable, columnNames);
+            const newPkName = this.dataSource.namingStrategy.primaryKeyName(newTable, columnNames);
+            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(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${unique.name}" TO "${newUniqueName}"`));
-            downQueries.push(new Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${newUniqueName}" TO "${unique.name}"`));
+            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}"`));
             // replace constraint name
             unique.name = newUniqueName;
         });
         // 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 { schema } = this.driver.parseTableName(newTable);
-            const newIndexName = this.connection.namingStrategy.indexName(newTable, index.columnNames, index.where);
+            const newIndexName = this.dataSource.namingStrategy.indexName(newTable, index.columnNames, index.where);
             // build queries
             const up = schema
                 ? `ALTER INDEX "${schema}"."${index.name}" RENAME TO "${newIndexName}"`
@@ -612,22 +664,22 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             const down = schema
                 ? `ALTER INDEX "${schema}"."${newIndexName}" RENAME TO "${index.name}"`
                 : `ALTER INDEX "${newIndexName}" RENAME TO "${index.name}"`;
-            upQueries.push(new Query(up));
-            downQueries.push(new Query(down));
+            upQueries.push(new Query_1.Query(up));
+            downQueries.push(new Query_1.Query(down));
             // replace constraint name
             index.name = newIndexName;
         });
         // 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(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${foreignKey.name}" TO "${newForeignKeyName}"`));
-            downQueries.push(new Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${newForeignKeyName}" TO "${foreignKey.name}"`));
+            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}"`));
             // replace constraint name
             foreignKey.name = newForeignKeyName;
         });
@@ -638,23 +690,25 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             if (column.enumName)
                 continue;
             const oldEnumType = await this.getUserDefinedTypeName(oldTable, column);
-            upQueries.push(new Query(`ALTER TYPE "${oldEnumType.schema}"."${oldEnumType.name}" RENAME TO ${this.buildEnumName(newTable, column, false)}`));
-            downQueries.push(new Query(`ALTER TYPE ${this.buildEnumName(newTable, column)} RENAME TO "${oldEnumType.name}"`));
+            upQueries.push(new Query_1.Query(`ALTER TYPE "${oldEnumType.schema}"."${oldEnumType.name}" RENAME TO ${this.buildEnumName(newTable, column, false)}`));
+            downQueries.push(new Query_1.Query(`ALTER TYPE ${this.buildEnumName(newTable, column)} RENAME TO "${oldEnumType.name}"`));
         }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
      * Creates a new column from the column in the table.
+     * @param tableOrName
+     * @param column
      */
     async addColumn(tableOrName, column) {
-        const table = InstanceChecker.isTable(tableOrName)
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const clonedTable = table.clone();
         const upQueries = [];
         const downQueries = [];
         if (column.generationStrategy === "increment") {
-            throw new TypeORMError(`Adding sequential generated columns into existing table is not supported`);
+            throw new error_1.TypeORMError(`Adding sequential generated columns into existing table is not supported`);
         }
         if (column.type === "enum" || column.type === "simple-enum") {
             const hasEnum = await this.hasEnumType(table, column);
@@ -663,8 +717,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                 downQueries.push(this.dropEnumTypeSql(table, column));
             }
         }
-        upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(table, column)}`));
-        downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN "${column.name}"`));
+        upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(table, column)}`));
+        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN "${column.name}"`));
         // create or update primary key constraint
         if (column.isPrimary) {
             const primaryColumns = clonedTable.primaryColumns;
@@ -673,22 +727,22 @@ export class CockroachQueryRunner extends 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(", ");
-                upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
-                downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
+                upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
+                downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
             }
             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(", ");
-            upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
-            downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
+            upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
+            downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
         }
         if (column.generatedType && column.asExpression) {
             const currentSchema = await this.getCurrentSchema();
@@ -699,14 +753,14 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             const insertQuery = this.insertTypeormMetadataSql({
                 schema: schema,
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
                 value: column.asExpression,
             });
             const deleteQuery = this.deleteTypeormMetadataSql({
                 schema: schema,
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
             upQueries.push(insertQuery);
@@ -718,8 +772,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
         if (columnIndex) {
             // CockroachDB stores unique indices as UNIQUE constraints
             if (columnIndex.isUnique) {
-                const unique = new TableUnique({
-                    name: this.connection.namingStrategy.uniqueConstraintName(table, columnIndex.columnNames),
+                const unique = new TableUnique_1.TableUnique({
+                    name: this.dataSource.namingStrategy.uniqueConstraintName(table, columnIndex.columnNames),
                     columnNames: columnIndex.columnNames,
                 });
                 upQueries.push(this.createUniqueConstraintSql(table, unique));
@@ -733,8 +787,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
         }
         // create unique constraint
         if (column.isUnique) {
-            const uniqueConstraint = new TableUnique({
-                name: this.connection.namingStrategy.uniqueConstraintName(table, [column.name]),
+            const uniqueConstraint = new TableUnique_1.TableUnique({
+                name: this.dataSource.namingStrategy.uniqueConstraintName(table, [column.name]),
                 columnNames: [column.name],
             });
             clonedTable.uniques.push(uniqueConstraint);
@@ -743,8 +797,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
         }
         // create column's comment
         if (column.comment) {
-            upQueries.push(new Query(`COMMENT ON COLUMN ${this.escapePath(table)}."${column.name}" IS ${this.escapeComment(column.comment)}`));
-            downQueries.push(new Query(`COMMENT ON COLUMN ${this.escapePath(table)}."${column.name}" IS ${this.escapeComment(column.comment)}`));
+            upQueries.push(new Query_1.Query(`COMMENT ON COLUMN ${this.escapePath(table)}."${column.name}" IS ${this.escapeComment(column.comment)}`));
+            downQueries.push(new Query_1.Query(`COMMENT ON COLUMN ${this.escapePath(table)}."${column.name}" IS ${this.escapeComment(column.comment)}`));
         }
         await this.executeQueries(upQueries, downQueries);
         clonedTable.addColumn(column);
@@ -752,6 +806,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates a new columns from the column in the table.
+     * @param tableOrName
+     * @param columns
      */
     async addColumns(tableOrName, columns) {
         for (const column of columns) {
@@ -760,18 +816,21 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Renames column in the given table.
+     * @param tableOrName
+     * @param oldTableColumnOrName
+     * @param newTableColumnOrName
      */
     async renameColumn(tableOrName, oldTableColumnOrName, newTableColumnOrName) {
-        const table = InstanceChecker.isTable(tableOrName)
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const oldColumn = InstanceChecker.isTableColumn(oldTableColumnOrName)
+        const oldColumn = InstanceChecker_1.InstanceChecker.isTableColumn(oldTableColumnOrName)
             ? oldTableColumnOrName
             : table.columns.find((c) => c.name === oldTableColumnOrName);
         if (!oldColumn)
-            throw new TypeORMError(`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`);
+            throw new error_1.TypeORMError(`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`);
         let newColumn;
-        if (InstanceChecker.isTableColumn(newTableColumnOrName)) {
+        if (InstanceChecker_1.InstanceChecker.isTableColumn(newTableColumnOrName)) {
             newColumn = newTableColumnOrName;
         }
         else {
@@ -782,20 +841,23 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param oldTableColumnOrName
+     * @param newColumn
      */
     async changeColumn(tableOrName, oldTableColumnOrName, newColumn) {
-        const table = InstanceChecker.isTable(tableOrName)
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         let clonedTable = table.clone();
         const upQueries = [];
         const downQueries = [];
         let defaultValueChanged = false;
-        const oldColumn = InstanceChecker.isTableColumn(oldTableColumnOrName)
+        const oldColumn = InstanceChecker_1.InstanceChecker.isTableColumn(oldTableColumnOrName)
             ? oldTableColumnOrName
             : table.columns.find((column) => column.name === oldTableColumnOrName);
         if (!oldColumn)
-            throw new TypeORMError(`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`);
+            throw new error_1.TypeORMError(`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`);
         if (oldColumn.type !== newColumn.type ||
             oldColumn.length !== newColumn.length ||
             newColumn.isArray !== oldColumn.isArray ||
@@ -810,14 +872,14 @@ export class CockroachQueryRunner extends BaseQueryRunner {
         else {
             if (oldColumn.name !== newColumn.name) {
                 // rename column
-                upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} RENAME COLUMN "${oldColumn.name}" TO "${newColumn.name}"`));
-                downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} RENAME COLUMN "${newColumn.name}" TO "${oldColumn.name}"`));
+                upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME COLUMN "${oldColumn.name}" TO "${newColumn.name}"`));
+                downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME COLUMN "${newColumn.name}" TO "${oldColumn.name}"`));
                 // rename ENUM type
                 if (oldColumn.type === "enum" ||
                     oldColumn.type === "simple-enum") {
                     const oldEnumType = await this.getUserDefinedTypeName(table, oldColumn);
-                    upQueries.push(new Query(`ALTER TYPE "${oldEnumType.schema}"."${oldEnumType.name}" RENAME TO ${this.buildEnumName(table, newColumn, false)}`));
-                    downQueries.push(new Query(`ALTER TYPE ${this.buildEnumName(table, newColumn)} RENAME TO "${oldEnumType.name}"`));
+                    upQueries.push(new Query_1.Query(`ALTER TYPE "${oldEnumType.schema}"."${oldEnumType.name}" RENAME TO ${this.buildEnumName(table, newColumn, false)}`));
+                    downQueries.push(new Query_1.Query(`ALTER TYPE ${this.buildEnumName(table, newColumn)} RENAME TO "${oldEnumType.name}"`));
                 }
                 // rename column primary key constraint
                 if (oldColumn.isPrimary === true &&
@@ -825,34 +887,34 @@ export class CockroachQueryRunner extends 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);
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${oldPkName}" TO "${newPkName}"`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${newPkName}" TO "${oldPkName}"`));
+                    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(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${unique.name}" TO "${newUniqueName}"`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${newUniqueName}" TO "${unique.name}"`));
+                    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}"`));
                     // replace constraint name
                     unique.name = newUniqueName;
                 });
                 // 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;
@@ -860,7 +922,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                     index.columnNames.splice(index.columnNames.indexOf(oldColumn.name), 1);
                     index.columnNames.push(newColumn.name);
                     const { schema } = this.driver.parseTableName(table);
-                    const newIndexName = this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
+                    const newIndexName = this.dataSource.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
                     // build queries
                     const up = schema
                         ? `ALTER INDEX "${schema}"."${index.name}" RENAME TO "${newIndexName}"`
@@ -868,8 +930,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                     const down = schema
                         ? `ALTER INDEX "${schema}"."${newIndexName}" RENAME TO "${index.name}"`
                         : `ALTER INDEX "${newIndexName}" RENAME TO "${index.name}"`;
-                    upQueries.push(new Query(up));
-                    downQueries.push(new Query(down));
+                    upQueries.push(new Query_1.Query(up));
+                    downQueries.push(new Query_1.Query(down));
                     // replace constraint name
                     index.name = newIndexName;
                 });
@@ -877,17 +939,17 @@ export class CockroachQueryRunner extends 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(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${foreignKey.name}" TO "${newForeignKeyName}"`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${newForeignKeyName}" TO "${foreignKey.name}"`));
+                    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}"`));
                     // replace constraint name
                     foreignKey.name = newForeignKeyName;
                 });
@@ -898,22 +960,22 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             }
             if (newColumn.precision !== oldColumn.precision ||
                 newColumn.scale !== oldColumn.scale) {
-                upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(newColumn)}`));
-                downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(oldColumn)}`));
+                upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(newColumn)}`));
+                downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(oldColumn)}`));
             }
             if (oldColumn.isNullable !== newColumn.isNullable) {
                 if (newColumn.isNullable) {
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" DROP NOT NULL`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" SET NOT NULL`));
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" DROP NOT NULL`));
+                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" SET NOT NULL`));
                 }
                 else {
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" SET NOT NULL`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" DROP NOT NULL`));
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" SET NOT NULL`));
+                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" DROP NOT NULL`));
                 }
             }
             if (oldColumn.comment !== newColumn.comment) {
-                upQueries.push(new Query(`COMMENT ON COLUMN ${this.escapePath(table)}."${oldColumn.name}" IS ${this.escapeComment(newColumn.comment)}`));
-                downQueries.push(new Query(`COMMENT ON COLUMN ${this.escapePath(table)}."${newColumn.name}" IS ${this.escapeComment(oldColumn.comment)}`));
+                upQueries.push(new Query_1.Query(`COMMENT ON COLUMN ${this.escapePath(table)}."${oldColumn.name}" IS ${this.escapeComment(newColumn.comment)}`));
+                downQueries.push(new Query_1.Query(`COMMENT ON COLUMN ${this.escapePath(table)}."${newColumn.name}" IS ${this.escapeComment(oldColumn.comment)}`));
             }
             if (newColumn.isPrimary !== oldColumn.isPrimary) {
                 const primaryColumns = clonedTable.primaryColumns;
@@ -921,12 +983,12 @@ export class CockroachQueryRunner extends 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(", ");
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
+                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
                 }
                 if (newColumn.isPrimary === true) {
                     primaryColumns.push(newColumn);
@@ -935,12 +997,12 @@ export class CockroachQueryRunner extends 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(", ");
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
+                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
                 }
                 else {
                     const primaryColumn = primaryColumns.find((c) => c.name === newColumn.name);
@@ -953,19 +1015,19 @@ export class CockroachQueryRunner extends 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(", ");
-                        upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
-                        downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
+                        upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
+                        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
                     }
                 }
             }
             if (newColumn.isUnique !== oldColumn.isUnique) {
                 if (newColumn.isUnique) {
-                    const uniqueConstraint = new TableUnique({
-                        name: this.connection.namingStrategy.uniqueConstraintName(table, [newColumn.name]),
+                    const uniqueConstraint = new TableUnique_1.TableUnique({
+                        name: this.dataSource.namingStrategy.uniqueConstraintName(table, [newColumn.name]),
                         columnNames: [newColumn.name],
                     });
                     clonedTable.uniques.push(uniqueConstraint);
@@ -990,7 +1052,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                 newColumn.type === "simple-enum") &&
                 (oldColumn.type === "enum" ||
                     oldColumn.type === "simple-enum") &&
-                (!OrmUtils.isArraysEqual(newColumn.enum, oldColumn.enum) ||
+                (!OrmUtils_1.OrmUtils.isArraysEqual(newColumn.enum, oldColumn.enum) ||
                     newColumn.enumName !== oldColumn.enumName)) {
                 const arraySuffix = newColumn.isArray ? "[]" : "";
                 // "public"."new_enum"
@@ -1004,8 +1066,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                 //"old_enum_old"
                 const oldEnumNameWithoutSchema_old = this.buildEnumName(table, oldColumn, false, false, true);
                 // rename old ENUM
-                upQueries.push(new Query(`ALTER TYPE ${oldEnumName} RENAME TO ${oldEnumNameWithoutSchema_old}`));
-                downQueries.push(new Query(`ALTER TYPE ${oldEnumNameWithSchema_old} RENAME TO ${oldEnumNameWithoutSchema}`));
+                upQueries.push(new Query_1.Query(`ALTER TYPE ${oldEnumName} RENAME TO ${oldEnumNameWithoutSchema_old}`));
+                downQueries.push(new Query_1.Query(`ALTER TYPE ${oldEnumNameWithSchema_old} RENAME TO ${oldEnumNameWithoutSchema}`));
                 // create new ENUM
                 upQueries.push(this.createEnumTypeSql(table, newColumn, newEnumName));
                 downQueries.push(this.dropEnumTypeSql(table, newColumn, newEnumName));
@@ -1014,24 +1076,24 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                     oldColumn.default !== undefined) {
                     // mark default as changed to prevent double update
                     defaultValueChanged = true;
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" DROP DEFAULT`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" SET DEFAULT ${oldColumn.default}`));
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" DROP DEFAULT`));
+                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${oldColumn.name}" SET DEFAULT ${oldColumn.default}`));
                 }
                 // build column types
                 const upType = `${newEnumName}${arraySuffix} USING "${newColumn.name}"::"text"::${newEnumName}${arraySuffix}`;
                 const downType = `${oldEnumNameWithSchema_old}${arraySuffix} USING "${newColumn.name}"::"text"::${oldEnumNameWithSchema_old}${arraySuffix}`;
-                upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${upType}`));
+                upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${upType}`));
                 // we add a delay here since for some reason cockroachdb fails with
                 // "cannot drop type because other objects still depend on it" error
                 // if we are trying to drop type right after we altered it.
-                upQueries.push(new Query(`SELECT pg_sleep(0.1)`));
-                downQueries.push(new Query(`SELECT pg_sleep(0.1)`));
-                downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${downType}`));
+                upQueries.push(new Query_1.Query(`SELECT pg_sleep(0.1)`));
+                downQueries.push(new Query_1.Query(`SELECT pg_sleep(0.1)`));
+                downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${downType}`));
                 // restore column default or create new one
                 if (newColumn.default !== null &&
                     newColumn.default !== undefined) {
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT ${newColumn.default}`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" DROP DEFAULT`));
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT ${newColumn.default}`));
+                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" DROP DEFAULT`));
                 }
                 // remove old ENUM
                 upQueries.push(this.dropEnumTypeSql(table, oldColumn, oldEnumNameWithSchema_old));
@@ -1041,49 +1103,51 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                 newColumn.generationStrategy !== "uuid") {
                 if (newColumn.isGenerated) {
                     if (newColumn.generationStrategy === "increment") {
-                        throw new TypeORMError(`Adding sequential generated columns into existing table is not supported`);
+                        throw new error_1.TypeORMError(`Adding sequential generated columns into existing table is not supported`);
                     }
                     else if (newColumn.generationStrategy === "rowid") {
-                        upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT unique_rowid()`));
-                        downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" DROP DEFAULT`));
+                        upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT unique_rowid()`));
+                        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" DROP DEFAULT`));
                     }
                 }
                 else {
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" DROP DEFAULT`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT unique_rowid()`));
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" DROP DEFAULT`));
+                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT unique_rowid()`));
                 }
             }
             if (newColumn.default !== oldColumn.default &&
                 !defaultValueChanged) {
                 if (newColumn.default !== null &&
                     newColumn.default !== undefined) {
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT ${newColumn.default}`));
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT ${newColumn.default}`));
                     if (oldColumn.default !== null &&
                         oldColumn.default !== undefined) {
-                        downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT ${oldColumn.default}`));
+                        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT ${oldColumn.default}`));
                     }
                     else {
-                        downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" DROP DEFAULT`));
+                        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" DROP DEFAULT`));
                     }
                 }
                 else if (oldColumn.default !== null &&
                     oldColumn.default !== undefined) {
-                    upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" DROP DEFAULT`));
-                    downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT ${oldColumn.default}`));
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" DROP DEFAULT`));
+                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" SET DEFAULT ${oldColumn.default}`));
                 }
             }
         }
         if ((newColumn.spatialFeatureType || "").toLowerCase() !==
             (oldColumn.spatialFeatureType || "").toLowerCase() ||
             newColumn.srid !== oldColumn.srid) {
-            upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(newColumn)}`));
-            downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(oldColumn)}`));
+            upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(newColumn)}`));
+            downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${this.driver.createFullType(oldColumn)}`));
         }
         await this.executeQueries(upQueries, downQueries);
         this.replaceCachedTable(table, clonedTable);
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param changedColumns
      */
     async changeColumns(tableOrName, changedColumns) {
         for (const { oldColumn, newColumn } of changedColumns) {
@@ -1092,16 +1156,22 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops column in the table.
+     * @param tableOrName
+     * @param columnOrName
+     * @param ifExists
      */
-    async dropColumn(tableOrName, columnOrName) {
-        const table = InstanceChecker.isTable(tableOrName)
+    async dropColumn(tableOrName, columnOrName, ifExists) {
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const column = InstanceChecker.isTableColumn(columnOrName)
+        const column = InstanceChecker_1.InstanceChecker.isTableColumn(columnOrName)
             ? columnOrName
             : table.findColumnByName(columnOrName);
-        if (!column)
-            throw new TypeORMError(`Column "${columnOrName}" was not found in table "${table.name}"`);
+        if (!column) {
+            if (ifExists)
+                return;
+            throw new error_1.TypeORMError(`Column "${columnOrName}" was not found in table "${table.name}"`);
+        }
         const clonedTable = table.clone();
         const upQueries = [];
         const downQueries = [];
@@ -1110,12 +1180,12 @@ export class CockroachQueryRunner extends 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(", ");
-            upQueries.push(new Query(`ALTER TABLE ${this.escapePath(clonedTable)} DROP CONSTRAINT "${pkName}"`));
-            downQueries.push(new Query(`ALTER TABLE ${this.escapePath(clonedTable)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
+            upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(clonedTable)} DROP CONSTRAINT "${pkName}"`));
+            downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(clonedTable)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
             // update column in table
             const tableColumn = clonedTable.findColumnByName(column.name);
             tableColumn.isPrimary = false;
@@ -1124,12 +1194,12 @@ export class CockroachQueryRunner extends 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(", ");
-                upQueries.push(new Query(`ALTER TABLE ${this.escapePath(clonedTable)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
-                downQueries.push(new Query(`ALTER TABLE ${this.escapePath(clonedTable)} DROP CONSTRAINT "${pkName}"`));
+                upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(clonedTable)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNames})`));
+                downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(clonedTable)} DROP CONSTRAINT "${pkName}"`));
             }
         }
         // drop column index
@@ -1157,11 +1227,11 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             upQueries.push(this.dropIndexSql(table, columnUnique.name)); // CockroachDB creates indices for unique constraints
             downQueries.push(this.createUniqueConstraintSql(table, columnUnique));
         }
-        upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN "${column.name}"`));
-        downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(table, column)}`));
+        upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN ${ifExists ? "IF EXISTS " : ""}"${column.name}"`));
+        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(table, column)}`));
         if (column.generationStrategy === "increment") {
-            upQueries.push(new Query(`DROP SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
-            downQueries.push(new Query(`CREATE SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
+            upQueries.push(new Query_1.Query(`DROP SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
+            downQueries.push(new Query_1.Query(`CREATE SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
         }
         if (column.generatedType && column.asExpression) {
             const currentSchema = await this.getCurrentSchema();
@@ -1172,13 +1242,13 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             const deleteQuery = this.deleteTypeormMetadataSql({
                 schema: schema,
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
             });
             const insertQuery = this.insertTypeormMetadataSql({
                 schema: schema,
                 table: table.name,
-                type: MetadataTableType.GENERATED_COLUMN,
+                type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                 name: column.name,
                 value: column.asExpression,
             });
@@ -1201,17 +1271,23 @@ export class CockroachQueryRunner extends 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.isTable(tableOrName)
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const clonedTable = table.clone();
@@ -1227,9 +1303,11 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Updates composite primary keys.
+     * @param tableOrName
+     * @param columns
      */
     async updatePrimaryKeys(tableOrName, columns) {
-        const table = InstanceChecker.isTable(tableOrName)
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const clonedTable = table.clone();
@@ -1241,36 +1319,41 @@ export class CockroachQueryRunner extends 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(", ");
-            upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
-            downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNamesString})`));
+            upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
+            downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNamesString})`));
         }
         // 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(", ");
-        upQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNamesString})`));
-        downQueries.push(new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
+        upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${pkName}" PRIMARY KEY (${columnNamesString})`));
+        downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${pkName}"`));
         await this.executeQueries(upQueries, downQueries);
         this.replaceCachedTable(table, clonedTable);
     }
     /**
      * Drops a primary key.
+     * @param tableOrName
+     * @param constraintName
+     * @param ifExists
      */
-    async dropPrimaryKey(tableOrName, constraintName) {
-        const table = InstanceChecker.isTable(tableOrName)
+    async dropPrimaryKey(tableOrName, constraintName, ifExists) {
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const up = this.dropPrimaryKeySql(table);
+        const up = this.dropPrimaryKeySql(table, ifExists);
         const down = this.createPrimaryKeySql(table, table.primaryColumns.map((column) => column.name), constraintName);
         await this.executeQueries(up, down);
         table.primaryColumns.forEach((column) => {
@@ -1279,15 +1362,17 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates new unique constraint.
+     * @param tableOrName
+     * @param uniqueConstraint
      */
     async createUniqueConstraint(tableOrName, uniqueConstraint) {
-        const table = InstanceChecker.isTable(tableOrName)
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         // 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);
         // CockroachDB creates index for UNIQUE constraint.
         // We must use DROP INDEX ... CASCADE instead of DROP CONSTRAINT.
@@ -1297,6 +1382,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates new unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
      */
     async createUniqueConstraints(tableOrName, uniqueConstraints) {
         for (const uniqueConstraint of uniqueConstraints) {
@@ -1305,42 +1392,53 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops unique constraint.
+     * @param tableOrName
+     * @param uniqueOrName
+     * @param ifExists
      */
-    async dropUniqueConstraint(tableOrName, uniqueOrName) {
-        const table = InstanceChecker.isTable(tableOrName)
+    async dropUniqueConstraint(tableOrName, uniqueOrName, ifExists) {
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const uniqueConstraint = InstanceChecker.isTableUnique(uniqueOrName)
+        const uniqueConstraint = InstanceChecker_1.InstanceChecker.isTableUnique(uniqueOrName)
             ? uniqueOrName
             : table.uniques.find((u) => u.name === uniqueOrName);
-        if (!uniqueConstraint)
-            throw new TypeORMError(`Supplied unique constraint was not found in table ${table.name}`);
+        if (!uniqueConstraint) {
+            if (ifExists)
+                return;
+            throw new error_1.TypeORMError(`Supplied unique constraint was not found in table ${table.name}`);
+        }
         // CockroachDB creates index for UNIQUE constraint.
         // We must use DROP INDEX ... CASCADE instead of DROP CONSTRAINT.
-        const up = this.dropIndexSql(table, uniqueConstraint);
+        const up = this.dropIndexSql(table, uniqueConstraint, ifExists);
         const down = this.createUniqueConstraintSql(table, uniqueConstraint);
         await this.executeQueries(up, down);
         table.removeUniqueConstraint(uniqueConstraint);
     }
     /**
      * Drops unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
+     * @param ifExists
      */
-    async dropUniqueConstraints(tableOrName, uniqueConstraints) {
+    async dropUniqueConstraints(tableOrName, uniqueConstraints, ifExists) {
         for (const uniqueConstraint of [...uniqueConstraints]) {
-            await this.dropUniqueConstraint(tableOrName, uniqueConstraint);
+            await this.dropUniqueConstraint(tableOrName, uniqueConstraint, ifExists);
         }
     }
     /**
      * Creates new check constraint.
+     * @param tableOrName
+     * @param checkConstraint
      */
     async createCheckConstraint(tableOrName, checkConstraint) {
-        const table = InstanceChecker.isTable(tableOrName)
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         // 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);
@@ -1348,6 +1446,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates new check constraints.
+     * @param tableOrName
+     * @param checkConstraints
      */
     async createCheckConstraints(tableOrName, checkConstraints) {
         const promises = checkConstraints.map((checkConstraint) => this.createCheckConstraint(tableOrName, checkConstraint));
@@ -1355,62 +1455,83 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops check constraint.
+     * @param tableOrName
+     * @param checkOrName
+     * @param ifExists
      */
-    async dropCheckConstraint(tableOrName, checkOrName) {
-        const table = InstanceChecker.isTable(tableOrName)
+    async dropCheckConstraint(tableOrName, checkOrName, ifExists) {
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const checkConstraint = InstanceChecker.isTableCheck(checkOrName)
+        const checkConstraint = InstanceChecker_1.InstanceChecker.isTableCheck(checkOrName)
             ? checkOrName
             : table.checks.find((c) => c.name === checkOrName);
-        if (!checkConstraint)
-            throw new TypeORMError(`Supplied check constraint was not found in table ${table.name}`);
-        const up = this.dropCheckConstraintSql(table, 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, ifExists);
         const down = this.createCheckConstraintSql(table, checkConstraint);
         await this.executeQueries(up, down);
         table.removeCheckConstraint(checkConstraint);
     }
     /**
      * 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 new exclusion constraint.
+     * @param tableOrName
+     * @param exclusionConstraint
      */
     async createExclusionConstraint(tableOrName, exclusionConstraint) {
-        throw new TypeORMError(`CockroachDB does not support exclusion constraints.`);
+        throw new error_1.TypeORMError(`CockroachDB does not support exclusion constraints.`);
     }
     /**
      * Creates new exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
      */
     async createExclusionConstraints(tableOrName, exclusionConstraints) {
-        throw new TypeORMError(`CockroachDB does not support exclusion constraints.`);
+        throw new error_1.TypeORMError(`CockroachDB does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraint.
+     * @param tableOrName
+     * @param exclusionOrName
+     * @param ifExists
      */
-    async dropExclusionConstraint(tableOrName, exclusionOrName) {
-        throw new TypeORMError(`CockroachDB does not support exclusion constraints.`);
+    async dropExclusionConstraint(tableOrName, exclusionOrName, ifExists) {
+        throw new error_1.TypeORMError(`CockroachDB does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
+     * @param ifExists
      */
-    async dropExclusionConstraints(tableOrName, exclusionConstraints) {
-        throw new TypeORMError(`CockroachDB does not support exclusion constraints.`);
+    async dropExclusionConstraints(tableOrName, exclusionConstraints, ifExists) {
+        throw new error_1.TypeORMError(`CockroachDB does not support exclusion constraints.`);
     }
     /**
      * Creates a new foreign key.
+     * @param tableOrName
+     * @param foreignKey
      */
     async createForeignKey(tableOrName, foreignKey) {
-        const table = InstanceChecker.isTable(tableOrName)
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : 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);
@@ -1418,6 +1539,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates a new foreign keys.
+     * @param tableOrName
+     * @param foreignKeys
      */
     async createForeignKeys(tableOrName, foreignKeys) {
         for (const foreignKey of foreignKeys) {
@@ -1426,34 +1549,48 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops a foreign key from the table.
+     * @param tableOrName
+     * @param foreignKeyOrName
+     * @param ifExists
      */
-    async dropForeignKey(tableOrName, foreignKeyOrName) {
-        const table = InstanceChecker.isTable(tableOrName)
+    async dropForeignKey(tableOrName, foreignKeyOrName, ifExists) {
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const foreignKey = InstanceChecker.isTableForeignKey(foreignKeyOrName)
+        const foreignKey = InstanceChecker_1.InstanceChecker.isTableForeignKey(foreignKeyOrName)
             ? foreignKeyOrName
             : table.foreignKeys.find((fk) => fk.name === foreignKeyOrName);
-        if (!foreignKey)
-            throw new TypeORMError(`Supplied foreign key was not found in table ${table.name}`);
-        const up = this.dropForeignKeySql(table, 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, ifExists);
         const down = this.createForeignKeySql(table, foreignKey);
         await this.executeQueries(up, down);
         table.removeForeignKey(foreignKey);
     }
     /**
      * Drops a foreign keys from the table.
+     * @param tableOrName
+     * @param foreignKeys
+     * @param ifExists
      */
-    async dropForeignKeys(tableOrName, foreignKeys) {
+    async dropForeignKeys(tableOrName, foreignKeys, ifExists) {
         for (const foreignKey of [...foreignKeys]) {
-            await this.dropForeignKey(tableOrName, foreignKey);
+            await this.dropForeignKey(tableOrName, foreignKey, ifExists);
         }
     }
     /**
      * Creates a new index.
+     * @param tableOrName
+     * @param index
      */
     async createIndex(tableOrName, index) {
-        const table = InstanceChecker.isTable(tableOrName)
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         // new index may be passed without name. In this case we generate index name manually.
@@ -1461,7 +1598,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             index.name = this.generateIndexName(table, index);
         // CockroachDB stores unique indices and UNIQUE constraints
         if (index.isUnique) {
-            const unique = new TableUnique({
+            const unique = new TableUnique_1.TableUnique({
                 name: index.name,
                 columnNames: index.columnNames,
             });
@@ -1481,6 +1618,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Creates a new indices
+     * @param tableOrName
+     * @param indices
      */
     async createIndices(tableOrName, indices) {
         for (const index of indices) {
@@ -1489,75 +1628,97 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Drops an index from the table.
+     * @param tableOrName
+     * @param indexOrName
+     * @param ifExists
      */
-    async dropIndex(tableOrName, indexOrName) {
-        const table = InstanceChecker.isTable(tableOrName)
+    async dropIndex(tableOrName, indexOrName, ifExists) {
+        const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        const index = InstanceChecker.isTableIndex(indexOrName)
+        const index = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName)
             ? indexOrName
             : table.indices.find((i) => i.name === indexOrName);
-        if (!index)
-            throw new TypeORMError(`Supplied index ${indexOrName} was not found in table ${table.name}`);
+        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);
-        const up = this.dropIndexSql(table, index);
+        const up = this.dropIndexSql(table, index, ifExists);
         const down = this.createIndexSql(table, index);
         await this.executeQueries(up, down);
         table.removeIndex(index);
     }
     /**
      * Drops an indices from the table.
+     * @param tableOrName
+     * @param indices
+     * @param ifExists
      */
-    async dropIndices(tableOrName, indices) {
+    async dropIndices(tableOrName, indices, ifExists) {
         for (const index of [...indices]) {
-            await this.dropIndex(tableOrName, index);
+            await this.dropIndex(tableOrName, index, ifExists);
         }
     }
     /**
      * 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.
      */
     async clearDatabase() {
         const schemas = [];
-        this.connection.entityMetadatas
+        this.dataSource.entityMetadatas
             .filter((metadata) => metadata.schema)
             .forEach((metadata) => {
             const isSchemaExist = !!schemas.find((schema) => schema === metadata.schema);
             if (!isSchemaExist)
                 schemas.push(metadata.schema);
         });
-        schemas.push(this.driver.options.schema || "current_schema()");
-        const schemaNamesString = schemas
-            .map((name) => {
-            return name === "current_schema()" ? name : "'" + name + "'";
-        })
-            .join(", ");
+        if (this.driver.options.schema) {
+            schemas.push(this.driver.options.schema);
+        }
+        else {
+            const [{ currentSchema }] = await this.query(`SELECT current_schema() AS "currentSchema"`);
+            schemas.push(currentSchema);
+        }
         const isAnotherTransactionActive = this.isTransactionActive;
         if (!isAnotherTransactionActive)
             await this.startTransaction();
         try {
             const version = await this.getVersion();
-            const selectViewDropsQuery = `SELECT 'DROP VIEW IF EXISTS "' || schemaname || '"."' || viewname || '" CASCADE;' as "query" ` +
-                `FROM "pg_views" WHERE "schemaname" IN (${schemaNamesString})`;
-            const dropViewQueries = await this.query(selectViewDropsQuery);
-            await Promise.all(dropViewQueries.map((q) => this.query(q["query"])));
-            const selectDropsQuery = `SELECT 'DROP TABLE IF EXISTS "' || table_schema || '"."' || table_name || '" CASCADE;' as "query" FROM "information_schema"."tables" WHERE "table_schema" IN (${schemaNamesString})`;
-            const dropQueries = await this.query(selectDropsQuery);
-            await Promise.all(dropQueries.map((q) => this.query(q["query"])));
-            const selectSequenceDropsQuery = `SELECT 'DROP SEQUENCE "' || sequence_schema || '"."' || sequence_name || '";' as "query" FROM "information_schema"."sequences" WHERE "sequence_schema" IN (${schemaNamesString})`;
-            const sequenceDropQueries = await this.query(selectSequenceDropsQuery);
-            await Promise.all(sequenceDropQueries.map((q) => this.query(q["query"])));
+            // drop views
+            const views = await this.query(`SELECT quote_ident(schemaname) || '.' || quote_ident(viewname) as "name" ` +
+                `FROM "pg_views" WHERE "schemaname"::STRING = ANY($1::STRING[])`, [schemas]);
+            if (views.length > 0) {
+                await this.query(`DROP VIEW IF EXISTS ${views.map(({ name }) => name).join(", ")} CASCADE`);
+            }
+            // drop tables
+            const tables = await this.query(`SELECT quote_ident(table_schema) || '.' || quote_ident(table_name) as "name" ` +
+                `FROM "information_schema"."tables" WHERE "table_schema"::STRING = ANY($1::STRING[]) AND "table_type" = 'BASE TABLE'`, [schemas]);
+            if (tables.length > 0) {
+                await this.query(`DROP TABLE IF EXISTS ${tables.map(({ name }) => name).join(", ")} CASCADE`);
+            }
+            // drop sequences
+            const sequences = await this.query(`SELECT quote_ident(sequence_schema) || '.' || quote_ident(sequence_name) as "name" ` +
+                `FROM "information_schema"."sequences" WHERE "sequence_schema"::STRING = ANY($1::STRING[])`, [schemas]);
+            if (sequences.length > 0) {
+                await this.query(`DROP SEQUENCE IF EXISTS ${sequences.map(({ name }) => name).join(", ")}`);
+            }
             // drop enum types. Supported starting from v20.2.19.
-            if (VersionUtils.isGreaterOrEqual(version, "20.2.19")) {
-                await this.dropEnumTypes(schemaNamesString);
+            if (VersionUtils_1.VersionUtils.isGreaterOrEqual(version, "20.2.19")) {
+                await this.dropEnumTypes(schemas);
             }
             if (!isAnotherTransactionActive)
                 await this.commitTransaction();
@@ -1594,10 +1755,10 @@ export class CockroachQueryRunner extends BaseQueryRunner {
         })
             .join(" OR ");
         const query = `SELECT "t".*, "v"."check_option" FROM ${this.escapePath(this.getTypeormMetadataTableName())} "t" ` +
-            `INNER JOIN "information_schema"."views" "v" ON "v"."table_schema" = "t"."schema" AND "v"."table_name" = "t"."name" WHERE "t"."type" = '${MetadataTableType.VIEW}' ${viewsCondition ? `AND (${viewsCondition})` : ""}`;
+            `INNER JOIN "information_schema"."views" "v" ON "v"."table_schema" = "t"."schema" AND "v"."table_name" = "t"."name" WHERE "t"."type" = '${MetadataTableType_1.MetadataTableType.VIEW}' ${viewsCondition ? `AND (${viewsCondition})` : ""}`;
         const dbViews = await this.query(query);
         return dbViews.map((dbView) => {
-            const view = new View();
+            const view = new View_1.View();
             const schema = dbView["schema"] === currentSchema &&
                 !this.driver.options.schema
                 ? undefined
@@ -1611,6 +1772,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Loads all tables (with given names) from the database and creates a Table from them.
+     * @param tableNames
      */
     async loadTables(tableNames) {
         // if no tables given then no need to proceed
@@ -1644,7 +1806,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
         })
             .join(" OR ");
         const columnsSql = `SELECT "columns".*, "attr"."attgenerated" as "generated_type", ` +
-            `pg_catalog.col_description(('"' || table_catalog || '"."' || table_schema || '"."' || table_name || '"')::regclass::oid, ordinal_position) as description ` +
+            `pg_catalog.col_description((quote_ident(table_catalog) || '.' || quote_ident(table_schema) || '.' || quote_ident(table_name))::regclass::oid, ordinal_position) as description ` +
             `FROM "information_schema"."columns" ` +
             `LEFT JOIN "pg_class" AS "cls" ON "cls"."relname" = "table_name" ` +
             `LEFT JOIN "pg_namespace" AS "ns" ON "ns"."oid" = "cls"."relnamespace" AND "ns"."nspname" = "table_schema" ` +
@@ -1704,16 +1866,14 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             `INNER JOIN "pg_namespace" "n" ON "n"."oid" = "t"."typnamespace" ` +
             `WHERE "n"."nspname" IN (${tableSchemas}) ` +
             `GROUP BY "t"."typname"`;
-        const [dbColumns, dbConstraints, dbIndices, dbForeignKeys, dbEnums,] = await Promise.all([
-            this.query(columnsSql),
-            this.query(constraintsSql),
-            this.query(indicesSql),
-            this.query(foreignKeysSql),
-            this.query(enumsSql),
-        ]);
+        const dbColumns = await this.query(columnsSql);
+        const dbConstraints = await this.query(constraintsSql);
+        const dbIndices = await this.query(indicesSql);
+        const dbForeignKeys = await this.query(foreignKeysSql);
+        const dbEnums = await this.query(enumsSql);
         // create tables for loaded tables
         return Promise.all(dbTables.map(async (dbTable) => {
-            const table = new Table();
+            const table = new Table_1.Table();
             const getSchemaFromKey = (dbObject, key) => {
                 return dbObject[key] === currentSchema &&
                     (!this.driver.options.schema ||
@@ -1741,7 +1901,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                         dbConstraint["column_name"] ===
                             dbColumn["column_name"]);
                 });
-                const tableColumn = new TableColumn();
+                const tableColumn = new TableColumn_1.TableColumn();
                 tableColumn.name = dbColumn["column_name"];
                 tableColumn.type =
                     dbColumn["crdb_sql_type"].toLowerCase();
@@ -1802,7 +1962,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                             .replace("[]", "")
                             .toLowerCase();
                         tableColumn.type =
-                            this.connection.driver.normalizeType({
+                            this.dataSource.driver.normalizeType({
                                 type: type,
                             });
                     }
@@ -1834,7 +1994,7 @@ export class CockroachQueryRunner extends 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) {
@@ -1891,7 +2051,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                     const asExpressionQuery = this.selectTypeormMetadataSql({
                         schema: dbTable["table_schema"],
                         table: dbTable["table_name"],
-                        type: MetadataTableType.GENERATED_COLUMN,
+                        type: MetadataTableType_1.MetadataTableType.GENERATED_COLUMN,
                         name: tableColumn.name,
                     });
                     const results = await this.query(asExpressionQuery.query, asExpressionQuery.parameters);
@@ -1931,7 +2091,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                 return tableColumn;
             }));
             // find unique constraints of table, group them by constraint name and build TableUnique.
-            const tableUniqueConstraints = OrmUtils.uniq(dbConstraints.filter((dbConstraint) => {
+            const tableUniqueConstraints = OrmUtils_1.OrmUtils.uniq(dbConstraints.filter((dbConstraint) => {
                 return (dbConstraint["table_name"] ===
                     dbTable["table_name"] &&
                     dbConstraint["table_schema"] ===
@@ -1941,13 +2101,13 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             table.uniques = tableUniqueConstraints.map((constraint) => {
                 const uniques = dbConstraints.filter((dbC) => dbC["constraint_name"] ===
                     constraint["constraint_name"]);
-                return new TableUnique({
+                return new TableUnique_1.TableUnique({
                     name: constraint["constraint_name"],
                     columnNames: uniques.map((u) => u["column_name"]),
                 });
             });
             // find check constraints of table, group them by constraint name and build TableCheck.
-            const tableCheckConstraints = OrmUtils.uniq(dbConstraints.filter((dbConstraint) => {
+            const tableCheckConstraints = OrmUtils_1.OrmUtils.uniq(dbConstraints.filter((dbConstraint) => {
                 return (dbConstraint["table_name"] ===
                     dbTable["table_name"] &&
                     dbConstraint["table_schema"] ===
@@ -1957,14 +2117,14 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             table.checks = tableCheckConstraints.map((constraint) => {
                 const checks = dbConstraints.filter((dbC) => dbC["constraint_name"] ===
                     constraint["constraint_name"]);
-                return new TableCheck({
+                return new TableCheck_1.TableCheck({
                     name: constraint["constraint_name"],
                     columnNames: checks.map((c) => c["column_name"]),
                     expression: constraint["expression"].replace(/^\s*CHECK\s*\((.*)\)\s*$/i, "$1"),
                 });
             });
             // find exclusion constraints of table, group them by constraint name and build TableExclusion.
-            const tableExclusionConstraints = OrmUtils.uniq(dbConstraints.filter((dbConstraint) => {
+            const tableExclusionConstraints = OrmUtils_1.OrmUtils.uniq(dbConstraints.filter((dbConstraint) => {
                 return (dbConstraint["table_name"] ===
                     dbTable["table_name"] &&
                     dbConstraint["table_schema"] ===
@@ -1972,13 +2132,13 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                     dbConstraint["constraint_type"] === "EXCLUDE");
             }), (dbConstraint) => dbConstraint["constraint_name"]);
             table.exclusions = tableExclusionConstraints.map((constraint) => {
-                return new TableExclusion({
+                return new TableExclusion_1.TableExclusion({
                     name: constraint["constraint_name"],
                     expression: constraint["expression"].substring(8), // trim EXCLUDE from start of expression
                 });
             });
             // find foreign key constraints of table, group them by constraint name and build TableForeignKey.
-            const tableForeignKeyConstraints = OrmUtils.uniq(dbForeignKeys.filter((dbForeignKey) => {
+            const tableForeignKeyConstraints = OrmUtils_1.OrmUtils.uniq(dbForeignKeys.filter((dbForeignKey) => {
                 return (dbForeignKey["table_name"] ===
                     dbTable["table_name"] &&
                     dbForeignKey["table_schema"] ===
@@ -1990,7 +2150,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                 // if referenced table located in currently used schema, we don't need to concat schema name to table name.
                 const schema = getSchemaFromKey(dbForeignKey, "referenced_table_schema");
                 const referencedTableName = this.driver.buildTableName(dbForeignKey["referenced_table_name"], schema);
-                return new TableForeignKey({
+                return new TableForeignKey_1.TableForeignKey({
                     name: dbForeignKey["constraint_name"],
                     columnNames: foreignKeys.map((dbFk) => dbFk["column_name"]),
                     referencedSchema: dbForeignKey["referenced_table_schema"],
@@ -2001,14 +2161,14 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                 });
             });
             // find index constraints of table, group them by constraint name and build TableIndex.
-            const tableIndexConstraints = OrmUtils.uniq(dbIndices.filter((dbIndex) => {
+            const tableIndexConstraints = OrmUtils_1.OrmUtils.uniq(dbIndices.filter((dbIndex) => {
                 return (dbIndex["table_name"] === dbTable["table_name"] &&
                     dbIndex["table_schema"] === dbTable["table_schema"]);
             }), (dbIndex) => dbIndex["constraint_name"]);
             table.indices = tableIndexConstraints.map((constraint) => {
                 const indices = dbIndices.filter((index) => index["constraint_name"] ===
                     constraint["constraint_name"]);
-                return new TableIndex({
+                return new TableIndex_1.TableIndex({
                     table: table,
                     name: constraint["constraint_name"],
                     columnNames: indices.map((i) => i["column_name"]),
@@ -2023,6 +2183,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Builds create table sql.
+     * @param table
+     * @param createForeignKeys
      */
     createTableSql(table, createForeignKeys) {
         const columnDefinitions = table.columns
@@ -2035,16 +2197,16 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             const isUniqueExist = table.uniques.some((unique) => unique.columnNames.length === 1 &&
                 unique.columnNames[0] === column.name);
             if (!isUniqueExist)
-                table.uniques.push(new TableUnique({
-                    name: this.connection.namingStrategy.uniqueConstraintName(table, [column.name]),
+                table.uniques.push(new TableUnique_1.TableUnique({
+                    name: this.dataSource.namingStrategy.uniqueConstraintName(table, [column.name]),
                     columnNames: [column.name],
                 }));
         });
         table.indices
             .filter((index) => index.isUnique)
             .forEach((index) => {
-            table.uniques.push(new TableUnique({
-                name: this.connection.namingStrategy.uniqueConstraintName(table, index.columnNames),
+            table.uniques.push(new TableUnique_1.TableUnique({
+                name: this.dataSource.namingStrategy.uniqueConstraintName(table, index.columnNames),
                 columnNames: index.columnNames,
             }));
         });
@@ -2053,7 +2215,7 @@ export class CockroachQueryRunner extends 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(", ");
@@ -2067,7 +2229,7 @@ export class CockroachQueryRunner extends 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(", ");
@@ -2080,7 +2242,7 @@ export class CockroachQueryRunner extends 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(", ");
@@ -2098,7 +2260,7 @@ export class CockroachQueryRunner extends 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(", ");
@@ -2107,8 +2269,10 @@ export class CockroachQueryRunner extends BaseQueryRunner {
         sql += `)`;
         table.columns
             .filter((it) => it.comment)
-            .forEach((it) => (sql += `; COMMENT ON COLUMN ${this.escapePath(table)}."${it.name}" IS ${this.escapeComment(it.comment)}`));
-        return new Query(sql);
+            .forEach((it) => {
+            sql += `; COMMENT ON COLUMN ${this.escapePath(table)}."${it.name}" IS ${this.escapeComment(it.comment)}`;
+        });
+        return new Query_1.Query(sql);
     }
     /**
      * Loads Cockroachdb version.
@@ -2120,17 +2284,18 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Builds drop table sql.
+     * @param tableOrPath
      */
     dropTableSql(tableOrPath) {
-        return new Query(`DROP TABLE ${this.escapePath(tableOrPath)}`);
+        return new Query_1.Query(`DROP TABLE ${this.escapePath(tableOrPath)}`);
     }
     createViewSql(view) {
         if (typeof view.expression === "string") {
-            return new Query(`CREATE VIEW ${this.escapePath(view)} AS ${view.expression}`);
+            return new Query_1.Query(`CREATE VIEW ${this.escapePath(view)} AS ${view.expression}`);
         }
         else {
-            return new Query(`CREATE VIEW ${this.escapePath(view)} AS ${view
-                .expression(this.connection)
+            return new Query_1.Query(`CREATE VIEW ${this.escapePath(view)} AS ${view
+                .expression(this.dataSource)
                 .getQuery()}`);
         }
     }
@@ -2142,9 +2307,9 @@ export class CockroachQueryRunner extends BaseQueryRunner {
         }
         const expression = typeof view.expression === "string"
             ? view.expression.trim()
-            : view.expression(this.connection).getQuery();
+            : view.expression(this.dataSource).getQuery();
         return this.insertTypeormMetadataSql({
-            type: MetadataTableType.VIEW,
+            type: MetadataTableType_1.MetadataTableType.VIEW,
             schema: schema,
             name: name,
             value: expression,
@@ -2152,12 +2317,14 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Builds drop view sql.
+     * @param viewOrPath
      */
     dropViewSql(viewOrPath) {
-        return new Query(`DROP VIEW ${this.escapePath(viewOrPath)}`);
+        return new Query_1.Query(`DROP VIEW ${this.escapePath(viewOrPath)}`);
     }
     /**
      * Builds remove view sql.
+     * @param viewOrPath
      */
     async deleteViewDefinitionSql(viewOrPath) {
         const currentSchema = await this.getCurrentSchema();
@@ -2166,24 +2333,28 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             schema = currentSchema;
         }
         return this.deleteTypeormMetadataSql({
-            type: MetadataTableType.VIEW,
+            type: MetadataTableType_1.MetadataTableType.VIEW,
             schema,
             name,
         });
     }
     /**
      * Drops ENUM type from given schemas.
+     * @param schemaNames
      */
     async dropEnumTypes(schemaNames) {
-        const selectDropsQuery = `SELECT 'DROP TYPE IF EXISTS "' || n.nspname || '"."' || t.typname || '";' as "query" FROM "pg_type" "t" ` +
+        const enums = await this.query(`SELECT quote_ident(n.nspname) || '.' || quote_ident(t.typname) as "name" FROM "pg_type" "t" ` +
             `INNER JOIN "pg_enum" "e" ON "e"."enumtypid" = "t"."oid" ` +
             `INNER JOIN "pg_namespace" "n" ON "n"."oid" = "t"."typnamespace" ` +
-            `WHERE "n"."nspname" IN (${schemaNames}) GROUP BY "n"."nspname", "t"."typname"`;
-        const dropQueries = await this.query(selectDropsQuery);
-        await Promise.all(dropQueries.map((q) => this.query(q["query"])));
+            `WHERE "n"."nspname"::STRING = ANY($1::STRING[]) GROUP BY "n"."nspname", "t"."typname"`, [schemaNames]);
+        if (enums.length > 0) {
+            await this.query(`DROP TYPE IF EXISTS ${enums.map(({ name }) => name).join(", ")}`);
+        }
     }
     /**
      * Checks if enum with the given name exist in the database.
+     * @param table
+     * @param column
      */
     async hasEnumType(table, column) {
         let { schema } = this.driver.parseTableName(table);
@@ -2199,6 +2370,9 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Builds create ENUM type sql.
+     * @param table
+     * @param column
+     * @param enumName
      */
     createEnumTypeSql(table, column, enumName) {
         if (!enumName)
@@ -2206,96 +2380,120 @@ export class CockroachQueryRunner extends BaseQueryRunner {
         const enumValues = column
             .enum.map((value) => `'${value.replaceAll("'", "''")}'`)
             .join(", ");
-        return new Query(`CREATE TYPE ${enumName} AS ENUM(${enumValues})`);
+        return new Query_1.Query(`CREATE TYPE ${enumName} AS ENUM(${enumValues})`);
     }
     /**
      * Builds create ENUM type sql.
+     * @param table
+     * @param column
+     * @param enumName
      */
     dropEnumTypeSql(table, column, enumName) {
         if (!enumName)
             enumName = this.buildEnumName(table, column);
-        return new Query(`DROP TYPE ${enumName}`);
+        return new Query_1.Query(`DROP TYPE ${enumName}`);
     }
     /**
      * Builds create index sql.
      * UNIQUE indices creates as UNIQUE constraints.
+     * @param table
+     * @param index
      */
     createIndexSql(table, index) {
         const columns = index.columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
-        return new Query(`CREATE ${index.isUnique ? "UNIQUE " : ""}INDEX "${index.name}" ON ${this.escapePath(table)} ${index.isSpatial ? "USING GiST " : ""}(${columns}) ${index.where ? "WHERE " + index.where : ""}`);
+        return new Query_1.Query(`CREATE ${index.isUnique ? "UNIQUE " : ""}INDEX "${index.name}" ON ${this.escapePath(table)} ${index.isSpatial ? "USING GiST " : ""}(${columns}) ${index.where ? "WHERE " + index.where : ""}`);
     }
     /**
      * Builds drop index sql.
+     * @param table
+     * @param indexOrName
+     * @param ifExists
      */
-    dropIndexSql(table, indexOrName) {
-        const indexName = InstanceChecker.isTableIndex(indexOrName) ||
-            InstanceChecker.isTableUnique(indexOrName)
+    dropIndexSql(table, indexOrName, ifExists) {
+        const indexName = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName) ||
+            InstanceChecker_1.InstanceChecker.isTableUnique(indexOrName)
             ? indexOrName.name
             : indexOrName;
-        return new Query(`DROP INDEX ${this.escapePath(table)}@"${indexName}" CASCADE`);
+        return new Query_1.Query(`DROP INDEX ${ifExists ? "IF EXISTS " : ""}${this.escapePath(table)}@"${indexName}" CASCADE`);
     }
     /**
      * 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(", ");
-        return new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${primaryKeyName}" PRIMARY KEY (${columnNamesString})`);
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${primaryKeyName}" PRIMARY KEY (${columnNamesString})`);
     }
     /**
      * Builds drop primary key sql.
+     * @param table
+     * @param ifExists
      */
-    dropPrimaryKeySql(table) {
+    dropPrimaryKeySql(table, ifExists) {
         if (!table.primaryColumns.length)
-            throw new TypeORMError(`Table ${table} has no primary keys.`);
+            throw new error_1.TypeORMError(`Table ${table} has no primary keys.`);
         const columnNames = table.primaryColumns.map((column) => column.name);
         const constraintName = table.primaryColumns[0].primaryKeyConstraintName;
         const primaryKeyName = constraintName
             ? constraintName
-            : this.connection.namingStrategy.primaryKeyName(table, columnNames);
-        return new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${primaryKeyName}"`);
+            : this.dataSource.namingStrategy.primaryKeyName(table, columnNames);
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT ${ifExists ? "IF EXISTS " : ""}"${primaryKeyName}"`);
     }
     /**
      * Builds create unique constraint sql.
+     * @param table
+     * @param uniqueConstraint
      */
     createUniqueConstraintSql(table, uniqueConstraint) {
         const columnNames = uniqueConstraint.columnNames
             .map((column) => `"` + column + `"`)
             .join(", ");
-        return new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${uniqueConstraint.name}" UNIQUE (${columnNames})`);
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${uniqueConstraint.name}" UNIQUE (${columnNames})`);
     }
     /**
      * Builds drop unique constraint sql.
+     * @param table
+     * @param uniqueOrName
      */
     dropUniqueConstraintSql(table, uniqueOrName) {
-        const uniqueName = InstanceChecker.isTableUnique(uniqueOrName)
+        const uniqueName = InstanceChecker_1.InstanceChecker.isTableUnique(uniqueOrName)
             ? uniqueOrName.name
             : uniqueOrName;
-        return new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${uniqueName}"`);
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${uniqueName}"`);
     }
     /**
      * Builds create check constraint sql.
+     * @param table
+     * @param checkConstraint
      */
     createCheckConstraintSql(table, checkConstraint) {
-        return new Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${checkConstraint.name}" CHECK (${checkConstraint.expression})`);
+        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
+     * @param ifExists
      */
-    dropCheckConstraintSql(table, checkOrName) {
-        const checkName = InstanceChecker.isTableCheck(checkOrName)
+    dropCheckConstraintSql(table, checkOrName, ifExists) {
+        const checkName = InstanceChecker_1.InstanceChecker.isTableCheck(checkOrName)
             ? checkOrName.name
             : checkOrName;
-        return new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${checkName}"`);
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT ${ifExists ? "IF EXISTS " : ""}"${checkName}"`);
     }
     /**
      * Builds create foreign key sql.
+     * @param table
+     * @param foreignKey
      */
     createForeignKeySql(table, foreignKey) {
         const columnNames = foreignKey.columnNames
@@ -2310,23 +2508,28 @@ export class CockroachQueryRunner extends BaseQueryRunner {
             sql += ` ON DELETE ${foreignKey.onDelete}`;
         if (foreignKey.onUpdate)
             sql += ` ON UPDATE ${foreignKey.onUpdate}`;
-        return new Query(sql);
+        return new Query_1.Query(sql);
     }
     /**
      * Builds drop foreign key sql.
+     * @param table
+     * @param foreignKeyOrName
+     * @param ifExists
      */
-    dropForeignKeySql(table, foreignKeyOrName) {
-        const foreignKeyName = InstanceChecker.isTableForeignKey(foreignKeyOrName)
+    dropForeignKeySql(table, foreignKeyOrName, ifExists) {
+        const foreignKeyName = InstanceChecker_1.InstanceChecker.isTableForeignKey(foreignKeyOrName)
             ? foreignKeyOrName.name
             : foreignKeyOrName;
-        return new Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${foreignKeyName}"`);
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT ${ifExists ? "IF EXISTS " : ""}"${foreignKeyName}"`);
     }
     /**
      * Builds sequence name from given table and column.
+     * @param table
+     * @param columnOrName
      */
     buildSequenceName(table, columnOrName) {
         const { tableName } = this.driver.parseTableName(table);
-        const columnName = InstanceChecker.isTableColumn(columnOrName)
+        const columnName = InstanceChecker_1.InstanceChecker.isTableColumn(columnOrName)
             ? columnOrName.name
             : columnOrName;
         return `${tableName}_${columnName}_seq`;
@@ -2339,6 +2542,11 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Builds ENUM type name from given table and column.
+     * @param table
+     * @param column
+     * @param withSchema
+     * @param disableEscape
+     * @param toOld
      */
     buildEnumName(table, column, withSchema = true, disableEscape, toOld) {
         const { schema, tableName } = this.driver.parseTableName(table);
@@ -2379,6 +2587,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Escapes a given comment so it's safe to include in a query.
+     * @param comment
      */
     escapeComment(comment) {
         if (comment === undefined || comment.length === 0) {
@@ -2389,6 +2598,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Escapes given table or view path.
+     * @param target
      */
     escapePath(target) {
         const { schema, tableName } = this.driver.parseTableName(target);
@@ -2399,6 +2609,8 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Builds a query for create column.
+     * @param table
+     * @param column
      */
     buildCreateColumnSql(table, column) {
         let c = '"' + column.name + '"';
@@ -2419,7 +2631,7 @@ export class CockroachQueryRunner extends BaseQueryRunner {
                 c += " array";
         }
         else if (!column.isGenerated) {
-            c += " " + this.connection.driver.createFullType(column);
+            c += " " + this.dataSource.driver.createFullType(column);
         }
         if (column.asExpression) {
             c += ` AS (${column.asExpression}) ${column.generatedType ? column.generatedType : "VIRTUAL"}`;
@@ -2440,10 +2652,12 @@ export class CockroachQueryRunner extends BaseQueryRunner {
     }
     /**
      * Change table comment.
+     * @param tableOrName
+     * @param comment
      */
     changeTableComment(tableOrName, comment) {
-        throw new TypeORMError(`cockroachdb driver does not support change table comment.`);
+        throw new error_1.TypeORMError(`cockroachdb driver does not support change table comment.`);
     }
 }
-
-//# sourceMappingURL=CockroachQueryRunner.js.map
+exports.CockroachQueryRunner = CockroachQueryRunner;
+//# sourceMappingURL=CockroachQueryRunner.js.map