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

package/driver/postgres/PostgresQueryRunner.js

@@ -19,6 +19,7 @@ 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 DriverUtils_1 = require("../DriverUtils");
 const Query_1 = require("../Query");
 const MetadataTableType_1 = require("../types/MetadataTableType");
@@ -32,7 +33,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     constructor(driver, mode) {
         super();
         this.driver = driver;
-        this.connection = driver.connection;
+        this.dataSource = driver.dataSource;
         this.mode = mode;
         this.broadcaster = new Broadcaster_1.Broadcaster(this);
     }
@@ -84,6 +85,7 @@ class PostgresQueryRunner 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 releasePostgresConnection(err) {
         if (this.isReleased) {
@@ -108,6 +110,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Starts transaction.
+     * @param isolationLevel
      */
     async startTransaction(isolationLevel) {
         this.isTransactionActive = true;
@@ -168,12 +171,15 @@ class PostgresQueryRunner 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();
         try {
@@ -186,7 +192,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, true, queryExecutionTime, raw, undefined);
             if (maxQueryExecutionTime &&
                 queryExecutionTime > maxQueryExecutionTime)
-                this.driver.connection.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
+                this.driver.dataSource.logger.logQuerySlow(queryExecutionTime, query, parameters, this);
             const result = new QueryResult_1.QueryResult();
             if (raw) {
                 if (raw.hasOwnProperty("rows")) {
@@ -211,7 +217,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             return result;
         }
         catch (err) {
-            this.driver.connection.logger.logQueryError(err, query, parameters, this);
+            this.driver.dataSource.logger.logQueryError(err, query, parameters, this);
             this.broadcaster.broadcastAfterQueryEvent(broadcasterResult, query, parameters, false, undefined, undefined, err);
             throw new QueryFailedError_1.QueryFailedError(query, parameters, err);
         }
@@ -221,13 +227,17 @@ class PostgresQueryRunner 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();
         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);
         const stream = databaseConnection.query(new QueryStream(query, parameters));
         if (onEnd)
             stream.on("end", onEnd);
@@ -244,15 +254,17 @@ class PostgresQueryRunner 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;
     }
     /**
@@ -264,9 +276,10 @@ class PostgresQueryRunner 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;
     }
     /**
@@ -278,84 +291,109 @@ class PostgresQueryRunner 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.
      * Note: Postgres does not support database creation inside a transaction block.
+     * @param database
+     * @param ifNotExists
      */
-    async createDatabase(database, ifNotExist) {
-        if (ifNotExist) {
+    async createDatabase(database, ifNotExists) {
+        if (ifNotExists) {
             const databaseAlreadyExists = await this.hasDatabase(database);
             if (databaseAlreadyExists)
                 return Promise.resolve();
         }
-        const up = `CREATE DATABASE "${database}"`;
-        const down = `DROP DATABASE "${database}"`;
+        const up = `CREATE DATABASE ${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.
      * Note: Postgres does not support database dropping inside a transaction block.
-     */
-    async dropDatabase(database, ifExist) {
-        const up = ifExist
-            ? `DROP DATABASE IF EXISTS "${database}"`
-            : `DROP DATABASE "${database}"`;
-        const down = `CREATE DATABASE "${database}"`;
+     * @param database
+     * @param ifExists
+     */
+    async dropDatabase(database, ifExists) {
+        const up = ifExists
+            ? `DROP DATABASE IF EXISTS ${this.driver.escape(database)}`
+            : `DROP DATABASE ${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();
@@ -410,28 +448,29 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             table.indices.forEach((index) => {
                 // new index may be passed without name. In this case we generate index name manually.
                 if (!index.name)
-                    index.name = this.connection.namingStrategy.indexName(table, index.columnNames, index.where);
+                    index.name = this.dataSource.namingStrategy.indexName(table, index.columnNames, index.where);
                 upQueries.push(this.createIndexSql(table, index));
                 downQueries.push(this.dropIndexSql(table, index));
             });
         }
         if (table.comment) {
-            upQueries.push(new Query_1.Query("COMMENT ON TABLE " +
-                this.escapePath(table) +
-                " IS '" +
-                table.comment +
-                "'"));
-            downQueries.push(new Query_1.Query("COMMENT ON TABLE " + this.escapePath(table) + " IS NULL"));
+            upQueries.push(new Query_1.Query(`COMMENT ON TABLE ${this.escapePath(table)}` +
+                ` IS ${this.escapeComment(table.comment)}`));
+            downQueries.push(new Query_1.Query(`COMMENT ON TABLE ${this.escapePath(table)}` + ` IS NULL`));
         }
         await this.executeQueries(upQueries, downQueries);
     }
     /**
      * 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();
@@ -480,6 +519,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new view.
+     * @param view
+     * @param syncWithMetadata
      */
     async createView(view, syncWithMetadata = false) {
         const upQueries = [];
@@ -494,20 +535,32 @@ class PostgresQueryRunner 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);
+        let view;
+        try {
+            view = await this.getCachedView(viewName);
+        }
+        catch {
+            if (ifExists)
+                return;
+            throw new error_1.TypeORMError(`View "${viewName}" does not exist.`);
+        }
+        await this.executeQueries([
+            await this.deleteViewDefinitionSql(view),
+            this.dropViewSql(view, ifExists),
+        ], [
+            await this.insertViewDefinitionSql(view),
+            this.createViewSql(view),
+        ]);
     }
     /**
      * Renames the given table.
+     * @param oldTableOrName
+     * @param newTableName
      */
     async renameTable(oldTableOrName, newTableName) {
         const upQueries = [];
@@ -526,8 +579,8 @@ class PostgresQueryRunner 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}"`));
         }
@@ -546,12 +599,12 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         });
         // 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}"`));
