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

package/driver/aurora-mysql/AuroraMysqlQueryRunner.js

@@ -27,7 +27,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     constructor(driver, client) {
         super();
         this.driver = driver;
-        this.connection = driver.connection;
+        this.dataSource = driver.dataSource;
         this.client = client;
         this.broadcaster = new Broadcaster_1.Broadcaster(this);
     }
@@ -53,6 +53,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Starts transaction on the current connection.
+     * @param isolationLevel
      */
     async startTransaction(isolationLevel) {
         this.isTransactionActive = true;
@@ -110,6 +111,9 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Executes a raw SQL query.
+     * @param query
+     * @param parameters
+     * @param useStructuredResult
      */
     async query(query, parameters, useStructuredResult = false) {
         if (this.isReleased)
@@ -130,6 +134,10 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Returns raw data stream.
+     * @param query
+     * @param parameters
+     * @param onEnd
+     * @param onError
      */
     stream(query, parameters, onEnd, onError) {
         if (this.isReleased)
@@ -158,15 +166,17 @@ class AuroraMysqlQueryRunner 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) {
         throw new error_1.TypeORMError(`MySql driver does not support table schemas`);
     }
     /**
      * Checks if database with the given name exist.
+     * @param database
      */
     async hasDatabase(database) {
-        const result = await this.query(`SELECT * FROM \`INFORMATION_SCHEMA\`.\`SCHEMATA\` WHERE \`SCHEMA_NAME\` = '${database}'`);
+        const result = await this.query(`SELECT * FROM \`INFORMATION_SCHEMA\`.\`SCHEMATA\` WHERE \`SCHEMA_NAME\` = ?`, [database]);
         return result.length ? true : false;
     }
     /**
@@ -178,6 +188,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Checks if schema with the given name exist.
+     * @param schema
      */
     async hasSchema(schema) {
         throw new error_1.TypeORMError(`MySql driver does not support table schemas`);
@@ -191,62 +202,83 @@ class AuroraMysqlQueryRunner 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);
-        const sql = `SELECT * FROM \`INFORMATION_SCHEMA\`.\`COLUMNS\` WHERE \`TABLE_SCHEMA\` = '${parsedTableName.database}' AND \`TABLE_NAME\` = '${parsedTableName.tableName}'`;
-        const result = await this.query(sql);
+        const sql = `SELECT * FROM \`INFORMATION_SCHEMA\`.\`COLUMNS\` WHERE \`TABLE_SCHEMA\` = ? AND \`TABLE_NAME\` = ?`;
+        const result = await this.query(sql, [
+            parsedTableName.database,
+            parsedTableName.tableName,
+        ]);
         return result.length ? true : false;
     }
     /**
      * Checks if column with the given name exist in the given table.
+     * @param tableOrName
+     * @param column
      */
     async hasColumn(tableOrName, column) {
         const parsedTableName = this.driver.parseTableName(tableOrName);
         const columnName = InstanceChecker_1.InstanceChecker.isTableColumn(column)
             ? column.name
             : column;
-        const sql = `SELECT * FROM \`INFORMATION_SCHEMA\`.\`COLUMNS\` WHERE \`TABLE_SCHEMA\` = '${parsedTableName.database}' 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\` = ? AND \`TABLE_NAME\` = ? AND \`COLUMN_NAME\` = ?`;
+        const result = await this.query(sql, [
+            parsedTableName.database,
+            parsedTableName.tableName,
+            columnName,
+        ]);
         return result.length ? true : false;
     }
     /**
      * Creates a new database.
-     */
-    async createDatabase(database, ifNotExist) {
-        const up = ifNotExist
-            ? `CREATE DATABASE IF NOT EXISTS \`${database}\``
-            : `CREATE DATABASE \`${database}\``;
-        const down = `DROP DATABASE \`${database}\``;
+     * @param database
+     * @param ifNotExists
+     */
+    async createDatabase(database, ifNotExists) {
+        const up = ifNotExists
+            ? `CREATE DATABASE IF NOT EXISTS ${this.driver.escape(database)}`
+            : `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.
-     */
-    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) {
         throw new error_1.TypeORMError(`Schema create queries are not supported by MySql driver.`);
     }
     /**
      * Drops table schema.
+     * @param schemaPath
+     * @param ifExists
      */
-    async dropSchema(schemaPath, ifExist) {
+    async dropSchema(schemaPath, ifExists) {
         throw new error_1.TypeORMError(`Schema drop queries are not supported by MySql driver.`);
     }
     /**
      * Creates a new table.
+     * @param table
+     * @param ifNotExists
+     * @param createForeignKeys
      */
-    async createTable(table, ifNotExist = false, createForeignKeys = true) {
-        if (ifNotExist) {
+    async createTable(table, ifNotExists = false, createForeignKeys = true) {
+        if (ifNotExists) {
             const isTableExist = await this.hasTable(table);
             if (isTableExist)
                 return Promise.resolve();
@@ -268,11 +300,14 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drop the table.
+     * @param target
+     * @param ifExists
+     * @param dropForeignKeys
      */
-    async dropTable(target, ifExist, dropForeignKeys = true) {
+    async dropTable(target, ifExists, dropForeignKeys = 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();
@@ -292,6 +327,8 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new view.
+     * @param view
+     * @param syncWithMetadata
      */
     async createView(view, syncWithMetadata = false) {
         const upQueries = [];
@@ -306,20 +343,24 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops the view.
+     * @param target
+     * @param ifExists
      */
-    async dropView(target) {
+    async dropView(target, ifExists) {
         const viewName = InstanceChecker_1.InstanceChecker.isView(target) ? target.name : target;
         const view = await this.getCachedView(viewName);
-        const upQueries = [];
-        const downQueries = [];
-        upQueries.push(await this.deleteViewDefinitionSql(view));
-        upQueries.push(this.dropViewSql(view));
-        downQueries.push(await this.insertViewDefinitionSql(view));
-        downQueries.push(this.createViewSql(view));
-        await this.executeQueries(upQueries, downQueries);
+        await this.executeQueries([
+            await this.deleteViewDefinitionSql(view),
+            this.dropViewSql(view, ifExists),
+        ], [
+            await this.insertViewDefinitionSql(view),
+            this.createViewSql(view),
+        ]);
     }
     /**
      * Renames a table.
+     * @param oldTableOrName
+     * @param newTableName
      */
     async renameTable(oldTableOrName, newTableName) {
         const upQueries = [];
@@ -339,7 +380,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             const columnNames = index.columnNames
                 .map((column) => `\`${column}\``)
                 .join(", ");
-            const newIndexName = this.connection.namingStrategy.indexName(newTable, index.columnNames, index.where);
+            const newIndexName = this.dataSource.namingStrategy.indexName(newTable, index.columnNames, index.where);
             // build queries
             let indexType = "";
             if (index.isUnique)
@@ -362,7 +403,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             const referencedColumnNames = foreignKey.referencedColumnNames
                 .map((column) => `\`${column}\``)
                 .join(",");
-            const newForeignKeyName = this.connection.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames);
+            const newForeignKeyName = this.dataSource.namingStrategy.foreignKeyName(newTable, foreignKey.columnNames);
             // build queries
             let up = `ALTER TABLE ${this.escapePath(newTable)} DROP FOREIGN KEY \`${foreignKey.name}\`, ADD CONSTRAINT \`${newForeignKeyName}\` FOREIGN KEY (${columnNames}) ` +
                 `REFERENCES ${this.escapePath(this.getTablePath(foreignKey))}(${referencedColumnNames})`;
@@ -388,6 +429,8 @@ class AuroraMysqlQueryRunner 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)
@@ -441,7 +484,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         else if (column.isUnique) {
             const uniqueIndex = new TableIndex_1.TableIndex({
-                name: this.connection.namingStrategy.indexName(table, [
+                name: this.dataSource.namingStrategy.indexName(table, [
                     column.name,
                 ]),
                 columnNames: [column.name],
@@ -461,6 +504,8 @@ class AuroraMysqlQueryRunner 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) {
@@ -469,6 +514,9 @@ class AuroraMysqlQueryRunner 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)
@@ -479,7 +527,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             : table.columns.find((c) => c.name === oldTableColumnOrName);
         if (!oldColumn)
             throw new error_1.TypeORMError(`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`);
-        let newColumn = undefined;
+        let newColumn;
         if (InstanceChecker_1.InstanceChecker.isTableColumn(newTableColumnOrName)) {
             newColumn = newTableColumnOrName;
         }
@@ -491,6 +539,9 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param oldColumnOrName
+     * @param newColumn
      */
     async changeColumn(tableOrName, oldColumnOrName, newColumn) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -527,7 +578,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     const columnNames = index.columnNames
                         .map((column) => `\`${column}\``)
                         .join(", ");
-                    const newIndexName = this.connection.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
+                    const newIndexName = this.dataSource.namingStrategy.indexName(clonedTable, index.columnNames, index.where);
                     // build queries
                     let indexType = "";
                     if (index.isUnique)
@@ -554,7 +605,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     const referencedColumnNames = foreignKey.referencedColumnNames
                         .map((column) => `\`${column}\``)
                         .join(",");
-                    const newForeignKeyName = this.connection.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames);
+                    const newForeignKeyName = this.dataSource.namingStrategy.foreignKeyName(clonedTable, foreignKey.columnNames);
                     // build queries
                     let up = `ALTER TABLE ${this.escapePath(table)} DROP FOREIGN KEY \`${foreignKey.name}\`, ADD CONSTRAINT \`${newForeignKeyName}\` FOREIGN KEY (${columnNames}) ` +
                         `REFERENCES ${this.escapePath(this.getTablePath(foreignKey))}(${referencedColumnNames})`;
@@ -640,7 +691,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             if (newColumn.isUnique !== oldColumn.isUnique) {
                 if (newColumn.isUnique === true) {
                     const uniqueIndex = new TableIndex_1.TableIndex({
-                        name: this.connection.namingStrategy.indexName(table, [
+                        name: this.dataSource.namingStrategy.indexName(table, [
                             newColumn.name,
                         ]),
                         columnNames: [newColumn.name],
@@ -673,6 +724,8 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     * @param tableOrName
+     * @param changedColumns
      */
     async changeColumns(tableOrName, changedColumns) {
         for (const { oldColumn, newColumn } of changedColumns) {
@@ -681,16 +734,22 @@ class AuroraMysqlQueryRunner 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 = [];
@@ -742,13 +801,13 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         else if (column.isUnique) {
             // we splice constraints both from table uniques and indices.
-            const uniqueName = this.connection.namingStrategy.uniqueConstraintName(table, [
+            const uniqueName = this.dataSource.namingStrategy.uniqueConstraintName(table, [
                 column.name,
             ]);
             const foundUnique = clonedTable.uniques.find((unique) => unique.name === uniqueName);
             if (foundUnique)
                 clonedTable.uniques.splice(clonedTable.uniques.indexOf(foundUnique), 1);
-            const indexName = this.connection.namingStrategy.indexName(table, [
+            const indexName = this.dataSource.namingStrategy.indexName(table, [
                 column.name,
             ]);
             const foundIndex = clonedTable.indices.find((index) => index.name === indexName);
@@ -765,14 +824,19 @@ class AuroraMysqlQueryRunner 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
      */
     async createPrimaryKey(tableOrName, columnNames) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -790,6 +854,8 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Updates composite primary keys.
+     * @param tableOrName
+     * @param columns
      */
     async updatePrimaryKeys(tableOrName, columns) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -820,7 +886,9 @@ class AuroraMysqlQueryRunner 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 columnNamesString = columnNames
             .map((columnName) => `\`${columnName}\``)
             .join(", ");
@@ -847,11 +915,16 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a primary key.
+     * @param tableOrName
+     * @param constraintName
+     * @param ifExists
      */
-    async dropPrimaryKey(tableOrName) {
+    async dropPrimaryKey(tableOrName, constraintName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
+        if (ifExists && table.primaryColumns.length === 0)
+            return Promise.resolve();
         const up = this.dropPrimaryKeySql(table);
         const down = this.createPrimaryKeySql(table, table.primaryColumns.map((column) => column.name));
         await this.executeQueries(up, down);
@@ -861,78 +934,110 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new unique constraint.
+     * @param tableOrName
+     * @param uniqueConstraint
      */
     async createUniqueConstraint(tableOrName, uniqueConstraint) {
         throw new error_1.TypeORMError(`MySql does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Creates a new unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
      */
     async createUniqueConstraints(tableOrName, uniqueConstraints) {
         throw new error_1.TypeORMError(`MySql does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Drops a unique constraint.
+     * @param tableOrName
+     * @param uniqueOrName
+     * @param ifExists
      */
-    async dropUniqueConstraint(tableOrName, uniqueOrName) {
+    async dropUniqueConstraint(tableOrName, uniqueOrName, ifExists) {
         throw new error_1.TypeORMError(`MySql does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Drops a unique constraints.
+     * @param tableOrName
+     * @param uniqueConstraints
+     * @param ifExists
      */
-    async dropUniqueConstraints(tableOrName, uniqueConstraints) {
+    async dropUniqueConstraints(tableOrName, uniqueConstraints, ifExists) {
         throw new error_1.TypeORMError(`MySql does not support unique constraints. Use unique index instead.`);
     }
     /**
      * Creates a new check constraint.
+     * @param tableOrName
+     * @param checkConstraint
      */
     async createCheckConstraint(tableOrName, checkConstraint) {
         throw new error_1.TypeORMError(`MySql does not support check constraints.`);
     }
     /**
      * Creates a new check constraints.
+     * @param tableOrName
+     * @param checkConstraints
      */
     async createCheckConstraints(tableOrName, checkConstraints) {
         throw new error_1.TypeORMError(`MySql does not support check constraints.`);
     }
     /**
      * Drops check constraint.
+     * @param tableOrName
+     * @param checkOrName
+     * @param ifExists
      */
-    async dropCheckConstraint(tableOrName, checkOrName) {
+    async dropCheckConstraint(tableOrName, checkOrName, ifExists) {
         throw new error_1.TypeORMError(`MySql does not support check constraints.`);
     }
     /**
      * Drops check constraints.
+     * @param tableOrName
+     * @param checkConstraints
+     * @param ifExists
      */
-    async dropCheckConstraints(tableOrName, checkConstraints) {
+    async dropCheckConstraints(tableOrName, checkConstraints, ifExists) {
         throw new error_1.TypeORMError(`MySql does not support check constraints.`);
     }
     /**
      * Creates a new exclusion constraint.
+     * @param tableOrName
+     * @param exclusionConstraint
      */
     async createExclusionConstraint(tableOrName, exclusionConstraint) {
         throw new error_1.TypeORMError(`MySql does not support exclusion constraints.`);
     }
     /**
      * Creates a new exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
      */
     async createExclusionConstraints(tableOrName, exclusionConstraints) {
         throw new error_1.TypeORMError(`MySql does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraint.
+     * @param tableOrName
+     * @param exclusionOrName
+     * @param ifExists
      */
-    async dropExclusionConstraint(tableOrName, exclusionOrName) {
+    async dropExclusionConstraint(tableOrName, exclusionOrName, ifExists) {
         throw new error_1.TypeORMError(`MySql does not support exclusion constraints.`);
     }
     /**
      * Drops exclusion constraints.
+     * @param tableOrName
+     * @param exclusionConstraints
+     * @param ifExists
      */
-    async dropExclusionConstraints(tableOrName, exclusionConstraints) {
+    async dropExclusionConstraints(tableOrName, exclusionConstraints, ifExists) {
         throw new error_1.TypeORMError(`MySql does not support exclusion constraints.`);
     }
     /**
      * Creates a new foreign key.
+     * @param tableOrName
+     * @param foreignKey
      */
     async createForeignKey(tableOrName, foreignKey) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -940,7 +1045,7 @@ class AuroraMysqlQueryRunner 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);
+            foreignKey.name = this.dataSource.namingStrategy.foreignKeyName(table, foreignKey.columnNames);
         const up = this.createForeignKeySql(table, foreignKey);
         const down = this.dropForeignKeySql(table, foreignKey);
         await this.executeQueries(up, down);
@@ -948,6 +1053,8 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new foreign keys.
+     * @param tableOrName
+     * @param foreignKeys
      */
     async createForeignKeys(tableOrName, foreignKeys) {
         const promises = foreignKeys.map((foreignKey) => this.createForeignKey(tableOrName, foreignKey));
@@ -955,16 +1062,25 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a foreign key.
+     * @param tableOrName
+     * @param foreignKeyOrName
+     * @param ifExists
      */
-    async dropForeignKey(tableOrName, foreignKeyOrName) {
+    async dropForeignKey(tableOrName, foreignKeyOrName, ifExists) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         const foreignKey = InstanceChecker_1.InstanceChecker.isTableForeignKey(foreignKeyOrName)
             ? foreignKeyOrName
             : table.foreignKeys.find((fk) => fk.name === foreignKeyOrName);
-        if (!foreignKey)
+        if (!foreignKey) {
+            if (ifExists)
+                return;
             throw new error_1.TypeORMError(`Supplied foreign key was not found in table ${table.name}`);
+        }
+        if (!foreignKey.name) {
+            foreignKey.name = this.dataSource.namingStrategy.foreignKeyName(table, foreignKey.columnNames);
+        }
         const up = this.dropForeignKeySql(table, foreignKey);
         const down = this.createForeignKeySql(table, foreignKey);
         await this.executeQueries(up, down);
@@ -972,13 +1088,18 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a foreign keys from the table.
+     * @param tableOrName
+     * @param foreignKeys
+     * @param ifExists
      */
-    async dropForeignKeys(tableOrName, foreignKeys) {
-        const promises = foreignKeys.map((foreignKey) => this.dropForeignKey(tableOrName, foreignKey));
+    async dropForeignKeys(tableOrName, foreignKeys, ifExists) {
+        const promises = foreignKeys.map((foreignKey) => this.dropForeignKey(tableOrName, foreignKey, ifExists));
         await Promise.all(promises);
     }
     /**
      * Creates a new index.
+     * @param tableOrName
+     * @param index
      */
     async createIndex(tableOrName, index) {
         const table = InstanceChecker_1.InstanceChecker.isTable(tableOrName)
@@ -994,6 +1115,8 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new indices
+     * @param tableOrName
+     * @param indices
      */
     async createIndices(tableOrName, indices) {
         const promises = indices.map((index) => this.createIndex(tableOrName, index));
@@ -1001,16 +1124,22 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops an index.
+     * @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);
@@ -1021,22 +1150,31 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops an indices from the table.
+     * @param tableOrName
+     * @param indices
+     * @param ifExists
      */
-    async dropIndices(tableOrName, indices) {
-        const promises = indices.map((index) => this.dropIndex(tableOrName, index));
+    async dropIndices(tableOrName, indices, ifExists) {
+        const promises = indices.map((index) => this.dropIndex(tableOrName, index, ifExists));
         await Promise.all(promises);
     }
     /**
      * Clears all table contents.
      * Note: this operation uses SQL's TRUNCATE query which cannot be reverted in transactions.
+     * @param tableOrName
+     * @param options
+     * @param options.cascade
      */
-    async clearTable(tableOrName) {
+    async clearTable(tableOrName, options) {
+        if (options?.cascade)
+            throw new error_1.TypeORMError(`MySql does not support clearing table with cascade option`);
         await this.query(`TRUNCATE TABLE ${this.escapePath(tableOrName)}`);
     }
     /**
      * Removes all tables from the currently connected database.
      * Be careful using this method and avoid using it in production or migrations
      * (because it can clear all your database).
+     * @param database
      */
     async clearDatabase(database) {
         const dbName = database ? database : this.driver.database;
@@ -1052,14 +1190,14 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (!isAnotherTransactionActive)
             await this.startTransaction();
         try {
-            const selectViewDropsQuery = `SELECT concat('DROP VIEW IF EXISTS \`', table_schema, '\`.\`', table_name, '\`') AS \`query\` FROM \`INFORMATION_SCHEMA\`.\`VIEWS\` WHERE \`TABLE_SCHEMA\` = '${dbName}'`;
-            const dropViewQueries = await this.query(selectViewDropsQuery);
+            const selectViewDropsQuery = `SELECT concat('DROP VIEW IF EXISTS \`', table_schema, '\`.\`', table_name, '\`') AS \`query\` FROM \`INFORMATION_SCHEMA\`.\`VIEWS\` WHERE \`TABLE_SCHEMA\` = ?`;
+            const dropViewQueries = await this.query(selectViewDropsQuery, [dbName]);
             await Promise.all(dropViewQueries.map((q) => this.query(q["query"])));
             const disableForeignKeysCheckQuery = `SET FOREIGN_KEY_CHECKS = 0;`;
-            const dropTablesQuery = `SELECT concat('DROP TABLE IF EXISTS \`', table_schema, '\`.\`', table_name, '\`') AS \`query\` FROM \`INFORMATION_SCHEMA\`.\`TABLES\` WHERE \`TABLE_SCHEMA\` = '${dbName}'`;
+            const dropTablesQuery = `SELECT concat('DROP TABLE IF EXISTS \`', table_schema, '\`.\`', table_name, '\`') AS \`query\` FROM \`INFORMATION_SCHEMA\`.\`TABLES\` WHERE \`TABLE_SCHEMA\` = ?`;
             const enableForeignKeysCheckQuery = `SET FOREIGN_KEY_CHECKS = 1;`;
             await this.query(disableForeignKeysCheckQuery);
-            const dropQueries = await this.query(dropTablesQuery);
+            const dropQueries = await this.query(dropTablesQuery, [dbName]);
             await Promise.all(dropQueries.map((query) => this.query(query["query"])));
             await this.query(enableForeignKeysCheckQuery);
             if (!isAnotherTransactionActive) {
@@ -1114,6 +1252,7 @@ class AuroraMysqlQueryRunner 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
@@ -1204,7 +1343,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                             dbColumn["COLUMN_NAME"] &&
                         parseInt(dbIndex["NON_UNIQUE"], 10) === 0);
                 });
-                const tableMetadata = this.connection.entityMetadatas.find((metadata) => this.getTablePath(table) ===
+                const tableMetadata = this.dataSource.entityMetadatas.find((metadata) => this.getTablePath(table) ===
                     this.getTablePath(metadata));
                 const hasIgnoredIndex = columnUniqueIndices.length > 0 &&
                     tableMetadata &&
@@ -1223,21 +1362,8 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 const tableColumn = new TableColumn_1.TableColumn();
                 tableColumn.name = dbColumn["COLUMN_NAME"];
                 tableColumn.type = dbColumn["DATA_TYPE"].toLowerCase();
-                // Unsigned columns are handled differently when it comes to width.
-                // Hence, we need to set the unsigned attribute before we check the width.
-                tableColumn.zerofill =
-                    dbColumn["COLUMN_TYPE"].includes("zerofill");
                 tableColumn.unsigned =
-                    tableColumn.zerofill ||
-                        dbColumn["COLUMN_TYPE"].includes("unsigned");
-                if (this.driver.unsignedColumnTypes.includes(tableColumn.type)) {
-                    const width = dbColumn["COLUMN_TYPE"].substring(dbColumn["COLUMN_TYPE"].indexOf("(") + 1, dbColumn["COLUMN_TYPE"].indexOf(")"));
-                    tableColumn.width =
-                        width &&
-                            !this.isDefaultColumnWidth(table, tableColumn, parseInt(width))
-                            ? parseInt(width)
-                            : undefined;
-                }
+                    dbColumn["COLUMN_TYPE"].includes("unsigned");
                 if (dbColumn["COLUMN_DEFAULT"] === null ||
                     dbColumn["COLUMN_DEFAULT"] === undefined) {
                     tableColumn.default = undefined;
@@ -1272,8 +1398,6 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         dbPrimaryKey["COLUMN_NAME"] ===
                             dbColumn["COLUMN_NAME"]);
                 });
-                tableColumn.zerofill =
-                    dbColumn["COLUMN_TYPE"].indexOf("zerofill") !== -1;
                 tableColumn.isGenerated =
                     dbColumn["EXTRA"].indexOf("auto_increment") !== -1;
                 if (tableColumn.isGenerated)
@@ -1383,6 +1507,8 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create table sql
+     * @param table
+     * @param createForeignKeys
      */
     createTableSql(table, createForeignKeys) {
         const columnDefinitions = table.columns
@@ -1405,7 +1531,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             });
             if (!isUniqueIndexExist && !isUniqueConstraintExist)
                 table.indices.push(new TableIndex_1.TableIndex({
-                    name: this.connection.namingStrategy.uniqueConstraintName(table, [column.name]),
+                    name: this.dataSource.namingStrategy.uniqueConstraintName(table, [column.name]),
                     columnNames: [column.name],
                     isUnique: true,
                 }));
@@ -1430,7 +1556,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     .map((columnName) => `\`${columnName}\``)
                     .join(", ");
                 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);
                 let indexType = "";
                 if (index.isUnique)
                     indexType += "UNIQUE ";
@@ -1450,7 +1576,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     .map((columnName) => `\`${columnName}\``)
                     .join(", ");
                 if (!fk.name)
-                    fk.name = this.connection.namingStrategy.foreignKeyName(table, fk.columnNames);
+                    fk.name = this.dataSource.namingStrategy.foreignKeyName(table, fk.columnNames);
                 const referencedColumnNames = fk.referencedColumnNames
                     .map((columnName) => `\`${columnName}\``)
                     .join(", ");
@@ -1475,6 +1601,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop table sql
+     * @param tableOrName
      */
     dropTableSql(tableOrName) {
         return new Query_1.Query(`DROP TABLE ${this.escapePath(tableOrName)}`);
@@ -1485,7 +1612,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         }
         else {
             return new Query_1.Query(`CREATE VIEW ${this.escapePath(view)} AS ${view
-                .expression(this.connection)
+                .expression(this.dataSource)
                 .getQuery()}`);
         }
     }
@@ -1493,7 +1620,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const currentDatabase = await this.getCurrentDatabase();
         const expression = typeof view.expression === "string"
             ? view.expression.trim()
-            : view.expression(this.connection).getQuery();
+            : view.expression(this.dataSource).getQuery();
         return this.insertTypeormMetadataSql({
             type: MetadataTableType_1.MetadataTableType.VIEW,
             schema: currentDatabase,
@@ -1503,12 +1630,16 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop view sql.
+     * @param viewOrPath
+     * @param ifExists
      */
-    dropViewSql(viewOrPath) {
-        return new Query_1.Query(`DROP VIEW ${this.escapePath(viewOrPath)}`);
+    dropViewSql(viewOrPath, ifExists) {
+        const ifExistsClause = ifExists ? "IF EXISTS " : "";
+        return new Query_1.Query(`DROP VIEW ${ifExistsClause}${this.escapePath(viewOrPath)}`);
     }
     /**
      * Builds remove view sql.
+     * @param viewOrPath
      */
     async deleteViewDefinitionSql(viewOrPath) {
         const currentDatabase = await this.getCurrentDatabase();
@@ -1523,6 +1654,8 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create index sql.
+     * @param table
+     * @param index
      */
     createIndexSql(table, index) {
         const columns = index.columnNames
@@ -1539,6 +1672,8 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop index sql.
+     * @param table
+     * @param indexOrName
      */
     dropIndexSql(table, indexOrName) {
         const indexName = InstanceChecker_1.InstanceChecker.isTableIndex(indexOrName)
@@ -1548,6 +1683,8 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create primary key sql.
+     * @param table
+     * @param columnNames
      */
     createPrimaryKeySql(table, columnNames) {
         const columnNamesString = columnNames
@@ -1557,12 +1694,15 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop primary key sql.
+     * @param table
      */
     dropPrimaryKeySql(table) {
         return new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP PRIMARY KEY`);
     }
     /**
      * Builds create foreign key sql.
+     * @param table
+     * @param foreignKey
      */
     createForeignKeySql(table, foreignKey) {
         const columnNames = foreignKey.columnNames
@@ -1581,6 +1721,8 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop foreign key sql.
+     * @param table
+     * @param foreignKeyOrName
      */
     dropForeignKeySql(table, foreignKeyOrName) {
         const foreignKeyName = InstanceChecker_1.InstanceChecker.isTableForeignKey(foreignKeyOrName)
@@ -1590,6 +1732,7 @@ class AuroraMysqlQueryRunner 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) {
@@ -1603,6 +1746,7 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Escapes given table or view path.
+     * @param target
      */
     escapePath(target) {
         const { database, tableName } = this.driver.parseTableName(target);
@@ -1613,22 +1757,21 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds a part of query to create/change a column.
+     * @param column
+     * @param skipPrimary
+     * @param skipName
      */
     buildCreateColumnSql(column, skipPrimary, skipName = false) {
-        let c = "";
+        let c;
         if (skipName) {
-            c = this.connection.driver.createFullType(column);
+            c = this.dataSource.driver.createFullType(column);
         }
         else {
-            c = `\`${column.name}\` ${this.connection.driver.createFullType(column)}`;
+            c = `\`${column.name}\` ${this.dataSource.driver.createFullType(column)}`;
         }
         if (column.asExpression)
             c += ` AS (${column.asExpression}) ${column.generatedType ? column.generatedType : "VIRTUAL"}`;
-        // if you specify ZEROFILL for a numeric column, MySQL automatically adds the UNSIGNED attribute to that column.
-        if (column.zerofill) {
-            c += " ZEROFILL";
-        }
-        else if (column.unsigned) {
+        if (column.unsigned) {
             c += " UNSIGNED";
         }
         if (column.enum)
@@ -1656,47 +1799,14 @@ class AuroraMysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             c += ` ON UPDATE ${column.onUpdate}`;
         return c;
     }
-    /**
-     * Checks if column display width is by default.
-     */
-    isDefaultColumnWidth(table, column, width) {
-        // if table have metadata, we check if length is specified in column metadata
-        if (this.connection.hasMetadata(table.name)) {
-            const metadata = this.connection.getMetadata(table.name);
-            const columnMetadata = metadata.findColumnWithDatabaseName(column.name);
-            if (columnMetadata && columnMetadata.width)
-                return false;
-        }
-        const defaultWidthForType = this.connection.driver.dataTypeDefaults &&
-            this.connection.driver.dataTypeDefaults[column.type] &&
-            this.connection.driver.dataTypeDefaults[column.type].width;
-        if (defaultWidthForType) {
-            // In MariaDB & MySQL 5.7, the default widths of certain numeric types are 1 less than
-            // the usual defaults when the column is unsigned.
-            // This also applies to Aurora MySQL.
-            const typesWithReducedUnsignedDefault = [
-                "int",
-                "tinyint",
-                "smallint",
-                "mediumint",
-            ];
-            const needsAdjustment = typesWithReducedUnsignedDefault.indexOf(column.type) !== -1;
-            if (column.unsigned && needsAdjustment) {
-                return defaultWidthForType - 1 === width;
-            }
-            else {
-                return defaultWidthForType === width;
-            }
-        }
-        return false;
-    }
     /**
      * Change table comment.
+     * @param tableOrName
+     * @param comment
      */
     changeTableComment(tableOrName, comment) {
         throw new error_1.TypeORMError(`aurora-mysql driver does not support change table comment.`);
     }
 }
 exports.AuroraMysqlQueryRunner = AuroraMysqlQueryRunner;
-
-//# sourceMappingURL=AuroraMysqlQueryRunner.js.map
+//# sourceMappingURL=AuroraMysqlQueryRunner.js.map