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

package/driver/cockroachdb/CockroachQueryRunner.js

@@ -44,7 +44,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
          */
         this.transactionRetries = 0;
         this.driver = driver;
-        this.connection = driver.connection;
+        this.dataSource = driver.dataSource;
         this.mode = mode;
         this.broadcaster = new Broadcaster_1.Broadcaster(this);
     }
@@ -96,6 +96,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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) {
@@ -120,6 +121,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Starts transaction.
+     * @param isolationLevel
      */
     async startTransaction(isolationLevel) {
         this.isTransactionActive = true;
@@ -191,17 +193,20 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Executes a given SQL query.
+     * @param query
+     * @param parameters
+     * @param useStructuredResult
      */
     async query(query, parameters, useStructuredResult = false) {
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError_1.QueryRunnerAlreadyReleasedError();
         const databaseConnection = await this.connect();
-        this.driver.connection.logger.logQuery(query, parameters, this);
+        this.driver.dataSource.logger.logQuery(query, parameters, this);
         await this.broadcaster.broadcast("BeforeQuery", query, parameters);
         const broadcasterResult = new BroadcasterResult_1.BroadcasterResult();
         const queryStartTime = Date.now();
         if (this.isTransactionActive && this.storeQueries) {
-            this.queries.push({ query, parameters });
+            this.queries.push({ query, parameters, useStructuredResult });
         }
         try {
             const raw = await new Promise((ok, fail) => {
@@ -213,7 +218,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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_1.QueryResult();
             if (raw.hasOwnProperty("rowCount")) {
@@ -253,15 +258,15 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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_1.QueryFailedError(query, parameters, err);
             }
@@ -272,6 +277,10 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Returns raw data stream.
+     * @param query
+     * @param parameters
+     * @param onEnd
+     * @param onError
      */
     async stream(query, parameters, onEnd, onError) {
         const QueryStream = this.driver.loadStreamDependency();
@@ -279,7 +288,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             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);
@@ -298,15 +307,17 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     /**
      * Returns all available schema names including system schemas.
      * If database parameter specified, returns schemas of that database.
+     * @param database
      */
     async getSchemas(database) {
         return Promise.resolve([]);
     }
     /**
      * Checks if database with the given name exist.
+     * @param database
      */
     async hasDatabase(database) {
-        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;
     }
     /**
@@ -318,9 +329,10 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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;
     }
     /**
@@ -332,75 +344,100 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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}"`;
+    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}"`;
+    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`;
+        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}"`;
+        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();
@@ -440,7 +477,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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));
             });
@@ -473,11 +510,15 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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();
@@ -534,6 +575,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new view.
+     * @param view
+     * @param syncWithMetadata
      */
     async createView(view, syncWithMetadata = false) {
         const upQueries = [];
@@ -548,20 +591,26 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops the view.
+     * @param target
+     * @param ifExists
      */
-    async dropView(target) {
+    async dropView(target, ifExists) {
         const viewName = InstanceChecker_1.InstanceChecker.isView(target) ? target.name : target;
         const view = await this.getCachedView(viewName);
-        const 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 = [];
@@ -580,19 +629,19 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (newTable.primaryColumns.length > 0 &&
             !newTable.primaryColumns[0].primaryKeyConstraintName) {
             const columnNames = newTable.primaryColumns.map((column) => column.name);
-            const oldPkName = this.connection.namingStrategy.primaryKeyName(oldTable, columnNames);
-            const newPkName = this.connection.namingStrategy.primaryKeyName(newTable, columnNames);
+            const oldPkName = this.dataSource.namingStrategy.primaryKeyName(oldTable, columnNames);
+            const newPkName = this.dataSource.namingStrategy.primaryKeyName(newTable, columnNames);
             upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${oldPkName}" TO "${newPkName}"`));
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${newPkName}" TO "${oldPkName}"`));
         }
         // rename unique constraints
         newTable.uniques.forEach((unique) => {
-            const oldUniqueName = this.connection.namingStrategy.uniqueConstraintName(oldTable, unique.columnNames);
+            const oldUniqueName = this.dataSource.namingStrategy.uniqueConstraintName(oldTable, unique.columnNames);
             // Skip renaming if Unique has user defined constraint name
             if (unique.name !== oldUniqueName)
                 return;
             // build new constraint name
-            const newUniqueName = this.connection.namingStrategy.uniqueConstraintName(newTable, unique.columnNames);
+            const newUniqueName = this.dataSource.namingStrategy.uniqueConstraintName(newTable, unique.columnNames);
             // build queries
             upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${unique.name}" TO "${newUniqueName}"`));
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${newUniqueName}" TO "${unique.name}"`));
@@ -601,13 +650,13 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         });
         // rename index constraints
         newTable.indices.forEach((index) => {
-            const oldIndexName = this.connection.namingStrategy.indexName(oldTable, index.columnNames, index.where);
+            const oldIndexName = this.dataSource.namingStrategy.indexName(oldTable, index.columnNames, index.where);
             // Skip renaming if Index has user defined constraint name
             if (index.name !== oldIndexName)
                 return;
             // build new constraint name
             const { 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}"`
@@ -622,12 +671,12 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         });
         // rename foreign key constraints
         newTable.foreignKeys.forEach((foreignKey) => {
-            const oldForeignKeyName = this.connection.namingStrategy.foreignKeyName(oldTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+            const oldForeignKeyName = this.dataSource.namingStrategy.foreignKeyName(oldTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
             // Skip renaming if foreign key has user defined constraint name
             if (foreignKey.name !== oldForeignKeyName)
                 return;
             // build new constraint name
-            const newForeignKeyName = this.connection.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+            const newForeignKeyName = this.dataSource.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
             // build queries
             upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${foreignKey.name}" TO "${newForeignKeyName}"`));
             downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(newTable)} RENAME CONSTRAINT "${newForeignKeyName}" TO "${foreignKey.name}"`));
@@ -648,6 +697,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new column from the column in the table.
+     * @param tableOrName
+     * @param column
      */
     async addColumn(tableOrName, column) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -676,7 +727,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             if (primaryColumns.length > 0) {
                 const pkName = primaryColumns[0].primaryKeyConstraintName
                     ? primaryColumns[0].primaryKeyConstraintName
-                    : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                    : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                 const columnNames = primaryColumns
                     .map((column) => `"${column.name}"`)
                     .join(", ");
@@ -686,7 +737,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             primaryColumns.push(column);
             const pkName = primaryColumns[0].primaryKeyConstraintName
                 ? primaryColumns[0].primaryKeyConstraintName
-                : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
             const columnNames = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
@@ -722,7 +773,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             // CockroachDB stores unique indices as UNIQUE constraints
             if (columnIndex.isUnique) {
                 const unique = new TableUnique_1.TableUnique({
-                    name: this.connection.namingStrategy.uniqueConstraintName(table, columnIndex.columnNames),
+                    name: this.dataSource.namingStrategy.uniqueConstraintName(table, columnIndex.columnNames),
                     columnNames: columnIndex.columnNames,
                 });
                 upQueries.push(this.createUniqueConstraintSql(table, unique));
@@ -737,7 +788,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // create unique constraint
         if (column.isUnique) {
             const uniqueConstraint = new TableUnique_1.TableUnique({
-                name: this.connection.namingStrategy.uniqueConstraintName(table, [column.name]),
+                name: this.dataSource.namingStrategy.uniqueConstraintName(table, [column.name]),
                 columnNames: [column.name],
             });
             clonedTable.uniques.push(uniqueConstraint);
@@ -755,6 +806,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new columns from the column in the table.
+     * @param tableOrName
+     * @param columns
      */
     async addColumns(tableOrName, columns) {
         for (const column of columns) {
@@ -763,6 +816,9 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Renames column in the given table.
+     * @param tableOrName
+     * @param oldTableColumnOrName
+     * @param newTableColumnOrName
      */
     async renameColumn(tableOrName, oldTableColumnOrName, newTableColumnOrName) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -785,6 +841,9 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param oldTableColumnOrName
+     * @param newColumn
      */
     async changeColumn(tableOrName, oldTableColumnOrName, newColumn) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -828,25 +887,25 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     const primaryColumns = clonedTable.primaryColumns;
                     // build old primary constraint name
                     const columnNames = primaryColumns.map((column) => column.name);
-                    const oldPkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
+                    const oldPkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, columnNames);
                     // replace old column name with new column name
                     columnNames.splice(columnNames.indexOf(oldColumn.name), 1);
                     columnNames.push(newColumn.name);
                     // build new primary constraint name
-                    const newPkName = this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
+                    const newPkName = this.dataSource.namingStrategy.primaryKeyName(clonedTable, columnNames);
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${oldPkName}" TO "${newPkName}"`));
                     downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${newPkName}" TO "${oldPkName}"`));
                 }
                 // rename unique constraints
                 clonedTable.findColumnUniques(oldColumn).forEach((unique) => {
-                    const oldUniqueName = this.connection.namingStrategy.uniqueConstraintName(clonedTable, unique.columnNames);
+                    const oldUniqueName = this.dataSource.namingStrategy.uniqueConstraintName(clonedTable, unique.columnNames);
                     // Skip renaming if Unique has user defined constraint name
                     if (unique.name !== oldUniqueName)
                         return;
                     // build new constraint name
                     unique.columnNames.splice(unique.columnNames.indexOf(oldColumn.name), 1);
                     unique.columnNames.push(newColumn.name);
-                    const newUniqueName = this.connection.namingStrategy.uniqueConstraintName(clonedTable, unique.columnNames);
+                    const newUniqueName = this.dataSource.namingStrategy.uniqueConstraintName(clonedTable, unique.columnNames);
                     // build queries
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${unique.name}" TO "${newUniqueName}"`));
                     downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${newUniqueName}" TO "${unique.name}"`));
@@ -855,7 +914,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 });
                 // rename index constraints
                 clonedTable.findColumnIndices(oldColumn).forEach((index) => {
-                    const oldIndexName = this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
+                    const oldIndexName = this.dataSource.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
                     // Skip renaming if Index has user defined constraint name
                     if (index.name !== oldIndexName)
                         return;
@@ -863,7 +922,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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}"`
@@ -880,14 +939,14 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 clonedTable
                     .findColumnForeignKeys(oldColumn)
                     .forEach((foreignKey) => {
-                    const foreignKeyName = this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+                    const foreignKeyName = this.dataSource.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
                     // Skip renaming if foreign key has user defined constraint name
                     if (foreignKey.name !== foreignKeyName)
                         return;
                     // build new constraint name
                     foreignKey.columnNames.splice(foreignKey.columnNames.indexOf(oldColumn.name), 1);
                     foreignKey.columnNames.push(newColumn.name);
-                    const newForeignKeyName = this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+                    const newForeignKeyName = this.dataSource.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
                     // build queries
                     upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${foreignKey.name}" TO "${newForeignKeyName}"`));
                     downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} RENAME CONSTRAINT "${newForeignKeyName}" TO "${foreignKey.name}"`));
@@ -924,7 +983,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 if (primaryColumns.length > 0) {
                     const pkName = primaryColumns[0].primaryKeyConstraintName
                         ? primaryColumns[0].primaryKeyConstraintName
-                        : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                        : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                     const columnNames = primaryColumns
                         .map((column) => `"${column.name}"`)
                         .join(", ");
@@ -938,7 +997,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     column.isPrimary = true;
                     const pkName = primaryColumns[0].primaryKeyConstraintName
                         ? primaryColumns[0].primaryKeyConstraintName
-                        : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                        : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                     const columnNames = primaryColumns
                         .map((column) => `"${column.name}"`)
                         .join(", ");
@@ -956,7 +1015,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         const pkName = primaryColumns[0]
                             .primaryKeyConstraintName
                             ? primaryColumns[0].primaryKeyConstraintName
-                            : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                            : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
                         const columnNames = primaryColumns
                             .map((column) => `"${column.name}"`)
                             .join(", ");
@@ -968,7 +1027,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             if (newColumn.isUnique !== oldColumn.isUnique) {
                 if (newColumn.isUnique) {
                     const uniqueConstraint = new TableUnique_1.TableUnique({
-                        name: this.connection.namingStrategy.uniqueConstraintName(table, [newColumn.name]),
+                        name: this.dataSource.namingStrategy.uniqueConstraintName(table, [newColumn.name]),
                         columnNames: [newColumn.name],
                     });
                     clonedTable.uniques.push(uniqueConstraint);
@@ -1087,6 +1146,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param changedColumns
      */
     async changeColumns(tableOrName, changedColumns) {
         for (const { oldColumn, newColumn } of changedColumns) {
@@ -1095,16 +1156,22 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops column in the table.
+     * @param tableOrName
+     * @param columnOrName
+     * @param ifExists
      */
-    async dropColumn(tableOrName, columnOrName) {
+    async dropColumn(tableOrName, columnOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const column = InstanceChecker_1.InstanceChecker.isTableColumn(columnOrName)
             ? columnOrName
             : table.findColumnByName(columnOrName);
-        if (!column)
+        if (!column) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Column "${columnOrName}" was not found in table "${table.name}"`);
+        }
         const clonedTable = table.clone();
         const upQueries = [];
         const downQueries = [];
@@ -1113,7 +1180,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (column.isPrimary) {
             const pkName = column.primaryKeyConstraintName
                 ? column.primaryKeyConstraintName
-                : this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
+                : this.dataSource.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
             const columnNames = clonedTable.primaryColumns
                 .map((primaryColumn) => `"${primaryColumn.name}"`)
                 .join(", ");
@@ -1127,7 +1194,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 const pkName = clonedTable.primaryColumns[0]
                     .primaryKeyConstraintName
                     ? clonedTable.primaryColumns[0].primaryKeyConstraintName
-                    : this.connection.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
+                    : this.dataSource.namingStrategy.primaryKeyName(clonedTable, clonedTable.primaryColumns.map((column) => column.name));
                 const columnNames = clonedTable.primaryColumns
                     .map((primaryColumn) => `"${primaryColumn.name}"`)
                     .join(", ");
@@ -1160,7 +1227,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             upQueries.push(this.dropIndexSql(table, columnUnique.name)); // CockroachDB creates indices for unique constraints
             downQueries.push(this.createUniqueConstraintSql(table, columnUnique));
         }
-        upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN "${column.name}"`));
+        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_1.Query(`DROP SEQUENCE ${this.escapePath(this.buildSequencePath(table, column))}`));
@@ -1204,14 +1271,20 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops the columns in the table.
+     * @param tableOrName
+     * @param columns
+     * @param ifExists
      */
-    async dropColumns(tableOrName, columns) {
+    async dropColumns(tableOrName, columns, ifExists) {
         for (const column of [...columns]) {
-            await this.dropColumn(tableOrName, column);
+            await this.dropColumn(tableOrName, column, ifExists);
         }
     }
     /**
      * Creates a new primary key.
+     * @param tableOrName
+     * @param columnNames
+     * @param constraintName
      */
     async createPrimaryKey(tableOrName, columnNames, constraintName) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1230,6 +1303,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Updates composite primary keys.
+     * @param tableOrName
+     * @param columns
      */
     async updatePrimaryKeys(tableOrName, columns) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1244,7 +1319,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (primaryColumns.length > 0) {
             const pkName = primaryColumns[0].primaryKeyConstraintName
                 ? primaryColumns[0].primaryKeyConstraintName
-                : this.connection.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
+                : this.dataSource.namingStrategy.primaryKeyName(clonedTable, primaryColumns.map((column) => column.name));
             const columnNamesString = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
@@ -1254,10 +1329,12 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // update columns in table.
         clonedTable.columns
             .filter((column) => columnNames.indexOf(column.name) !== -1)
-            .forEach((column) => (column.isPrimary = true));
+            .forEach((column) => {
+            column.isPrimary = true;
+        });
         const pkName = primaryColumns[0].primaryKeyConstraintName
             ? primaryColumns[0].primaryKeyConstraintName
-            : this.connection.namingStrategy.primaryKeyName(clonedTable, columnNames);
+            : this.dataSource.namingStrategy.primaryKeyName(clonedTable, columnNames);
         const columnNamesString = columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
@@ -1268,12 +1345,15 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a primary key.
+     * @param tableOrName
+     * @param constraintName
+     * @param ifExists
      */
-    async dropPrimaryKey(tableOrName, constraintName) {
+    async dropPrimaryKey(tableOrName, constraintName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        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) => {
@@ -1282,6 +1362,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates new unique constraint.
+     * @param tableOrName
+     * @param uniqueConstraint
      */
     async createUniqueConstraint(tableOrName, uniqueConstraint) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1290,7 +1372,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // new unique constraint may be passed without name. In this case we generate unique name manually.
         if (!uniqueConstraint.name)
             uniqueConstraint.name =
-                this.connection.namingStrategy.uniqueConstraintName(table, uniqueConstraint.columnNames);
+                this.dataSource.namingStrategy.uniqueConstraintName(table, uniqueConstraint.columnNames);
         const up = this.createUniqueConstraintSql(table, uniqueConstraint);
         // CockroachDB creates index for UNIQUE constraint.
         // We must use DROP INDEX ... CASCADE instead of DROP CONSTRAINT.
@@ -1300,6 +1382,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates new unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
      */
     async createUniqueConstraints(tableOrName, uniqueConstraints) {
         for (const uniqueConstraint of uniqueConstraints) {
@@ -1308,33 +1392,44 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops unique constraint.
+     * @param tableOrName
+     * @param uniqueOrName
+     * @param ifExists
      */
-    async dropUniqueConstraint(tableOrName, uniqueOrName) {
+    async dropUniqueConstraint(tableOrName, uniqueOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const uniqueConstraint = InstanceChecker_1.InstanceChecker.isTableUnique(uniqueOrName)
             ? uniqueOrName
             : table.uniques.find((u) => u.name === uniqueOrName);
-        if (!uniqueConstraint)
+        if (!uniqueConstraint) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied unique constraint was not found in table ${table.name}`);
+        }
         // 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_1.InstanceChecker.isTable(tableOrName)
@@ -1343,7 +1438,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // new unique constraint may be passed without name. In this case we generate unique name manually.
         if (!checkConstraint.name)
             checkConstraint.name =
-                this.connection.namingStrategy.checkConstraintName(table, checkConstraint.expression);
+                this.dataSource.namingStrategy.checkConstraintName(table, checkConstraint.expression);
         const up = this.createCheckConstraintSql(table, checkConstraint);
         const down = this.dropCheckConstraintSql(table, checkConstraint);
         await this.executeQueries(up, down);
@@ -1351,6 +1446,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates new check constraints.
+     * @param tableOrName
+     * @param checkConstraints
      */
     async createCheckConstraints(tableOrName, checkConstraints) {
         const promises = checkConstraints.map((checkConstraint) => this.createCheckConstraint(tableOrName, checkConstraint));
@@ -1358,54 +1455,75 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops check constraint.
+     * @param tableOrName
+     * @param checkOrName
+     * @param ifExists
      */
-    async dropCheckConstraint(tableOrName, checkOrName) {
+    async dropCheckConstraint(tableOrName, checkOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const checkConstraint = InstanceChecker_1.InstanceChecker.isTableCheck(checkOrName)
             ? checkOrName
             : table.checks.find((c) => c.name === checkOrName);
-        if (!checkConstraint)
+        if (!checkConstraint) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied check constraint was not found in table ${table.name}`);
-        const up = this.dropCheckConstraintSql(table, checkConstraint);
+        }
+        const 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 error_1.TypeORMError(`CockroachDB does not support exclusion constraints.`);
     }
     /**
      * Creates new exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
      */
     async createExclusionConstraints(tableOrName, exclusionConstraints) {
         throw new error_1.TypeORMError(`CockroachDB does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraint.
+     * @param tableOrName
+     * @param exclusionOrName
+     * @param ifExists
      */
-    async dropExclusionConstraint(tableOrName, exclusionOrName) {
+    async dropExclusionConstraint(tableOrName, exclusionOrName, ifExists) {
         throw new error_1.TypeORMError(`CockroachDB does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
+     * @param ifExists
      */
-    async dropExclusionConstraints(tableOrName, exclusionConstraints) {
+    async dropExclusionConstraints(tableOrName, exclusionConstraints, ifExists) {
         throw new error_1.TypeORMError(`CockroachDB does not support exclusion constraints.`);
     }
     /**
      * Creates a new foreign key.
+     * @param tableOrName
+     * @param foreignKey
      */
     async createForeignKey(tableOrName, foreignKey) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1413,7 +1531,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : await this.getCachedTable(tableOrName);
         // new FK may be passed without name. In this case we generate FK name manually.
         if (!foreignKey.name)
-            foreignKey.name = this.connection.namingStrategy.foreignKeyName(table, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
+            foreignKey.name = this.dataSource.namingStrategy.foreignKeyName(table, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
         const up = this.createForeignKeySql(table, foreignKey);
         const down = this.dropForeignKeySql(table, foreignKey);
         await this.executeQueries(up, down);
@@ -1421,6 +1539,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new foreign keys.
+     * @param tableOrName
+     * @param foreignKeys
      */
     async createForeignKeys(tableOrName, foreignKeys) {
         for (const foreignKey of foreignKeys) {
@@ -1429,31 +1549,45 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a foreign key from the table.
+     * @param tableOrName
+     * @param foreignKeyOrName
+     * @param ifExists
      */
-    async dropForeignKey(tableOrName, foreignKeyOrName) {
+    async dropForeignKey(tableOrName, foreignKeyOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const foreignKey = InstanceChecker_1.InstanceChecker.isTableForeignKey(foreignKeyOrName)
             ? foreignKeyOrName
             : table.foreignKeys.find((fk) => fk.name === foreignKeyOrName);
-        if (!foreignKey)
+        if (!foreignKey) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied foreign key was not found in table ${table.name}`);
-        const up = this.dropForeignKeySql(table, foreignKey);
+        }
+        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_1.InstanceChecker.isTable(tableOrName)
@@ -1484,6 +1618,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new indices
+     * @param tableOrName
+     * @param indices
      */
     async createIndices(tableOrName, indices) {
         for (const index of indices) {
@@ -1492,75 +1628,97 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops an index from the table.
+     * @param tableOrName
+     * @param indexOrName
+     * @param ifExists
      */
-    async dropIndex(tableOrName, indexOrName) {
+    async dropIndex(tableOrName, indexOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const index = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName)
             ? indexOrName
             : table.indices.find((i) => i.name === indexOrName);
-        if (!index)
+        if (!index) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied index ${indexOrName} was not found in table ${table.name}`);
+        }
         // old index may be passed without name. In this case we generate index name manually.
         if (!index.name)
             index.name = this.generateIndexName(table, index);
-        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_1.VersionUtils.isGreaterOrEqual(version, "20.2.19")) {
-                await this.dropEnumTypes(schemaNamesString);
+                await this.dropEnumTypes(schemas);
             }
             if (!isAnotherTransactionActive)
                 await this.commitTransaction();
@@ -1614,6 +1772,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Loads all tables (with given names) from the database and creates a Table from them.
+     * @param tableNames
      */
     async loadTables(tableNames) {
         // if no tables given then no need to proceed
@@ -1647,7 +1806,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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" ` +
@@ -1707,13 +1866,11 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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_1.Table();
@@ -1805,7 +1962,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                             .replace("[]", "")
                             .toLowerCase();
                         tableColumn.type =
-                            this.connection.driver.normalizeType({
+                            this.dataSource.driver.normalizeType({
                                 type: type,
                             });
                     }
@@ -1837,7 +1994,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     const columnNames = anotherPrimaryConstraints.map((constraint) => constraint["column_name"]);
                     columnNames.push(dbColumn["column_name"]);
                     // build default primary key constraint name
-                    const pkName = this.connection.namingStrategy.primaryKeyName(table, columnNames);
+                    const pkName = this.dataSource.namingStrategy.primaryKeyName(table, columnNames);
                     // if primary key has user-defined constraint name, write it in table column
                     if (primaryConstraint["constraint_name"] !==
                         pkName) {
@@ -2026,6 +2183,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create table sql.
+     * @param table
+     * @param createForeignKeys
      */
     createTableSql(table, createForeignKeys) {
         const columnDefinitions = table.columns
@@ -2039,7 +2198,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 unique.columnNames[0] === column.name);
             if (!isUniqueExist)
                 table.uniques.push(new TableUnique_1.TableUnique({
-                    name: this.connection.namingStrategy.uniqueConstraintName(table, [column.name]),
+                    name: this.dataSource.namingStrategy.uniqueConstraintName(table, [column.name]),
                     columnNames: [column.name],
                 }));
         });
@@ -2047,7 +2206,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             .filter((index) => index.isUnique)
             .forEach((index) => {
             table.uniques.push(new TableUnique_1.TableUnique({
-                name: this.connection.namingStrategy.uniqueConstraintName(table, index.columnNames),
+                name: this.dataSource.namingStrategy.uniqueConstraintName(table, index.columnNames),
                 columnNames: index.columnNames,
             }));
         });
@@ -2056,7 +2215,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .map((unique) => {
                 const uniqueName = unique.name
                     ? unique.name
-                    : this.connection.namingStrategy.uniqueConstraintName(table, unique.columnNames);
+                    : this.dataSource.namingStrategy.uniqueConstraintName(table, unique.columnNames);
                 const columnNames = unique.columnNames
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
@@ -2070,7 +2229,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .map((check) => {
                 const checkName = check.name
                     ? check.name
-                    : this.connection.namingStrategy.checkConstraintName(table, check.expression);
+                    : this.dataSource.namingStrategy.checkConstraintName(table, check.expression);
                 return `CONSTRAINT "${checkName}" CHECK (${check.expression})`;
             })
                 .join(", ");
@@ -2083,7 +2242,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
                 if (!fk.name)
-                    fk.name = this.connection.namingStrategy.foreignKeyName(table, fk.columnNames, this.getTablePath(fk), fk.referencedColumnNames);
+                    fk.name = this.dataSource.namingStrategy.foreignKeyName(table, fk.columnNames, this.getTablePath(fk), fk.referencedColumnNames);
                 const referencedColumnNames = fk.referencedColumnNames
                     .map((columnName) => `"${columnName}"`)
                     .join(", ");
@@ -2101,7 +2260,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (primaryColumns.length > 0) {
             const primaryKeyName = primaryColumns[0].primaryKeyConstraintName
                 ? primaryColumns[0].primaryKeyConstraintName
-                : this.connection.namingStrategy.primaryKeyName(table, primaryColumns.map((column) => column.name));
+                : this.dataSource.namingStrategy.primaryKeyName(table, primaryColumns.map((column) => column.name));
             const columnNames = primaryColumns
                 .map((column) => `"${column.name}"`)
                 .join(", ");
@@ -2110,7 +2269,9 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         sql += `)`;
         table.columns
             .filter((it) => it.comment)
-            .forEach((it) => (sql += `; COMMENT ON COLUMN ${this.escapePath(table)}."${it.name}" IS ${this.escapeComment(it.comment)}`));
+            .forEach((it) => {
+            sql += `; COMMENT ON COLUMN ${this.escapePath(table)}."${it.name}" IS ${this.escapeComment(it.comment)}`;
+        });
         return new Query_1.Query(sql);
     }
     /**
@@ -2123,6 +2284,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop table sql.
+     * @param tableOrPath
      */
     dropTableSql(tableOrPath) {
         return new Query_1.Query(`DROP TABLE ${this.escapePath(tableOrPath)}`);
@@ -2133,7 +2295,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         else {
             return new Query_1.Query(`CREATE VIEW ${this.escapePath(view)} AS ${view
-                .expression(this.connection)
+                .expression(this.dataSource)
                 .getQuery()}`);
         }
     }
@@ -2145,7 +2307,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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_1.MetadataTableType.VIEW,
             schema: schema,
@@ -2155,12 +2317,14 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop view sql.
+     * @param viewOrPath
      */
     dropViewSql(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();
@@ -2176,17 +2340,21 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * 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);
@@ -2202,6 +2370,9 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create ENUM type sql.
+     * @param table
+     * @param column
+     * @param enumName
      */
     createEnumTypeSql(table, column, enumName) {
         if (!enumName)
@@ -2213,6 +2384,9 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create ENUM type sql.
+     * @param table
+     * @param column
+     * @param enumName
      */
     dropEnumTypeSql(table, column, enumName) {
         if (!enumName)
@@ -2222,6 +2396,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     /**
      * Builds create index sql.
      * UNIQUE indices creates as UNIQUE constraints.
+     * @param table
+     * @param index
      */
     createIndexSql(table, index) {
         const columns = index.columnNames
@@ -2231,21 +2407,27 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop index sql.
+     * @param table
+     * @param indexOrName
+     * @param ifExists
      */
-    dropIndexSql(table, indexOrName) {
+    dropIndexSql(table, indexOrName, ifExists) {
         const indexName = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName) ||
             InstanceChecker_1.InstanceChecker.isTableUnique(indexOrName)
             ? indexOrName.name
             : indexOrName;
-        return new Query_1.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(", ");
@@ -2253,19 +2435,23 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop primary key sql.
+     * @param table
+     * @param ifExists
      */
-    dropPrimaryKeySql(table) {
+    dropPrimaryKeySql(table, ifExists) {
         if (!table.primaryColumns.length)
             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_1.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
@@ -2275,6 +2461,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop unique constraint sql.
+     * @param table
+     * @param uniqueOrName
      */
     dropUniqueConstraintSql(table, uniqueOrName) {
         const uniqueName = InstanceChecker_1.InstanceChecker.isTableUnique(uniqueOrName)
@@ -2284,21 +2472,28 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create check constraint sql.
+     * @param table
+     * @param checkConstraint
      */
     createCheckConstraintSql(table, checkConstraint) {
         return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${checkConstraint.name}" CHECK (${checkConstraint.expression})`);
     }
     /**
      * Builds drop check constraint sql.
+     * @param table
+     * @param checkOrName
+     * @param ifExists
      */
-    dropCheckConstraintSql(table, checkOrName) {
+    dropCheckConstraintSql(table, checkOrName, ifExists) {
         const checkName = InstanceChecker_1.InstanceChecker.isTableCheck(checkOrName)
             ? checkOrName.name
             : checkOrName;
-        return new Query_1.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
@@ -2317,15 +2512,20 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop foreign key sql.
+     * @param table
+     * @param foreignKeyOrName
+     * @param ifExists
      */
-    dropForeignKeySql(table, foreignKeyOrName) {
+    dropForeignKeySql(table, foreignKeyOrName, ifExists) {
         const foreignKeyName = InstanceChecker_1.InstanceChecker.isTableForeignKey(foreignKeyOrName)
             ? foreignKeyOrName.name
             : foreignKeyOrName;
-        return new Query_1.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);
@@ -2342,6 +2542,11 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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);
@@ -2382,6 +2587,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Escapes a given comment so it's safe to include in a query.
+     * @param comment
      */
     escapeComment(comment) {
         if (comment === undefined || comment.length === 0) {
@@ -2392,6 +2598,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Escapes given table or view path.
+     * @param target
      */
     escapePath(target) {
         const { schema, tableName } = this.driver.parseTableName(target);
@@ -2402,6 +2609,8 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds a query for create column.
+     * @param table
+     * @param column
      */
     buildCreateColumnSql(table, column) {
         let c = '"' + column.name + '"';
@@ -2422,7 +2631,7 @@ class CockroachQueryRunner extends BaseQueryRunner_1.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"}`;
@@ -2443,11 +2652,12 @@ class CockroachQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Change table comment.
+     * @param tableOrName
+     * @param comment
      */
     changeTableComment(tableOrName, comment) {
         throw new error_1.TypeORMError(`cockroachdb driver does not support change table comment.`);
     }
 }
 exports.CockroachQueryRunner = CockroachQueryRunner;
-
-//# sourceMappingURL=CockroachQueryRunner.js.map
+//# sourceMappingURL=CockroachQueryRunner.js.map