@@ -560,13 +613,13 @@ class PostgresQueryRunner 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}"`
@@ -581,12 +634,12 @@ class PostgresQueryRunner 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}"`));
@@ -607,6 +660,8 @@ class PostgresQueryRunner 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)
@@ -631,7 +686,7 @@ class PostgresQueryRunner 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(", ");
@@ -641,7 +696,7 @@ class PostgresQueryRunner 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(", ");
@@ -658,7 +713,7 @@ class PostgresQueryRunner 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);
@@ -698,6 +753,8 @@ class PostgresQueryRunner 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) {
@@ -706,6 +763,9 @@ class PostgresQueryRunner 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)
@@ -728,6 +788,9 @@ class PostgresQueryRunner 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)
@@ -773,12 +836,12 @@ class PostgresQueryRunner 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}"`));
                 }
@@ -796,14 +859,14 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 }
                 // 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}"`));
@@ -812,7 +875,7 @@ class PostgresQueryRunner 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;
@@ -820,7 +883,7 @@ class PostgresQueryRunner 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}"`
@@ -837,14 +900,14 @@ class PostgresQueryRunner 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}"`));
@@ -868,6 +931,12 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 (!OrmUtils_1.OrmUtils.isArraysEqual(newColumn.enum, oldColumn.enum) ||
                     newColumn.enumName !== oldColumn.enumName)) {
                 const arraySuffix = newColumn.isArray ? "[]" : "";
+                const { extraItems, missingItems } = OrmUtils_1.OrmUtils.getArraysDiff(newColumn.enum, oldColumn.enum);
+                const version = this.driver.version;
+                // when the only change is new enum value(s) we can use ADD VALUE syntax
+                const useAddValueForUp = VersionUtils_1.VersionUtils.isGreaterOrEqual(version, "12.0") &&
+                    missingItems.length === 0 &&
+                    extraItems.length > 0;
                 // "public"."new_enum"
                 const newEnumName = this.buildEnumName(table, newColumn);
                 // "public"."old_enum"
@@ -878,35 +947,51 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 const oldEnumNameWithSchema_old = this.buildEnumName(table, oldColumn, true, false, true);
                 //"old_enum_old"
                 const oldEnumNameWithoutSchema_old = this.buildEnumName(table, oldColumn, false, false, true);
-                // rename old ENUM
-                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));
-                // if column have default value, we must drop it to avoid issues with type casting
-                if (oldColumn.default !== null &&
-                    oldColumn.default !== undefined) {
-                    // mark default as changed to prevent double update
-                    defaultValueChanged = true;
-                    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}`));
+                // ADD VALUE allows us to just add new enum values without any type changes, but can of course only be used when only new values were added
+                if (useAddValueForUp) {
+                    // Add values for up - that's all we need
+                    for (const item of extraItems) {
+                        const escapedValue = item.replaceAll("'", "''");
+                        upQueries.push(new Query_1.Query(`ALTER TYPE ${oldEnumName} ADD VALUE '${escapedValue}'`));
+                    }
+                    // For down query, we're be doing the doing the same as normal enum change (create new type, alter column, drop old type)
+                    downQueries.push(new Query_1.Query(`ALTER TYPE ${oldEnumNameWithSchema_old} RENAME TO ${oldEnumNameWithoutSchema}`));
+                    downQueries.push(this.dropEnumTypeSql(table, newColumn, newEnumName));
+                    const downType = `${oldEnumNameWithSchema_old}${arraySuffix} USING "${newColumn.name}"::"text"::${oldEnumNameWithSchema_old}${arraySuffix}`;
+                    downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${downType}`));
+                    downQueries.push(this.createEnumTypeSql(table, oldColumn, oldEnumNameWithSchema_old));
                 }
-                // 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}`;
-                // update column to use new type
-                upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${upType}`));
-                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_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`));
+                else {
+                    // rename old ENUM
+                    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));
+                    // if column have default value, we must drop it to avoid issues with type casting
+                    if (oldColumn.default !== null &&
+                        oldColumn.default !== undefined) {
+                        // mark default as changed to prevent double update
+                        defaultValueChanged = true;
+                        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}`;
+                    // update column to use new type
+                    upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name}" TYPE ${upType}`));
+                    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_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));
+                    downQueries.push(this.createEnumTypeSql(table, oldColumn, oldEnumNameWithSchema_old));
                 }
