typeorm 1.0.0-beta.1 → 1.0.0-beta.2

package/driver/mysql/MysqlQueryRunner.js

@@ -19,6 +19,7 @@ const InstanceChecker_1 = require("../../util/InstanceChecker");
 const OrmUtils_1 = require("../../util/OrmUtils");
 const VersionUtils_1 = require("../../util/VersionUtils");
 const Query_1 = require("../Query");
+const validate_isolation_level_1 = require("../validate-isolation-level");
 const MetadataTableType_1 = require("../types/MetadataTableType");
 /**
  * Runs queries on a single mysql database connection.
@@ -77,9 +78,12 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Starts transaction on the current connection.
+     *
      * @param isolationLevel
      */
     async startTransaction(isolationLevel) {
+        isolationLevel ??= this.dataSource.options.isolationLevel;
+        (0, validate_isolation_level_1.validateIsolationLevel)(this.driver.supportedIsolationLevels, isolationLevel);
         this.isTransactionActive = true;
         try {
             await this.broadcaster.broadcast("BeforeTransactionStart");
@@ -138,6 +142,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Executes a raw SQL query.
+     *
      * @param query
      * @param parameters
      * @param useStructuredResult
@@ -200,6 +205,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Returns raw data stream.
+     *
      * @param query
      * @param parameters
      * @param onEnd
@@ -233,6 +239,7 @@ class MysqlQueryRunner 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) {
@@ -240,6 +247,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Checks if database with the given name exist.
+     *
      * @param database
      */
     async hasDatabase(database) {
@@ -255,6 +263,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Checks if schema with the given name exist.
+     *
      * @param schema
      */
     async hasSchema(schema) {
@@ -269,6 +278,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Checks if table with the given name exist in the database.
+     *
      * @param tableOrName
      */
     async hasTable(tableOrName) {
@@ -282,6 +292,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Checks if column with the given name exist in the given table.
+     *
      * @param tableOrName
      * @param column
      */
@@ -300,6 +311,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new database.
+     *
      * @param database
      * @param ifNotExists
      */
@@ -312,6 +324,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops database.
+     *
      * @param database
      * @param ifExists
      */
@@ -324,6 +337,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new table schema.
+     *
      * @param schemaPath
      * @param ifNotExists
      */
@@ -332,6 +346,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops table schema.
+     *
      * @param schemaPath
      * @param ifExists
      */
@@ -340,6 +355,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new table.
+     *
      * @param table
      * @param ifNotExists
      * @param createForeignKeys
@@ -387,6 +403,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drop the table.
+     *
      * @param target
      * @param ifExists
      * @param dropForeignKeys
@@ -434,6 +451,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new view.
+     *
      * @param view
      * @param syncWithMetadata
      */
@@ -450,6 +468,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops the view.
+     *
      * @param target
      * @param ifExists
      */
@@ -471,6 +490,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Renames a table.
+     *
      * @param oldTableOrName
      * @param newTableName
      */
@@ -552,6 +572,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Change table comment.
+     *
      * @param tableOrName
      * @param newComment
      */
@@ -577,6 +598,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new column from the column in the table.
+     *
      * @param tableOrName
      * @param column
      */
@@ -670,6 +692,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new columns from the column in the table.
+     *
      * @param tableOrName
      * @param columns
      */
@@ -680,6 +703,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Renames column in the given table.
+     *
      * @param tableOrName
      * @param oldTableColumnOrName
      * @param newTableColumnOrName
@@ -705,6 +729,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     *
      * @param tableOrName
      * @param oldColumnOrName
      * @param newColumn
@@ -977,6 +1002,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Changes a column in the table.
+     *
      * @param tableOrName
      * @param changedColumns
      */
@@ -987,6 +1013,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops column in the table.
+     *
      * @param tableOrName
      * @param columnOrName
      * @param ifExists
@@ -1095,6 +1122,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops the columns in the table.
+     *
      * @param tableOrName
      * @param columns
      * @param ifExists
@@ -1106,6 +1134,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new primary key.
+     *
      * @param tableOrName
      * @param columnNames
      */
@@ -1125,6 +1154,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Updates composite primary keys.
+     *
      * @param tableOrName
      * @param columns
      */
@@ -1166,9 +1196,8 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         upQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} ADD PRIMARY KEY (${columnNamesString})`));
         downQueries.push(new Query_1.Query(`ALTER TABLE ${this.escapePath(table)} DROP PRIMARY KEY`));
         // if we already have generated column or column is changed to generated, and we dropped AUTO_INCREMENT property before, we must bring it back
-        const newOrExistGeneratedColumn = generatedColumn
-            ? generatedColumn
-            : columns.find((column) => column.isGenerated &&
+        const newOrExistGeneratedColumn = generatedColumn ??
+            columns.find((column) => column.isGenerated &&
                 column.generationStrategy === "increment");
         if (newOrExistGeneratedColumn) {
             const nonGeneratedColumn = newOrExistGeneratedColumn.clone();
@@ -1186,6 +1215,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a primary key.
+     *
      * @param tableOrName
      * @param constraintName not used in MySQL
      * @param ifExists
@@ -1207,6 +1237,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new unique constraint.
+     *
      * @param tableOrName
      * @param uniqueConstraint
      */
@@ -1215,6 +1246,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new unique constraints.
+     *
      * @param tableOrName
      * @param uniqueConstraints
      */
@@ -1223,6 +1255,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a unique constraint.
+     *
      * @param tableOrName
      * @param uniqueOrName
      * @param ifExists
@@ -1234,6 +1267,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a unique constraints.
+     *
      * @param tableOrName
      * @param uniqueConstraints
      * @param ifExists
@@ -1245,6 +1279,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new check constraint.
+     *
      * @param tableOrName
      * @param checkConstraint
      */
@@ -1253,6 +1288,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new check constraints.
+     *
      * @param tableOrName
      * @param checkConstraints
      */
@@ -1261,6 +1297,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops check constraint.
+     *
      * @param tableOrName
      * @param checkOrName
      * @param ifExists
@@ -1270,6 +1307,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops check constraints.
+     *
      * @param tableOrName
      * @param checkConstraints
      * @param ifExists
@@ -1279,6 +1317,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new exclusion constraint.
+     *
      * @param tableOrName
      * @param exclusionConstraint
      */
@@ -1287,6 +1326,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new exclusion constraints.
+     *
      * @param tableOrName
      * @param exclusionConstraints
      */
@@ -1295,6 +1335,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops exclusion constraint.
+     *
      * @param tableOrName
      * @param exclusionOrName
      * @param ifExists
@@ -1304,6 +1345,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops exclusion constraints.
+     *
      * @param tableOrName
      * @param exclusionConstraints
      * @param ifExists
@@ -1313,6 +1355,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new foreign key.
+     *
      * @param tableOrName
      * @param foreignKey
      */
@@ -1321,8 +1364,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         // new FK may be passed without name. In this case we generate FK name manually.
-        if (!foreignKey.name)
-            foreignKey.name = this.dataSource.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);
@@ -1330,6 +1372,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new foreign keys.
+     *
      * @param tableOrName
      * @param foreignKeys
      */
@@ -1339,6 +1382,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a foreign key.
+     *
      * @param tableOrName
      * @param foreignKeyOrName
      * @param ifExists
@@ -1355,9 +1399,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 return;
             throw new error_1.TypeORMError(`Supplied foreign key was not found in table ${table.name}`);
         }
-        if (!foreignKey.name) {
-            foreignKey.name = this.dataSource.namingStrategy.foreignKeyName(table, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
-        }
+        foreignKey.name ??= this.dataSource.namingStrategy.foreignKeyName(table, foreignKey.columnNames, this.getTablePath(foreignKey), foreignKey.referencedColumnNames);
         const up = this.dropForeignKeySql(table, foreignKey);
         const down = this.createForeignKeySql(table, foreignKey);
         await this.executeQueries(up, down);
@@ -1365,6 +1407,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops a foreign keys from the table.
+     *
      * @param tableOrName
      * @param foreignKeys
      * @param ifExists
@@ -1375,6 +1418,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new index.
+     *
      * @param tableOrName
      * @param index
      */
@@ -1383,8 +1427,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             ? tableOrName
             : await this.getCachedTable(tableOrName);
         // new index may be passed without name. In this case we generate index name manually.
-        if (!index.name)
-            index.name = this.generateIndexName(table, index);
+        index.name ??= this.generateIndexName(table, index);
         const up = this.createIndexSql(table, index);
         const down = this.dropIndexSql(table, index);
         await this.executeQueries(up, down);
@@ -1392,6 +1435,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Creates a new indices
+     *
      * @param tableOrName
      * @param indices
      */
@@ -1401,6 +1445,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops an index.
+     *
      * @param tableOrName
      * @param indexOrName
      * @param ifExists
@@ -1418,8 +1463,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
             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);
+        index.name ??= this.generateIndexName(table, index);
         const up = this.dropIndexSql(table, index);
         const down = this.createIndexSql(table, index);
         await this.executeQueries(up, down);
@@ -1427,6 +1471,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Drops an indices from the table.
+     *
      * @param tableOrName
      * @param indices
      * @param ifExists
@@ -1438,6 +1483,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     /**
      * 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
@@ -1452,10 +1498,11 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
      * 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;
+        const dbName = database ?? this.driver.database;
         if (dbName) {
             const isDatabaseExist = await this.hasDatabase(dbName);
             if (!isDatabaseExist)
@@ -1499,16 +1546,12 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (!hasTable) {
             return [];
         }
-        if (!viewNames) {
-            viewNames = [];
-        }
+        viewNames ??= [];
         const currentDatabase = await this.getCurrentDatabase();
         const viewsCondition = viewNames
             .map((tableName) => {
             let { database, tableName: name } = this.driver.parseTableName(tableName);
-            if (!database) {
-                database = currentDatabase;
-            }
+            database ??= currentDatabase;
             return `(\`t\`.\`schema\` = '${database}' AND \`t\`.\`name\` = '${name}')`;
         })
             .join(" OR ");
@@ -1528,10 +1571,11 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Loads all tables (with given names) from the database and creates a Table from them.
+     *
      * @param tableNames
      */
     async loadTables(tableNames) {
-        if (tableNames && tableNames.length === 0) {
+        if (tableNames?.length === 0) {
             return [];
         }
         const currentDatabase = await this.getCurrentDatabase();
@@ -1570,9 +1614,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .filter((tableName) => tableName)
                 .map((tableName) => {
                 let { database, tableName: name } = this.driver.parseTableName(tableName);
-                if (!database) {
-                    database = currentDatabase;
-                }
+                database ??= currentDatabase;
                 return `SELECT \`TABLE_SCHEMA\`, \`TABLE_NAME\`, \`TABLE_COMMENT\` FROM \`INFORMATION_SCHEMA\`.\`TABLES\` WHERE \`TABLE_SCHEMA\` = '${database}' AND \`TABLE_NAME\` = '${name}'`;
             })
                 .join(" UNION ");
@@ -1586,15 +1628,11 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // Full columns: CARDINALITY & INDEX_TYPE - everything else is FRM only
         const statsSubquerySql = dbTables
             .map(({ TABLE_SCHEMA, TABLE_NAME }) => {
-            return `
-                SELECT
-                    *
-                FROM \`INFORMATION_SCHEMA\`.\`STATISTICS\`
-                WHERE
-                    \`TABLE_SCHEMA\` = '${TABLE_SCHEMA}'
-                    AND
-                    \`TABLE_NAME\` = '${TABLE_NAME}'
-            `;
+            return (`SELECT * FROM \`INFORMATION_SCHEMA\`.\`STATISTICS\` ` +
+                `WHERE ` +
+                `\`TABLE_SCHEMA\` = '${TABLE_SCHEMA}' ` +
+                `AND ` +
+                `\`TABLE_NAME\` = '${TABLE_NAME}'`);
         })
             .join(" UNION ");
         // Avoid data directory scan: TABLE_SCHEMA
@@ -1602,15 +1640,11 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // All columns will hit the full table.
         const kcuSubquerySql = dbTables
             .map(({ TABLE_SCHEMA, TABLE_NAME }) => {
-            return `
-                SELECT
-                    *
-                FROM \`INFORMATION_SCHEMA\`.\`KEY_COLUMN_USAGE\` \`kcu\`
-                WHERE
-                    \`kcu\`.\`TABLE_SCHEMA\` = '${TABLE_SCHEMA}'
-                    AND
-                    \`kcu\`.\`TABLE_NAME\` = '${TABLE_NAME}'
-            `;
+            return (`SELECT * FROM \`INFORMATION_SCHEMA\`.\`KEY_COLUMN_USAGE\` \`kcu\` ` +
+                `WHERE ` +
+                `\`kcu\`.\`TABLE_SCHEMA\` = '${TABLE_SCHEMA}' ` +
+                `AND ` +
+                `\`kcu\`.\`TABLE_NAME\` = '${TABLE_NAME}'`);
         })
             .join(" UNION ");
         // Avoid data directory scan: CONSTRAINT_SCHEMA
@@ -1618,15 +1652,11 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // All columns will hit the full table.
         const rcSubquerySql = dbTables
             .map(({ TABLE_SCHEMA, TABLE_NAME }) => {
-            return `
-                SELECT
-                    *
-                FROM \`INFORMATION_SCHEMA\`.\`REFERENTIAL_CONSTRAINTS\`
-                WHERE
-                    \`CONSTRAINT_SCHEMA\` = '${TABLE_SCHEMA}'
-                    AND
-                    \`TABLE_NAME\` = '${TABLE_NAME}'
-            `;
+            return (`SELECT * FROM \`INFORMATION_SCHEMA\`.\`REFERENTIAL_CONSTRAINTS\` ` +
+                `WHERE ` +
+                `\`CONSTRAINT_SCHEMA\` = '${TABLE_SCHEMA}' ` +
+                `AND ` +
+                `\`TABLE_NAME\` = '${TABLE_NAME}'`);
         })
             .join(" UNION ");
         // Avoid data directory scan: TABLE_SCHEMA
@@ -1634,64 +1664,53 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         // OPEN_FRM_ONLY applies to all columns
         const columnsSql = dbTables
             .map(({ TABLE_SCHEMA, TABLE_NAME }) => {
-            return `
-                SELECT
-                    *
-                FROM
-                    \`INFORMATION_SCHEMA\`.\`COLUMNS\`
-                WHERE
-                    \`TABLE_SCHEMA\` = '${TABLE_SCHEMA}'
-                    AND
-                    \`TABLE_NAME\` = '${TABLE_NAME}'
-                `;
+            return (`SELECT * FROM \`INFORMATION_SCHEMA\`.\`COLUMNS\` ` +
+                `WHERE ` +
+                `\`TABLE_SCHEMA\` = '${TABLE_SCHEMA}' ` +
+                `AND ` +
+                `\`TABLE_NAME\` = '${TABLE_NAME}'`);
         })
             .join(" UNION ");
         // No Optimizations are available for COLLATIONS
-        const collationsSql = `
-            SELECT
-                \`SCHEMA_NAME\`,
-                \`DEFAULT_CHARACTER_SET_NAME\` as \`CHARSET\`,
-                \`DEFAULT_COLLATION_NAME\` AS \`COLLATION\`
-            FROM \`INFORMATION_SCHEMA\`.\`SCHEMATA\`
-            `;
+        const collationsSql = `SELECT ` +
+            `\`SCHEMA_NAME\`, ` +
+            `\`DEFAULT_CHARACTER_SET_NAME\` as \`CHARSET\`, ` +
+            `\`DEFAULT_COLLATION_NAME\` AS \`COLLATION\` ` +
+            `FROM \`INFORMATION_SCHEMA\`.\`SCHEMATA\``;
         // Key Column Usage but only for PKs
         const primaryKeySql = `SELECT * FROM (${kcuSubquerySql}) \`kcu\` WHERE \`CONSTRAINT_NAME\` = 'PRIMARY'`;
         // Combine stats & referential constraints
-        const indicesSql = `
-            SELECT
-                \`s\`.*
-            FROM (${statsSubquerySql}) \`s\`
-            LEFT JOIN (${rcSubquerySql}) \`rc\`
-                ON
-                    \`s\`.\`INDEX_NAME\` = \`rc\`.\`CONSTRAINT_NAME\`
-                    AND
-                    \`s\`.\`TABLE_SCHEMA\` = \`rc\`.\`CONSTRAINT_SCHEMA\`
-            WHERE
-                \`s\`.\`INDEX_NAME\` != 'PRIMARY'
-                AND
-                \`rc\`.\`CONSTRAINT_NAME\` IS NULL
-            `;
+        const indicesSql = `SELECT ` +
+            `\`s\`.* ` +
+            `FROM (${statsSubquerySql}) \`s\` ` +
+            `LEFT JOIN (${rcSubquerySql}) \`rc\` ` +
+            `ON ` +
+            `\`s\`.\`INDEX_NAME\` = \`rc\`.\`CONSTRAINT_NAME\` ` +
+            `AND ` +
+            `\`s\`.\`TABLE_SCHEMA\` = \`rc\`.\`CONSTRAINT_SCHEMA\` ` +
+            `WHERE ` +
+            `\`s\`.\`INDEX_NAME\` != 'PRIMARY' ` +
+            `AND ` +
+            `\`rc\`.\`CONSTRAINT_NAME\` IS NULL`;
         // Combine Key Column Usage & Referential Constraints
-        const foreignKeysSql = `
-            SELECT
-                \`kcu\`.\`TABLE_SCHEMA\`,
-                \`kcu\`.\`TABLE_NAME\`,
-                \`kcu\`.\`CONSTRAINT_NAME\`,
-                \`kcu\`.\`COLUMN_NAME\`,
-                \`kcu\`.\`REFERENCED_TABLE_SCHEMA\`,
-                \`kcu\`.\`REFERENCED_TABLE_NAME\`,
-                \`kcu\`.\`REFERENCED_COLUMN_NAME\`,
-                \`rc\`.\`DELETE_RULE\` \`ON_DELETE\`,
-                \`rc\`.\`UPDATE_RULE\` \`ON_UPDATE\`
-            FROM (${kcuSubquerySql}) \`kcu\`
-            INNER JOIN (${rcSubquerySql}) \`rc\`
-                ON
-                    \`rc\`.\`CONSTRAINT_SCHEMA\` = \`kcu\`.\`CONSTRAINT_SCHEMA\`
-                    AND
-                    \`rc\`.\`TABLE_NAME\` = \`kcu\`.\`TABLE_NAME\`
-                    AND
-                    \`rc\`.\`CONSTRAINT_NAME\` = \`kcu\`.\`CONSTRAINT_NAME\`
-            `;
+        const foreignKeysSql = `SELECT ` +
+            `\`kcu\`.\`TABLE_SCHEMA\`, ` +
+            `\`kcu\`.\`TABLE_NAME\`, ` +
+            `\`kcu\`.\`CONSTRAINT_NAME\`, ` +
+            `\`kcu\`.\`COLUMN_NAME\`, ` +
+            `\`kcu\`.\`REFERENCED_TABLE_SCHEMA\`, ` +
+            `\`kcu\`.\`REFERENCED_TABLE_NAME\`, ` +
+            `\`kcu\`.\`REFERENCED_COLUMN_NAME\`, ` +
+            `\`rc\`.\`DELETE_RULE\` \`ON_DELETE\`, ` +
+            `\`rc\`.\`UPDATE_RULE\` \`ON_UPDATE\` ` +
+            `FROM (${kcuSubquerySql}) \`kcu\` ` +
+            `INNER JOIN (${rcSubquerySql}) \`rc\` ` +
+            `ON ` +
+            `\`rc\`.\`CONSTRAINT_SCHEMA\` = \`kcu\`.\`CONSTRAINT_SCHEMA\` ` +
+            `AND ` +
+            `\`rc\`.\`TABLE_NAME\` = \`kcu\`.\`TABLE_NAME\` ` +
+            `AND ` +
+            `\`rc\`.\`CONSTRAINT_NAME\` = \`kcu\`.\`CONSTRAINT_NAME\``;
         const [dbColumns, dbPrimaryKeys, dbCollations, dbIndices, dbForeignKeys,] = await Promise.all([
             this.query(columnsSql),
             this.query(primaryKeySql),
@@ -1733,8 +1752,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 const tableMetadata = this.dataSource.entityMetadatas.find((metadata) => this.getTablePath(table) ===
                     this.getTablePath(metadata));
                 const hasIgnoredIndex = columnUniqueIndices.length > 0 &&
-                    tableMetadata &&
-                    tableMetadata.indices.some((index) => {
+                    tableMetadata?.indices.some((index) => {
                         return columnUniqueIndices.some((uniqueIndex) => {
                             return (index.name ===
                                 uniqueIndex["INDEX_NAME"] &&
@@ -1800,7 +1818,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                         name: tableColumn.name,
                     });
                     const results = await this.query(asExpressionQuery.query, asExpressionQuery.parameters);
-                    if (results[0] && results[0].value) {
+                    if (results[0]?.value) {
                         tableColumn.asExpression = results[0].value;
                     }
                     else {
@@ -1946,6 +1964,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create table sql
+     *
      * @param table
      * @param createForeignKeys
      */
@@ -1994,8 +2013,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 const columnNames = index.columnNames
                     .map((columnName) => `\`${columnName}\``)
                     .join(", ");
-                if (!index.name)
-                    index.name = this.dataSource.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 ";
@@ -2017,8 +2035,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 const columnNames = fk.columnNames
                     .map((columnName) => `\`${columnName}\``)
                     .join(", ");
-                if (!fk.name)
-                    fk.name = this.dataSource.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(", ");
@@ -2038,7 +2055,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                 .join(", ");
             sql += `, PRIMARY KEY (${columnNames})`;
         }
-        sql += `) ENGINE=${table.engine || "InnoDB"}`;
+        sql += `) ENGINE=${table.engine ?? "InnoDB"}`;
         if (table.comment) {
             sql += ` COMMENT="${table.comment}"`;
         }
@@ -2046,6 +2063,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop table sql
+     *
      * @param tableOrName
      */
     dropTableSql(tableOrName) {
@@ -2075,6 +2093,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop view sql.
+     *
      * @param viewOrPath
      */
     dropViewSql(viewOrPath) {
@@ -2082,6 +2101,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds remove view sql.
+     *
      * @param viewOrPath
      */
     async deleteViewDefinitionSql(viewOrPath) {
@@ -2097,6 +2117,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create index sql.
+     *
      * @param table
      * @param index
      */
@@ -2118,6 +2139,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop index sql.
+     *
      * @param table
      * @param indexOrName
      */
@@ -2129,6 +2151,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create primary key sql.
+     *
      * @param table
      * @param columnNames
      */
@@ -2140,6 +2163,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop primary key sql.
+     *
      * @param table
      */
     dropPrimaryKeySql(table) {
@@ -2147,6 +2171,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds create foreign key sql.
+     *
      * @param table
      * @param foreignKey
      */
@@ -2167,6 +2192,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds drop foreign key sql.
+     *
      * @param table
      * @param foreignKeyOrName
      */
@@ -2178,6 +2204,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Escapes a given comment so it's safe to include in a query.
+     *
      * @param comment
      */
     escapeComment(comment) {
@@ -2192,6 +2219,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Escapes given table or view path.
+     *
      * @param target
      */
     escapePath(target) {
@@ -2203,6 +2231,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Builds a part of query to create/change a column.
+     *
      * @param column
      * @param skipPrimary
      * @param skipName
@@ -2220,7 +2249,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         if (column.collation)
             c += ` COLLATE "${column.collation}"`;
         if (column.asExpression)
-            c += ` AS (${column.asExpression}) ${column.generatedType ? column.generatedType : "VIRTUAL"}`;
+            c += ` AS (${column.asExpression}) ${column.generatedType ?? "VIRTUAL"}`;
         if (column.unsigned) {
             c += " UNSIGNED";
         }
@@ -2231,7 +2260,7 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         const isMariaDb = this.driver.options.type === "mariadb";
         if (isMariaDb &&
             column.asExpression &&
-            ["VIRTUAL", "STORED"].includes(column.generatedType || "VIRTUAL")) {
+            ["VIRTUAL", "STORED"].includes(column.generatedType ?? "VIRTUAL")) {
             // do nothing - MariaDB does not support NULL/NOT NULL expressions for VIRTUAL columns and STORED columns
         }
         else {