-                // remove old ENUM
-                upQueries.push(this.dropEnumTypeSql(table, oldColumn, oldEnumNameWithSchema_old));
-                downQueries.push(this.createEnumTypeSql(table, oldColumn, oldEnumNameWithSchema_old));
             }
             if (oldColumn.isNullable !== newColumn.isNullable) {
                 if (newColumn.isNullable) {
@@ -928,7 +1013,7 @@ class PostgresQueryRunner 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(", ");
@@ -942,7 +1027,7 @@ class PostgresQueryRunner 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(", ");
@@ -960,7 +1045,7 @@ class PostgresQueryRunner 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(", ");
@@ -972,7 +1057,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             if (newColumn.isUnique !== oldColumn.isUnique) {
                 if (newColumn.isUnique === true) {
                     const uniqueConstraint = new TableUnique_1.TableUnique({
-                        name: this.connection.namingStrategy.uniqueConstraintName(table, [newColumn.name]),
+                        name: this.dataSource.namingStrategy.uniqueConstraintName(table, [newColumn.name]),
                         columnNames: [newColumn.name],
                     });
                     clonedTable.uniques.push(uniqueConstraint);
@@ -1109,6 +1194,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param changedColumns
      */
     async changeColumns(tableOrName, changedColumns) {
         for (const { oldColumn, newColumn } of changedColumns) {
@@ -1117,16 +1204,22 @@ class PostgresQueryRunner 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 = [];
@@ -1134,7 +1227,7 @@ class PostgresQueryRunner 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(", ");
@@ -1148,7 +1241,7 @@ class PostgresQueryRunner 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(", ");
@@ -1181,7 +1274,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             upQueries.push(this.dropUniqueConstraintSql(table, columnUnique));
             downQueries.push(this.createUniqueConstraintSql(table, columnUnique));
         }
-        upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN "${column.name}"`));
+        const ifExistsClause = ifExists ? "IF EXISTS " : "";
+        upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP COLUMN ${ifExistsClause}"${column.name}"`));
         downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD ${this.buildCreateColumnSql(table, column)}`));
         // drop enum type
         if (column.type === "enum" || column.type === "simple-enum") {
@@ -1221,14 +1315,20 @@ class PostgresQueryRunner 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)
@@ -1247,6 +1347,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Updates composite primary keys.
+     * @param tableOrName
+     * @param columns
      */
     async updatePrimaryKeys(tableOrName, columns) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1261,7 +1363,7 @@ class PostgresQueryRunner 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(", ");
@@ -1271,10 +1373,12 @@ class PostgresQueryRunner 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(", ");
@@ -1285,12 +1389,15 @@ class PostgresQueryRunner 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) => {
@@ -1299,6 +1406,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates new unique constraint.
+     * @param tableOrName
+     * @param uniqueConstraint
      */
     async createUniqueConstraint(tableOrName, uniqueConstraint) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1307,7 +1416,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // new unique constraint may be passed without name. In this case we generate unique name manually.
         if (!uniqueConstraint.name)
             uniqueConstraint.name =
-                this.connection.namingStrategy.uniqueConstraintName(table, uniqueConstraint.columnNames);
+                this.dataSource.namingStrategy.uniqueConstraintName(table, uniqueConstraint.columnNames);
         const up = this.createUniqueConstraintSql(table, uniqueConstraint);
         const down = this.dropUniqueConstraintSql(table, uniqueConstraint);
         await this.executeQueries(up, down);
@@ -1315,6 +1424,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates new unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
      */
     async createUniqueConstraints(tableOrName, uniqueConstraints) {
         for (const uniqueConstraint of uniqueConstraints) {
@@ -1323,31 +1434,42 @@ class PostgresQueryRunner 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}`);
-        const up = this.dropUniqueConstraintSql(table, uniqueConstraint);
+        }
+        const up = this.dropUniqueConstraintSql(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)
@@ -1356,7 +1478,7 @@ class PostgresQueryRunner 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);
@@ -1364,6 +1486,8 @@ class PostgresQueryRunner 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));
@@ -1371,30 +1495,41 @@ class PostgresQueryRunner 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) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1403,7 +1538,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // new unique constraint may be passed without name. In this case we generate unique name manually.
         if (!exclusionConstraint.name)
             exclusionConstraint.name =
-                this.connection.namingStrategy.exclusionConstraintName(table, exclusionConstraint.expression);
+                this.dataSource.namingStrategy.exclusionConstraintName(table, exclusionConstraint.expression);
         const up = this.createExclusionConstraintSql(table, exclusionConstraint);
         const down = this.dropExclusionConstraintSql(table, exclusionConstraint);
         await this.executeQueries(up, down);
@@ -1411,6 +1546,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates new exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
      */
     async createExclusionConstraints(tableOrName, exclusionConstraints) {
         const promises = exclusionConstraints.map((exclusionConstraint) => this.createExclusionConstraint(tableOrName, exclusionConstraint));
@@ -1418,30 +1555,41 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops exclusion constraint.
+     * @param tableOrName
+     * @param exclusionOrName
+     * @param ifExists
      */
-    async dropExclusionConstraint(tableOrName, exclusionOrName) {
+    async dropExclusionConstraint(tableOrName, exclusionOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const exclusionConstraint = InstanceChecker_1.InstanceChecker.isTableExclusion(exclusionOrName)
             ? exclusionOrName
             : table.exclusions.find((c) => c.name === exclusionOrName);
-        if (!exclusionConstraint)
+        if (!exclusionConstraint) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied exclusion constraint was not found in table ${table.name}`);
-        const up = this.dropExclusionConstraintSql(table, exclusionConstraint);
+        }
+        const up = this.dropExclusionConstraintSql(table, exclusionConstraint, ifExists);
         const down = this.createExclusionConstraintSql(table, exclusionConstraint);
         await this.executeQueries(up, down);
         table.removeExclusionConstraint(exclusionConstraint);
     }
     /**
      * Drops exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
+     * @param ifExists
      */
-    async dropExclusionConstraints(tableOrName, exclusionConstraints) {
-        const promises = exclusionConstraints.map((exclusionConstraint) => this.dropExclusionConstraint(tableOrName, exclusionConstraint));
+    async dropExclusionConstraints(tableOrName, exclusionConstraints, ifExists) {
+        const promises = exclusionConstraints.map((exclusionConstraint) => this.dropExclusionConstraint(tableOrName, exclusionConstraint, ifExists));
         await Promise.all(promises);
     }
     /**
      * Creates a new foreign key.
+     * @param tableOrName
+     * @param foreignKey
      */
     async createForeignKey(tableOrName, foreignKey) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -1449,7 +1597,7 @@ class PostgresQueryRunner 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);
@@ -1457,6 +1605,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new foreign keys.
+     * @param tableOrName
+     * @param foreignKeys
      */
     async createForeignKeys(tableOrName, foreignKeys) {
         for (const foreignKey of foreignKeys) {
@@ -1465,34 +1615,45 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a foreign key from the table.
+     * @param tableOrName
+     * @param foreignKeyOrName
+     * @param ifExists
      */
-    async dropForeignKey(tableOrName, foreignKeyOrName) {
+    async dropForeignKey(tableOrName, foreignKeyOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const foreignKey = InstanceChecker_1.InstanceChecker.isTableForeignKey(foreignKeyOrName)
             ? foreignKeyOrName
             : table.foreignKeys.find((fk) => fk.name === foreignKeyOrName);
-        if (!foreignKey)
+        if (!foreignKey) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied foreign key was not found in table ${table.name}`);
+        }
         if (!foreignKey.name) {
-            foreignKey.name = this.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.dropForeignKeySql(table, foreignKey);
+        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)
@@ -1508,6 +1669,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Create a new view index.
+     * @param viewOrName
+     * @param index
      */
     async createViewIndex(viewOrName, index) {
         const view = InstanceChecker_1.InstanceChecker.isView(viewOrName)
@@ -1523,6 +1686,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new indices
+     * @param tableOrName
+     * @param indices
      */
     async createIndices(tableOrName, indices) {
         for (const index of indices) {
@@ -1531,6 +1696,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates new view indices
+     * @param viewOrName
+     * @param indices
      */
     async createViewIndices(viewOrName, indices) {
         for (const index of indices) {
@@ -1539,26 +1706,34 @@ class PostgresQueryRunner 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 index from a view.
+     * @param viewOrName
+     * @param indexOrName
      */
     async dropViewIndex(viewOrName, indexOrName) {
         const view = InstanceChecker_1.InstanceChecker.isView(viewOrName)
@@ -1579,62 +1754,74 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * 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 {
             // drop views
-            const selectViewDropsQuery = `SELECT 'DROP VIEW IF EXISTS "' || schemaname || '"."' || viewname || '" CASCADE;' as "query" ` +
-                `FROM "pg_views" WHERE "schemaname" IN (${schemaNamesString}) AND "viewname" NOT IN ('geography_columns', 'geometry_columns', 'raster_columns', 'raster_overviews')`;
-            const dropViewQueries = await this.query(selectViewDropsQuery);
-            await Promise.all(dropViewQueries.map((q) => this.query(q["query"])));
+            const views = await this.query(`SELECT quote_ident(schemaname) || '.' || quote_ident(viewname) as "name" ` +
+                `FROM "pg_views" WHERE "schemaname" = ANY($1) AND "viewname" NOT IN ('geography_columns', 'geometry_columns', 'raster_columns', 'raster_overviews')`, [schemas]);
+            if (views.length > 0) {
+                await this.query(`DROP VIEW IF EXISTS ${views.map(({ name }) => name).join(", ")} CASCADE`);
+            }
             // drop materialized views
             // Note: materialized views introduced in Postgres 9.3
             if (DriverUtils_1.DriverUtils.isReleaseVersionOrGreater(this.driver, "9.3")) {
-                const selectMatViewDropsQuery = `SELECT 'DROP MATERIALIZED VIEW IF EXISTS "' || schemaname || '"."' || matviewname || '" CASCADE;' as "query" ` +
-                    `FROM "pg_matviews" WHERE "schemaname" IN (${schemaNamesString})`;
-                const dropMatViewQueries = await this.query(selectMatViewDropsQuery);
-                await Promise.all(dropMatViewQueries.map((q) => this.query(q["query"])));
+                const matViews = await this.query(`SELECT quote_ident(schemaname) || '.' || quote_ident(matviewname) as "name" ` +
+                    `FROM "pg_matviews" WHERE "schemaname" = ANY($1)`, [schemas]);
+                if (matViews.length > 0) {
+                    await this.query(`DROP MATERIALIZED VIEW IF EXISTS ${matViews.map(({ name }) => name).join(", ")} CASCADE`);
+                }
             }
             // ignore spatial_ref_sys; it's a special table supporting PostGIS
             // TODO generalize this as this.driver.ignoreTables
             // drop tables
-            const selectTableDropsQuery = `SELECT 'DROP TABLE IF EXISTS "' || schemaname || '"."' || tablename || '" CASCADE;' as "query" FROM "pg_tables" WHERE "schemaname" IN (${schemaNamesString}) AND "tablename" NOT IN ('spatial_ref_sys')`;
-            const dropTableQueries = await this.query(selectTableDropsQuery);
-            await Promise.all(dropTableQueries.map((q) => this.query(q["query"])));
+            const tables = await this.query(`SELECT quote_ident(schemaname) || '.' || quote_ident(tablename) as "name" ` +
+                `FROM "pg_tables" WHERE "schemaname" = ANY($1) AND "tablename" NOT IN ('spatial_ref_sys')`, [schemas]);
+            if (tables.length > 0) {
+                await this.query(`DROP TABLE IF EXISTS ${tables.map(({ name }) => name).join(", ")} CASCADE`);
+            }
             // drop enum types
-            await this.dropEnumTypes(schemaNamesString);
+            await this.dropEnumTypes(schemas);
             if (!isAnotherTransactionActive) {
                 await this.commitTransaction();
             }
@@ -1690,13 +1877,14 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .join(" OR ");
         const indicesSql = `SELECT "ns"."nspname" AS "table_schema", "t"."relname" AS "table_name", "i"."relname" AS "constraint_name", "a"."attname" AS "column_name", ` +
             `CASE "ix"."indisunique" WHEN 't' THEN 'TRUE' ELSE'FALSE' END AS "is_unique", pg_get_expr("ix"."indpred", "ix"."indrelid") AS "condition", ` +
-            `"types"."typname" AS "type_name" ` +
+            `"types"."typname" AS "type_name", "am"."amname" AS "index_type" ` +
             `FROM "pg_class" "t" ` +
             `INNER JOIN "pg_index" "ix" ON "ix"."indrelid" = "t"."oid" ` +
             `INNER JOIN "pg_attribute" "a" ON "a"."attrelid" = "t"."oid"  AND "a"."attnum" = ANY ("ix"."indkey") ` +
             `INNER JOIN "pg_namespace" "ns" ON "ns"."oid" = "t"."relnamespace" ` +
             `INNER JOIN "pg_class" "i" ON "i"."oid" = "ix"."indexrelid" ` +
             `INNER JOIN "pg_type" "types" ON "types"."oid" = "a"."atttypid" ` +
+            `INNER JOIN "pg_am" "am" ON "i"."relam" = "am"."oid" ` +
             `LEFT JOIN "pg_constraint" "cnst" ON "cnst"."conname" = "i"."relname" ` +
             `WHERE "t"."relkind" IN ('m') AND "cnst"."contype" IS NULL AND (${constraintsCondition})`;
         const query = `SELECT "t".* FROM ${this.escapePath(this.getTypeormMetadataTableName())} "t" ` +
@@ -1735,7 +1923,9 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     columnNames: indices.map((i) => i["column_name"]),
                     isUnique: constraint["is_unique"] === "TRUE",
                     where: constraint["condition"],
+                    isSpatial: constraint["index_type"] === "gist",
                     isFulltext: false,
+                    type: constraint["index_type"],
                 });
             });
             return view;
@@ -1743,6 +1933,7 @@ class PostgresQueryRunner 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
@@ -1753,7 +1944,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const currentDatabase = await this.getCurrentDatabase();
         const dbTables = [];
         if (!tableNames) {
-            const tablesSql = `SELECT "table_schema", "table_name", obj_description(('"' || "table_schema" || '"."' || "table_name" || '"')::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables"`;
+            const tablesSql = `SELECT "table_schema", "table_name", obj_description((quote_ident("table_schema") || '.' || quote_ident("table_name"))::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables"`;
             dbTables.push(...(await this.query(tablesSql)));
         }
         else {
@@ -1763,7 +1954,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 return `("table_schema" = '${schema || currentSchema}' AND "table_name" = '${tableName}')`;
             })
                 .join(" OR ");
-            const tablesSql = `SELECT "table_schema", "table_name", obj_description(('"' || "table_schema" || '"."' || "table_name" || '"')::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables" WHERE ` +
+            const tablesSql = `SELECT "table_schema", "table_name", obj_description((quote_ident("table_schema") || '.' || quote_ident("table_name"))::regclass, 'pg_class') AS table_comment FROM "information_schema"."tables" WHERE ` +
                 tablesCondition;
             dbTables.push(...(await this.query(tablesSql)));
         }
@@ -1781,7 +1972,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             return `("table_schema" = '${table_schema}' AND "table_name" = '${table_name}')`;
         })
             .join(" OR ");
-        const columnsSql = `SELECT columns.*, pg_catalog.col_description(('"' || table_catalog || '"."' || table_schema || '"."' || table_name || '"')::regclass::oid, ordinal_position) AS description, ` +
+        const columnsSql = `SELECT columns.*, pg_catalog.col_description((quote_ident(table_catalog) || '.' || quote_ident(table_schema) || '.' || quote_ident(table_name))::regclass::oid, ordinal_position) AS description, ` +
             `('"' || "udt_schema" || '"."' || "udt_name" || '"')::"regtype"::text AS "regtype", pg_catalog.format_type("col_attr"."atttypid", "col_attr"."atttypmod") AS "format_type" ` +
             `FROM "information_schema"."columns" ` +
             `LEFT JOIN "pg_catalog"."pg_attribute" AS "col_attr" ON "col_attr"."attname" = "columns"."column_name" ` +
@@ -1845,12 +2036,10 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             `INNER JOIN "pg_class" "cl" ON "cl"."oid" = "con"."confrelid" ${isPartitionCondition}` +
             `INNER JOIN "pg_namespace" "ns" ON "cl"."relnamespace" = "ns"."oid" ` +
             `INNER JOIN "pg_attribute" "att2" ON "att2"."attrelid" = "con"."conrelid" AND "att2"."attnum" = "con"."parent"`;
-        const [dbColumns, dbConstraints, dbIndices, dbForeignKeys,] = await Promise.all([
-            this.query(columnsSql),
-            this.query(constraintsSql),
-            this.query(indicesSql),
-            this.query(foreignKeysSql),
-        ]);
+        const dbColumns = await this.query(columnsSql);
+        const dbConstraints = await this.query(constraintsSql);
+        const dbIndices = await this.query(indicesSql);
+        const dbForeignKeys = await this.query(foreignKeysSql);
         // create tables for loaded tables
         return Promise.all(dbTables.map(async (dbTable) => {
             const table = new Table_1.Table();
@@ -1958,7 +2147,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         tableColumn.isArray = true;
                         const type = tableColumn.type.replace("[]", "");
                         tableColumn.type =
-                            this.connection.driver.normalizeType({
+                            this.dataSource.driver.normalizeType({
                                 type: type,
                             });
                     }
@@ -2016,7 +2205,7 @@ class PostgresQueryRunner 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) {
@@ -2204,6 +2393,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     isUnique: constraint["is_unique"] === "TRUE",
                     where: constraint["condition"],
                     isSpatial: constraint["index_type"] === "gist",
+                    type: constraint["index_type"],
                     isFulltext: false,
                 });
             });
@@ -2212,6 +2402,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create table sql.
+     * @param table
+     * @param createForeignKeys
      */
     createTableSql(table, createForeignKeys) {
         const columnDefinitions = table.columns
@@ -2225,7 +2417,7 @@ class PostgresQueryRunner 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],
                 }));
         });
@@ -2234,7 +2426,7 @@ class PostgresQueryRunner 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(", ");
@@ -2251,7 +2443,7 @@ class PostgresQueryRunner 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(", ");
@@ -2262,8 +2454,11 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .map((exclusion) => {
                 const exclusionName = exclusion.name
                     ? exclusion.name
-                    : this.connection.namingStrategy.exclusionConstraintName(table, exclusion.expression);
-                return `CONSTRAINT "${exclusionName}" EXCLUDE ${exclusion.expression}`;
+                    : this.dataSource.namingStrategy.exclusionConstraintName(table, exclusion.expression);
+                let constraint = `CONSTRAINT "${exclusionName}" EXCLUDE ${exclusion.expression}`;
+                if (exclusion.deferrable)
+                    constraint += ` DEFERRABLE ${exclusion.deferrable}`;
+                return constraint;
             })
                 .join(", ");
             sql += `, ${exclusionsSql}`;
@@ -2275,7 +2470,7 @@ class PostgresQueryRunner 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(", ");
@@ -2295,7 +2490,7 @@ class PostgresQueryRunner 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(", ");
@@ -2304,7 +2499,9 @@ class PostgresQueryRunner 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);
     }
     /**
@@ -2325,6 +2522,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop table sql.
+     * @param tableOrPath
      */
     dropTableSql(tableOrPath) {
         return new Query_1.Query(`DROP TABLE ${this.escapePath(tableOrPath)}`);
@@ -2337,7 +2535,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         else {
             return new Query_1.Query(`CREATE ${materializedClause}VIEW ${viewName} AS ${view
-                .expression(this.connection)
+                .expression(this.dataSource)
                 .getQuery()}`);
         }
     }
@@ -2352,7 +2550,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : MetadataTableType_1.MetadataTableType.VIEW;
         const expression = typeof view.expression === "string"
             ? view.expression.trim()
-            : view.expression(this.connection).getQuery();
+            : view.expression(this.dataSource).getQuery();
         return this.insertTypeormMetadataSql({
             type,
             schema,
@@ -2362,13 +2560,17 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop view sql.
+     * @param view
+     * @param ifExists
      */
-    dropViewSql(view) {
+    dropViewSql(view, ifExists) {
         const materializedClause = view.materialized ? "MATERIALIZED " : "";
-        return new Query_1.Query(`DROP ${materializedClause}VIEW ${this.escapePath(view)}`);
+        const ifExistsClause = ifExists ? "IF EXISTS " : "";
+        return new Query_1.Query(`DROP ${materializedClause}VIEW ${ifExistsClause}${this.escapePath(view)}`);
     }
     /**
      * Builds remove view sql.
+     * @param view
      */
     async deleteViewDefinitionSql(view) {
         const currentSchema = await this.getCurrentSchema();
@@ -2383,17 +2585,21 @@ class PostgresQueryRunner 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 || '" CASCADE;' 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" = ANY($1) GROUP BY "n"."nspname", "t"."typname"`, [schemaNames]);
+        if (enums.length > 0) {
+            await this.query(`DROP TYPE IF EXISTS ${enums.map(({ name }) => name).join(", ")} CASCADE`);
+        }
     }
     /**
      * 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);
@@ -2409,6 +2615,9 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create ENUM type sql.
+     * @param table
+     * @param column
+     * @param enumName
      */
     createEnumTypeSql(table, column, enumName) {
         if (!enumName)
@@ -2420,52 +2629,77 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * 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_1.Query(`DROP TYPE ${enumName}`);
     }
+    /**
+     * Builds the SQL `USING <index_type>` clause based on the index type, prioritizing `isSpatial` as `GiST`.
+     */
+    buildIndexTypeClause(index) {
+        const type = index.isSpatial ? "gist" : index.type;
+        if (typeof type !== "string")
+            return null;
+        return `USING ${type}`;
+    }
     /**
      * Builds create index sql.
+     * @param table
+     * @param index
      */
     createIndexSql(table, index) {
+        const indexTypeClause = this.buildIndexTypeClause(index);
         const columns = index.columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
-        return new Query_1.Query(`CREATE ${index.isUnique ? "UNIQUE " : ""}INDEX${index.isConcurrent ? " CONCURRENTLY" : ""} "${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.isConcurrent ? " CONCURRENTLY" : ""} "${index.name}" ON ${this.escapePath(table)} ${indexTypeClause ?? ""} (${columns}) ${index.where ? "WHERE " + index.where : ""}`);
     }
     /**
      * Builds create view index sql.
+     * @param view
+     * @param index
      */
     createViewIndexSql(view, index) {
+        const indexTypeClause = this.buildIndexTypeClause(index);
         const columns = index.columnNames
             .map((columnName) => `"${columnName}"`)
             .join(", ");
-        return new Query_1.Query(`CREATE ${index.isUnique ? "UNIQUE " : ""}INDEX "${index.name}" ON ${this.escapePath(view)} (${columns}) ${index.where ? "WHERE " + index.where : ""}`);
+        return new Query_1.Query(`CREATE ${index.isUnique ? "UNIQUE " : ""}INDEX "${index.name}" ON ${this.escapePath(view)} ${indexTypeClause ?? ""} (${columns}) ${index.where ? "WHERE " + index.where : ""}`);
     }
     /**
      * Builds drop index sql.
+     * @param table
+     * @param indexOrName
+     * @param ifExists
      */
-    dropIndexSql(table, indexOrName) {
+    dropIndexSql(table, indexOrName, ifExists) {
         const indexName = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName)
             ? indexOrName.name
             : indexOrName;
         const concurrent = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName)
             ? indexOrName.isConcurrent
             : false;
+        const ifExistsClause = ifExists ? "IF EXISTS " : "";
         const { schema } = this.driver.parseTableName(table);
         return schema
-            ? new Query_1.Query(`DROP INDEX ${concurrent ? "CONCURRENTLY " : ""}"${schema}"."${indexName}"`)
-            : new Query_1.Query(`DROP INDEX ${concurrent ? "CONCURRENTLY " : ""}"${indexName}"`);
+            ? new Query_1.Query(`DROP INDEX ${concurrent ? "CONCURRENTLY " : ""}${ifExistsClause}"${schema}"."${indexName}"`)
+            : new Query_1.Query(`DROP INDEX ${concurrent ? "CONCURRENTLY " : ""}${ifExistsClause}"${indexName}"`);
     }
     /**
      * 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(", ");
@@ -2473,19 +2707,24 @@ class PostgresQueryRunner 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);
+        const ifExistsClause = ifExists ? "IF EXISTS " : "";
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT ${ifExistsClause}"${primaryKeyName}"`);
     }
     /**
      * Builds create unique constraint sql.
+     * @param table
+     * @param uniqueConstraint
      */
     createUniqueConstraintSql(table, uniqueConstraint) {
         const columnNames = uniqueConstraint.columnNames
@@ -2498,45 +2737,66 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop unique constraint sql.
+     * @param table
+     * @param uniqueOrName
+     * @param ifExists
      */
-    dropUniqueConstraintSql(table, uniqueOrName) {
+    dropUniqueConstraintSql(table, uniqueOrName, ifExists) {
         const uniqueName = InstanceChecker_1.InstanceChecker.isTableUnique(uniqueOrName)
             ? uniqueOrName.name
             : uniqueOrName;
-        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${uniqueName}"`);
+        const ifExistsClause = ifExists ? "IF EXISTS " : "";
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT ${ifExistsClause}"${uniqueName}"`);
     }
     /**
      * 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}"`);
+        const ifExistsClause = ifExists ? "IF EXISTS " : "";
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT ${ifExistsClause}"${checkName}"`);
     }
     /**
      * Builds create exclusion constraint sql.
+     * @param table
+     * @param exclusionConstraint
      */
     createExclusionConstraintSql(table, exclusionConstraint) {
-        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${exclusionConstraint.name}" EXCLUDE ${exclusionConstraint.expression}`);
+        let sql = `ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT "${exclusionConstraint.name}" EXCLUDE ${exclusionConstraint.expression}`;
+        if (exclusionConstraint.deferrable)
+            sql += ` DEFERRABLE ${exclusionConstraint.deferrable}`;
+        return new Query_1.Query(sql);
     }
     /**
      * Builds drop exclusion constraint sql.
+     * @param table
+     * @param exclusionOrName
+     * @param ifExists
      */
-    dropExclusionConstraintSql(table, exclusionOrName) {
+    dropExclusionConstraintSql(table, exclusionOrName, ifExists) {
         const exclusionName = InstanceChecker_1.InstanceChecker.isTableExclusion(exclusionOrName)
             ? exclusionOrName.name
             : exclusionOrName;
-        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT "${exclusionName}"`);
+        const ifExistsClause = ifExists ? "IF EXISTS " : "";
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT ${ifExistsClause}"${exclusionName}"`);
     }
     /**
      * Builds create foreign key sql.
+     * @param table
+     * @param foreignKey
      */
     createForeignKeySql(table, foreignKey) {
         const columnNames = foreignKey.columnNames
@@ -2557,15 +2817,21 @@ class PostgresQueryRunner 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}"`);
+        const ifExistsClause = ifExists ? "IF EXISTS " : "";
+        return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP CONSTRAINT ${ifExistsClause}"${foreignKeyName}"`);
     }
     /**
      * Builds sequence name from given table and column.
+     * @param table
+     * @param columnOrName
      */
     buildSequenceName(table, columnOrName) {
         const { tableName } = this.driver.parseTableName(table);
@@ -2573,7 +2839,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             ? columnOrName.name
             : columnOrName;
         let seqName = `${tableName}_${columnName}_seq`;
-        if (seqName.length > this.connection.driver.maxAliasLength) {
+        if (seqName.length > this.dataSource.driver.maxAliasLength) {
             // note doesn't yet handle corner cases where .length differs from number of UTF-8 bytes
             seqName = `${tableName.substring(0, 29)}_${columnName.substring(0, Math.max(29, 63 - table.name.length - 5))}_seq`;
         }
@@ -2587,6 +2853,11 @@ class PostgresQueryRunner 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);
@@ -2627,6 +2898,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Escapes a given comment so it's safe to include in a query.
+     * @param comment
      */
     escapeComment(comment) {
         if (!comment || comment.length === 0) {
@@ -2637,6 +2909,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Escapes given table or view path.
+     * @param target
      */
     escapePath(target) {
         const { schema, tableName } = this.driver.parseTableName(target);
@@ -2648,6 +2921,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     /**
      * Get the table name with table schema
      * Note: Without ' or "
+     * @param target
      */
     async getTableNameWithSchema(target) {
         const tableName = InstanceChecker_1.InstanceChecker.isTable(target) ? target.name : target;
@@ -2662,6 +2936,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds a query for create column.
+     * @param table
+     * @param column
      */
     buildCreateColumnSql(table, column) {
         let c = '"' + column.name + '"';
@@ -2690,7 +2966,7 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 c += " array";
         }
         else if (!column.isGenerated || column.type === "uuid") {
-            c += " " + this.connection.driver.createFullType(column);
+            c += " " + this.dataSource.driver.createFullType(column);
         }
         // Postgres only supports the stored generated column type
         if (column.generatedType === "STORED" && column.asExpression) {
@@ -2719,6 +2995,8 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Change table comment.
+     * @param tableOrName
+     * @param newComment
      */
     async changeTableComment(tableOrName, newComment) {
         const upQueries = [];
@@ -2726,19 +3004,19 @@ class PostgresQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
-        newComment = this.escapeComment(newComment);
-        const comment = this.escapeComment(table.comment);
-        if (newComment === comment) {
+        const escapedNewComment = this.escapeComment(newComment);
+        const escapedComment = this.escapeComment(table.comment);
+        if (escapedNewComment === escapedComment) {
             return;
         }
         const newTable = table.clone();
-        upQueries.push(new Query_1.Query(`COMMENT ON TABLE ${this.escapePath(newTable)} IS ${newComment}`));
-        downQueries.push(new Query_1.Query(`COMMENT ON TABLE ${this.escapePath(table)} IS ${comment}`));
+        newTable.comment = newComment;
+        upQueries.push(new Query_1.Query(`COMMENT ON TABLE ${this.escapePath(newTable)} IS ${escapedNewComment}`));
+        downQueries.push(new Query_1.Query(`COMMENT ON TABLE ${this.escapePath(table)} IS ${escapedComment}`));
         await this.executeQueries(upQueries, downQueries);
         table.comment = newTable.comment;
         this.replaceCachedTable(table, newTable);
     }
 }
 exports.PostgresQueryRunner = PostgresQueryRunner;
-
-//# sourceMappingURL=PostgresQueryRunner.js.map
+//# sourceMappingURL=PostgresQueryRunner.js.map