typeorm 0.2.25 → 0.2.29

package/browser/driver/mysql/MysqlQueryRunner.js

@@ -1,4 +1,4 @@
-import * as tslib_1 from "tslib";
+import { __awaiter, __extends, __generator, __read, __values } from "tslib";
 import { TransactionAlreadyStartedError } from "../../error/TransactionAlreadyStartedError";
 import { TransactionNotStartedError } from "../../error/TransactionNotStartedError";
 import { TableColumn } from "../../schema-builder/table/TableColumn";
@@ -13,18 +13,17 @@ import { QueryFailedError } from "../../error/QueryFailedError";
 import { TableUnique } from "../../schema-builder/table/TableUnique";
 import { BaseQueryRunner } from "../../query-runner/BaseQueryRunner";
 import { Broadcaster } from "../../subscriber/Broadcaster";
-import { PromiseUtils } from "../../index";
 import { VersionUtils } from "../../util/VersionUtils";
+import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 /**
  * Runs queries on a single mysql database connection.
  */
 var MysqlQueryRunner = /** @class */ (function (_super) {
-    tslib_1.__extends(MysqlQueryRunner, _super);
+    __extends(MysqlQueryRunner, _super);
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
     function MysqlQueryRunner(driver, mode) {
-        if (mode === void 0) { mode = "master"; }
         var _this = _super.call(this) || this;
         _this.driver = driver;
         _this.connection = driver.connection;
@@ -73,26 +72,43 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Starts transaction on the current connection.
      */
     MysqlQueryRunner.prototype.startTransaction = function (isolationLevel) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.isTransactionActive)
                             throw new TransactionAlreadyStartedError();
-                        this.isTransactionActive = true;
-                        if (!isolationLevel) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel)];
+                        beforeBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionStartEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, this.query("START TRANSACTION")];
+                        _a.label = 2;
                     case 2:
+                        this.isTransactionActive = true;
+                        if (!isolationLevel) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.query("SET TRANSACTION ISOLATION LEVEL " + isolationLevel)];
+                    case 3:
                         _a.sent();
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, this.query("START TRANSACTION")];
+                        return [4 /*yield*/, this.query("START TRANSACTION")];
                     case 4:
                         _a.sent();
-                        _a.label = 5;
-                    case 5: return [2 /*return*/];
+                        return [3 /*break*/, 7];
+                    case 5: return [4 /*yield*/, this.query("START TRANSACTION")];
+                    case 6:
+                        _a.sent();
+                        _a.label = 7;
+                    case 7:
+                        afterBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionStartEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 9];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 8:
+                        _a.sent();
+                        _a.label = 9;
+                    case 9: return [2 /*return*/];
                 }
             });
         });
@@ -102,17 +118,32 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Error will be thrown if transaction was not started.
      */
     MysqlQueryRunner.prototype.commitTransaction = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError();
-                        return [4 /*yield*/, this.query("COMMIT")];
+                        beforeBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionCommitEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
                     case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, this.query("COMMIT")];
+                    case 3:
                         _a.sent();
                         this.isTransactionActive = false;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionCommitEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -122,17 +153,32 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Error will be thrown if transaction was not started.
      */
     MysqlQueryRunner.prototype.rollbackTransaction = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            var beforeBroadcastResult, afterBroadcastResult;
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.isTransactionActive)
                             throw new TransactionNotStartedError();
-                        return [4 /*yield*/, this.query("ROLLBACK")];
+                        beforeBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastBeforeTransactionRollbackEvent(beforeBroadcastResult);
+                        if (!(beforeBroadcastResult.promises.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.all(beforeBroadcastResult.promises)];
                     case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, this.query("ROLLBACK")];
+                    case 3:
                         _a.sent();
                         this.isTransactionActive = false;
-                        return [2 /*return*/];
+                        afterBroadcastResult = new BroadcasterResult();
+                        this.broadcaster.broadcastAfterTransactionRollbackEvent(afterBroadcastResult);
+                        if (!(afterBroadcastResult.promises.length > 0)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, Promise.all(afterBroadcastResult.promises)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -144,10 +190,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
         var _this = this;
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError();
-        return new Promise(function (ok, fail) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        return new Promise(function (ok, fail) { return __awaiter(_this, void 0, void 0, function () {
             var databaseConnection, queryStartTime_1, err_1;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
@@ -186,9 +232,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
         var _this = this;
         if (this.isReleased)
             throw new QueryRunnerAlreadyReleasedError();
-        return new Promise(function (ok, fail) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        return new Promise(function (ok, fail) { return __awaiter(_this, void 0, void 0, function () {
             var databaseConnection, databaseQuery, err_2;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
@@ -216,8 +262,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Returns all available database names including system databases.
      */
     MysqlQueryRunner.prototype.getDatabases = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 return [2 /*return*/, Promise.resolve([])];
             });
         });
@@ -227,8 +273,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * If database parameter specified, returns schemas of that database.
      */
     MysqlQueryRunner.prototype.getSchemas = function (database) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql driver does not support table schemas");
             });
         });
@@ -237,9 +283,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Checks if database with the given name exist.
      */
     MysqlQueryRunner.prototype.hasDatabase = function (database) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var result;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.query("SELECT * FROM `INFORMATION_SCHEMA`.`SCHEMATA` WHERE `SCHEMA_NAME` = '" + database + "'")];
                     case 1:
@@ -253,8 +299,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Checks if schema with the given name exist.
      */
     MysqlQueryRunner.prototype.hasSchema = function (schema) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql driver does not support table schemas");
             });
         });
@@ -263,9 +309,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Checks if table with the given name exist in the database.
      */
     MysqlQueryRunner.prototype.hasTable = function (tableOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var parsedTableName, sql, result;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         parsedTableName = this.parseTableName(tableOrName);
@@ -282,9 +328,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Checks if column with the given name exist in the given table.
      */
     MysqlQueryRunner.prototype.hasColumn = function (tableOrName, column) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var parsedTableName, columnName, sql, result;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         parsedTableName = this.parseTableName(tableOrName);
@@ -302,9 +348,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new database.
      */
     MysqlQueryRunner.prototype.createDatabase = function (database, ifNotExist) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var up, down;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         up = ifNotExist ? "CREATE DATABASE IF NOT EXISTS `" + database + "`" : "CREATE DATABASE `" + database + "`";
@@ -321,9 +367,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops database.
      */
     MysqlQueryRunner.prototype.dropDatabase = function (database, ifExist) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var up, down;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         up = ifExist ? "DROP DATABASE IF EXISTS `" + database + "`" : "DROP DATABASE `" + database + "`";
@@ -340,8 +386,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new table schema.
      */
     MysqlQueryRunner.prototype.createSchema = function (schema, ifNotExist) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("Schema create queries are not supported by MySql driver.");
             });
         });
@@ -350,8 +396,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops table schema.
      */
     MysqlQueryRunner.prototype.dropSchema = function (schemaPath, ifExist) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("Schema drop queries are not supported by MySql driver.");
             });
         });
@@ -362,10 +408,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
     MysqlQueryRunner.prototype.createTable = function (table, ifNotExist, createForeignKeys) {
         if (ifNotExist === void 0) { ifNotExist = false; }
         if (createForeignKeys === void 0) { createForeignKeys = true; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var isTableExist, upQueries, downQueries;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!ifNotExist) return [3 /*break*/, 2];
@@ -399,10 +445,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      */
     MysqlQueryRunner.prototype.dropTable = function (target, ifExist, dropForeignKeys) {
         if (dropForeignKeys === void 0) { dropForeignKeys = true; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var isTableExist, createForeignKeys, tableName, table, upQueries, downQueries;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!ifExist) return [3 /*break*/, 2];
@@ -437,9 +483,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new view.
      */
     MysqlQueryRunner.prototype.createView = function (view) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var upQueries, downQueries, _a, _b, _c, _d;
-            return tslib_1.__generator(this, function (_e) {
+            return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
                         upQueries = [];
@@ -466,9 +512,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops the view.
      */
     MysqlQueryRunner.prototype.dropView = function (target) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var viewName, view, upQueries, downQueries, _a, _b, _c, _d;
-            return tslib_1.__generator(this, function (_e) {
+            return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
                         viewName = target instanceof View ? target.name : target;
@@ -499,10 +545,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Renames a table.
      */
     MysqlQueryRunner.prototype.renameTable = function (oldTableOrName, newTableName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var upQueries, downQueries, oldTable, _a, newTable, dbName;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         upQueries = [];
@@ -580,9 +626,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new column from the column in the table.
      */
     MysqlQueryRunner.prototype.addColumn = function (tableOrName, column) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, clonedTable, upQueries, downQueries, skipColumnLevelPrimary, generatedColumn, nonGeneratedColumn, primaryColumns, columnNames, nonGeneratedColumn, columnIndex, uniqueIndex;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -660,14 +706,37 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new columns from the column in the table.
      */
     MysqlQueryRunner.prototype.addColumns = function (tableOrName, columns) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, PromiseUtils.runInSequence(columns, function (column) { return _this.addColumn(tableOrName, column); })];
+        return __awaiter(this, void 0, void 0, function () {
+            var columns_1, columns_1_1, column, e_1_1;
+            var e_1, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        columns_1 = __values(columns), columns_1_1 = columns_1.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!columns_1_1.done) return [3 /*break*/, 4];
+                        column = columns_1_1.value;
+                        return [4 /*yield*/, this.addColumn(tableOrName, column)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        columns_1_1 = columns_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_1_1 = _b.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (columns_1_1 && !columns_1_1.done && (_a = columns_1.return)) _a.call(columns_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -676,9 +745,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Renames column in the given table.
      */
     MysqlQueryRunner.prototype.renameColumn = function (tableOrName, oldTableColumnOrName, newTableColumnOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, oldColumn, newColumn;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -713,10 +782,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Changes a column in the table.
      */
     MysqlQueryRunner.prototype.changeColumn = function (tableOrName, oldColumnOrName, newColumn) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, clonedTable, upQueries, downQueries, oldColumn, oldTableColumn, generatedColumn, nonGeneratedColumn, primaryColumns, columnNames, column, columnNames, primaryColumn, column, columnNames, nonGeneratedColumn, uniqueIndex, uniqueIndex_1, tableUnique;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -805,7 +874,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                             clonedTable.columns[clonedTable.columns.indexOf(oldTableColumn)].name = newColumn.name;
                             oldColumn.name = newColumn.name;
                         }
-                        if (this.isColumnChanged(oldColumn, newColumn, true)) {
+                        if (this.isColumnChanged(oldColumn, newColumn, true, true)) {
                             upQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + oldColumn.name + "` " + this.buildCreateColumnSql(newColumn, true)));
                             downQueries.push(new Query("ALTER TABLE " + this.escapePath(table) + " CHANGE `" + newColumn.name + "` " + this.buildCreateColumnSql(oldColumn, true)));
                         }
@@ -894,14 +963,37 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Changes a column in the table.
      */
     MysqlQueryRunner.prototype.changeColumns = function (tableOrName, changedColumns) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, PromiseUtils.runInSequence(changedColumns, function (changedColumn) { return _this.changeColumn(tableOrName, changedColumn.oldColumn, changedColumn.newColumn); })];
+        return __awaiter(this, void 0, void 0, function () {
+            var changedColumns_1, changedColumns_1_1, _a, oldColumn, newColumn, e_2_1;
+            var e_2, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _c.trys.push([0, 5, 6, 7]);
+                        changedColumns_1 = __values(changedColumns), changedColumns_1_1 = changedColumns_1.next();
+                        _c.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!changedColumns_1_1.done) return [3 /*break*/, 4];
+                        _a = changedColumns_1_1.value, oldColumn = _a.oldColumn, newColumn = _a.newColumn;
+                        return [4 /*yield*/, this.changeColumn(tableOrName, oldColumn, newColumn)];
+                    case 2:
+                        _c.sent();
+                        _c.label = 3;
+                    case 3:
+                        changedColumns_1_1 = changedColumns_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_2_1 = _c.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (changedColumns_1_1 && !changedColumns_1_1.done && (_b = changedColumns_1.return)) _b.call(changedColumns_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -910,9 +1002,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops column in the table.
      */
     MysqlQueryRunner.prototype.dropColumn = function (tableOrName, columnOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, column, clonedTable, upQueries, downQueries, generatedColumn, nonGeneratedColumn, columnNames, tableColumn, columnNames_1, nonGeneratedColumn, columnIndex, uniqueName_1, foundUnique, indexName_1, foundIndex;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -994,14 +1086,37 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops the columns in the table.
      */
     MysqlQueryRunner.prototype.dropColumns = function (tableOrName, columns) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, PromiseUtils.runInSequence(columns, function (column) { return _this.dropColumn(tableOrName, column); })];
+        return __awaiter(this, void 0, void 0, function () {
+            var columns_2, columns_2_1, column, e_3_1;
+            var e_3, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        columns_2 = __values(columns), columns_2_1 = columns_2.next();
+                        _b.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!columns_2_1.done) return [3 /*break*/, 4];
+                        column = columns_2_1.value;
+                        return [4 /*yield*/, this.dropColumn(tableOrName, column)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        columns_2_1 = columns_2.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_3_1 = _b.sent();
+                        e_3 = { error: e_3_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (columns_2_1 && !columns_2_1.done && (_a = columns_2.return)) _a.call(columns_2);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -1010,9 +1125,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new primary key.
      */
     MysqlQueryRunner.prototype.createPrimaryKey = function (tableOrName, columnNames) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, clonedTable, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1044,9 +1159,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Updates composite primary keys.
      */
     MysqlQueryRunner.prototype.updatePrimaryKeys = function (tableOrName, columns) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, clonedTable, columnNames, upQueries, downQueries, generatedColumn, nonGeneratedColumn, primaryColumns, columnNames_2, columnNamesString, newOrExistGeneratedColumn, nonGeneratedColumn, changedGeneratedColumn;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1107,9 +1222,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops a primary key.
      */
     MysqlQueryRunner.prototype.dropPrimaryKey = function (tableOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1138,8 +1253,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new unique constraint.
      */
     MysqlQueryRunner.prototype.createUniqueConstraint = function (tableOrName, uniqueConstraint) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support unique constraints. Use unique index instead.");
             });
         });
@@ -1148,8 +1263,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new unique constraints.
      */
     MysqlQueryRunner.prototype.createUniqueConstraints = function (tableOrName, uniqueConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support unique constraints. Use unique index instead.");
             });
         });
@@ -1158,8 +1273,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops an unique constraint.
      */
     MysqlQueryRunner.prototype.dropUniqueConstraint = function (tableOrName, uniqueOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support unique constraints. Use unique index instead.");
             });
         });
@@ -1168,8 +1283,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops an unique constraints.
      */
     MysqlQueryRunner.prototype.dropUniqueConstraints = function (tableOrName, uniqueConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support unique constraints. Use unique index instead.");
             });
         });
@@ -1178,8 +1293,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new check constraint.
      */
     MysqlQueryRunner.prototype.createCheckConstraint = function (tableOrName, checkConstraint) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support check constraints.");
             });
         });
@@ -1188,8 +1303,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new check constraints.
      */
     MysqlQueryRunner.prototype.createCheckConstraints = function (tableOrName, checkConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support check constraints.");
             });
         });
@@ -1198,8 +1313,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops check constraint.
      */
     MysqlQueryRunner.prototype.dropCheckConstraint = function (tableOrName, checkOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support check constraints.");
             });
         });
@@ -1208,8 +1323,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops check constraints.
      */
     MysqlQueryRunner.prototype.dropCheckConstraints = function (tableOrName, checkConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support check constraints.");
             });
         });
@@ -1218,8 +1333,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new exclusion constraint.
      */
     MysqlQueryRunner.prototype.createExclusionConstraint = function (tableOrName, exclusionConstraint) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support exclusion constraints.");
             });
         });
@@ -1228,8 +1343,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new exclusion constraints.
      */
     MysqlQueryRunner.prototype.createExclusionConstraints = function (tableOrName, exclusionConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support exclusion constraints.");
             });
         });
@@ -1238,8 +1353,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops exclusion constraint.
      */
     MysqlQueryRunner.prototype.dropExclusionConstraint = function (tableOrName, exclusionOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support exclusion constraints.");
             });
         });
@@ -1248,8 +1363,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops exclusion constraints.
      */
     MysqlQueryRunner.prototype.dropExclusionConstraints = function (tableOrName, exclusionConstraints) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 throw new Error("MySql does not support exclusion constraints.");
             });
         });
@@ -1258,9 +1373,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new foreign key.
      */
     MysqlQueryRunner.prototype.createForeignKey = function (tableOrName, foreignKey) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1290,10 +1405,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new foreign keys.
      */
     MysqlQueryRunner.prototype.createForeignKeys = function (tableOrName, foreignKeys) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = foreignKeys.map(function (foreignKey) { return _this.createForeignKey(tableOrName, foreignKey); });
@@ -1309,9 +1424,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops a foreign key.
      */
     MysqlQueryRunner.prototype.dropForeignKey = function (tableOrName, foreignKeyOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, foreignKey, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1341,10 +1456,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops a foreign keys from the table.
      */
     MysqlQueryRunner.prototype.dropForeignKeys = function (tableOrName, foreignKeys) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = foreignKeys.map(function (foreignKey) { return _this.dropForeignKey(tableOrName, foreignKey); });
@@ -1360,9 +1475,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new index.
      */
     MysqlQueryRunner.prototype.createIndex = function (tableOrName, index) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1392,10 +1507,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Creates a new indices
      */
     MysqlQueryRunner.prototype.createIndices = function (tableOrName, indices) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = indices.map(function (index) { return _this.createIndex(tableOrName, index); });
@@ -1411,9 +1526,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops an index.
      */
     MysqlQueryRunner.prototype.dropIndex = function (tableOrName, indexOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var table, _a, index, up, down;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!(tableOrName instanceof Table)) return [3 /*break*/, 1];
@@ -1443,10 +1558,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Drops an indices from the table.
      */
     MysqlQueryRunner.prototype.dropIndices = function (tableOrName, indices) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var promises;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         promises = indices.map(function (index) { return _this.dropIndex(tableOrName, index); });
@@ -1463,8 +1578,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Note: this operation uses SQL's TRUNCATE query which cannot be reverted in transactions.
      */
     MysqlQueryRunner.prototype.clearTable = function (tableOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.query("TRUNCATE TABLE " + this.escapePath(tableOrName))];
                     case 1:
@@ -1480,10 +1595,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * (because it can clear all your database).
      */
     MysqlQueryRunner.prototype.clearDatabase = function (database) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var dbName, isDatabaseExist, selectViewDropsQuery, dropViewQueries, disableForeignKeysCheckQuery, dropTablesQuery, enableForeignKeysCheckQuery, dropQueries, error_1, rollbackError_1;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         dbName = database ? database : this.driver.database;
@@ -1552,9 +1667,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Returns current database.
      */
     MysqlQueryRunner.prototype.getCurrentDatabase = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var currentDBQuery;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.query("SELECT DATABASE() AS `db_name`")];
                     case 1:
@@ -1565,10 +1680,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
         });
     };
     MysqlQueryRunner.prototype.loadViews = function (viewNames) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var hasTable, currentDatabase, viewsCondition, query, dbViews;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.hasTable(this.getTypeormMetadataTableName())];
                     case 1:
@@ -1579,7 +1694,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                     case 2:
                         currentDatabase = _a.sent();
                         viewsCondition = viewNames.map(function (tableName) {
-                            var _a = tslib_1.__read(tableName.split("."), 2), database = _a[0], name = _a[1];
+                            var _a = __read(tableName.split("."), 2), database = _a[0], name = _a[1];
                             if (!name) {
                                 name = database;
                                 database = _this.driver.database || currentDatabase;
@@ -1606,10 +1721,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Loads all tables (with given names) from the database and creates a Table from them.
      */
     MysqlQueryRunner.prototype.loadTables = function (tableNames) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var currentDatabase, tablesCondition, tablesSql, columnsSql, primaryKeySql, collationsSql, indicesCondition, indicesSql, foreignKeysCondition, foreignKeysSql, _a, dbTables, dbColumns, dbPrimaryKeys, dbCollations, dbIndices, dbForeignKeys, isMariaDb, dbVersion;
+        return __awaiter(this, void 0, void 0, function () {
+            var currentDatabase, statsSubquerySql, kcuSubquerySql, rcSubquerySql, tablesSql, columnsSql, collationsSql, primaryKeySql, indicesSql, foreignKeysSql, _a, dbTables, dbColumns, dbPrimaryKeys, dbCollations, dbIndices, dbForeignKeys, isMariaDb, dbVersion;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         // if no tables given then no need to proceed
@@ -1618,42 +1733,50 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.getCurrentDatabase()];
                     case 1:
                         currentDatabase = _b.sent();
-                        tablesCondition = tableNames.map(function (tableName) {
-                            var _a = tslib_1.__read(tableName.split("."), 2), database = _a[0], name = _a[1];
+                        statsSubquerySql = tableNames.map(function (tableName) {
+                            var _a = __read(tableName.split("."), 2), database = _a[0], name = _a[1];
                             if (!name) {
                                 name = database;
                                 database = _this.driver.database || currentDatabase;
                             }
-                            return "(`TABLE_SCHEMA` = '" + database + "' AND `TABLE_NAME` = '" + name + "')";
-                        }).join(" OR ");
-                        tablesSql = "SELECT * FROM `INFORMATION_SCHEMA`.`TABLES` WHERE " + tablesCondition;
-                        columnsSql = "SELECT * FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE " + tablesCondition;
-                        primaryKeySql = "SELECT * FROM `INFORMATION_SCHEMA`.`KEY_COLUMN_USAGE` WHERE `CONSTRAINT_NAME` = 'PRIMARY' AND (" + tablesCondition + ")";
-                        collationsSql = "SELECT `SCHEMA_NAME`, `DEFAULT_CHARACTER_SET_NAME` as `CHARSET`, `DEFAULT_COLLATION_NAME` AS `COLLATION` FROM `INFORMATION_SCHEMA`.`SCHEMATA`";
-                        indicesCondition = tableNames.map(function (tableName) {
-                            var _a = tslib_1.__read(tableName.split("."), 2), database = _a[0], name = _a[1];
+                            return "\n                SELECT\n                    *\n                FROM `INFORMATION_SCHEMA`.`STATISTICS`\n                WHERE\n                    `TABLE_SCHEMA` = '" + database + "'\n                    AND\n                    `TABLE_NAME` = '" + name + "'\n            ";
+                        }).join(" UNION ");
+                        kcuSubquerySql = tableNames.map(function (tableName) {
+                            var _a = __read(tableName.split("."), 2), database = _a[0], name = _a[1];
                             if (!name) {
                                 name = database;
                                 database = _this.driver.database || currentDatabase;
                             }
-                            return "(`s`.`TABLE_SCHEMA` = '" + database + "' AND `s`.`TABLE_NAME` = '" + name + "')";
-                        }).join(" OR ");
-                        indicesSql = "SELECT `s`.* FROM `INFORMATION_SCHEMA`.`STATISTICS` `s` " +
-                            "LEFT JOIN `INFORMATION_SCHEMA`.`REFERENTIAL_CONSTRAINTS` `rc` ON `s`.`INDEX_NAME` = `rc`.`CONSTRAINT_NAME` " +
-                            ("WHERE (" + indicesCondition + ") AND `s`.`INDEX_NAME` != 'PRIMARY' AND `rc`.`CONSTRAINT_NAME` IS NULL");
-                        foreignKeysCondition = tableNames.map(function (tableName) {
-                            var _a = tslib_1.__read(tableName.split("."), 2), database = _a[0], name = _a[1];
+                            return "\n                SELECT\n                    *\n                FROM `INFORMATION_SCHEMA`.`KEY_COLUMN_USAGE` `kcu`\n                WHERE\n                    `kcu`.`TABLE_SCHEMA` = '" + database + "'\n                    AND\n                    `kcu`.`TABLE_NAME` = '" + name + "'\n            ";
+                        }).join(" UNION ");
+                        rcSubquerySql = tableNames.map(function (tableName) {
+                            var _a = __read(tableName.split("."), 2), database = _a[0], name = _a[1];
                             if (!name) {
                                 name = database;
                                 database = _this.driver.database || currentDatabase;
                             }
-                            return "(`kcu`.`TABLE_SCHEMA` = '" + database + "' AND `kcu`.`TABLE_NAME` = '" + name + "')";
-                        }).join(" OR ");
-                        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 `INFORMATION_SCHEMA`.`KEY_COLUMN_USAGE` `kcu` " +
-                            "INNER JOIN `INFORMATION_SCHEMA`.`REFERENTIAL_CONSTRAINTS` `rc` ON `rc`.`constraint_name` = `kcu`.`constraint_name` " +
-                            "WHERE " + foreignKeysCondition;
+                            return "\n                SELECT\n                    *\n                FROM `INFORMATION_SCHEMA`.`REFERENTIAL_CONSTRAINTS`\n                WHERE\n                    `CONSTRAINT_SCHEMA` = '" + database + "'\n                    AND\n                    `TABLE_NAME` = '" + name + "'\n            ";
+                        }).join(" UNION ");
+                        tablesSql = tableNames.map(function (tableName) {
+                            var _a = __read(tableName.split("."), 2), database = _a[0], name = _a[1];
+                            if (!name) {
+                                name = database;
+                                database = _this.driver.database || currentDatabase;
+                            }
+                            return "\n                SELECT\n                    `TABLE_SCHEMA`,\n                    `TABLE_NAME`\n                FROM\n                    `INFORMATION_SCHEMA`.`TABLES`\n                WHERE\n                    `TABLE_SCHEMA` = '" + database + "'\n                    AND\n                    `TABLE_NAME` = '" + name + "'\n                ";
+                        }).join(" UNION ");
+                        columnsSql = tableNames.map(function (tableName) {
+                            var _a = __read(tableName.split("."), 2), database = _a[0], name = _a[1];
+                            if (!name) {
+                                name = database;
+                                database = _this.driver.database || currentDatabase;
+                            }
+                            return "\n                SELECT\n                    *\n                FROM\n                    `INFORMATION_SCHEMA`.`COLUMNS`\n                WHERE\n                    `TABLE_SCHEMA` = '" + database + "'\n                    AND\n                    `TABLE_NAME` = '" + name + "'\n                ";
+                        }).join(" UNION ");
+                        collationsSql = "\n            SELECT\n                `SCHEMA_NAME`,\n                `DEFAULT_CHARACTER_SET_NAME` as `CHARSET`,\n                `DEFAULT_COLLATION_NAME` AS `COLLATION`\n            FROM `INFORMATION_SCHEMA`.`SCHEMATA`\n            ";
+                        primaryKeySql = "SELECT * FROM (" + kcuSubquerySql + ") `kcu` WHERE `CONSTRAINT_NAME` = 'PRIMARY'";
+                        indicesSql = "\n            SELECT\n                `s`.*\n            FROM (" + statsSubquerySql + ") `s`\n            LEFT JOIN (" + rcSubquerySql + ") `rc`\n                ON\n                    `s`.`INDEX_NAME` = `rc`.`CONSTRAINT_NAME`\n                    AND\n                    `s`.`TABLE_SCHEMA` = `rc`.`CONSTRAINT_SCHEMA`\n            WHERE\n                `s`.`INDEX_NAME` != 'PRIMARY'\n                AND\n                `rc`.`CONSTRAINT_NAME` IS NULL\n            ";
+                        foreignKeysSql = "\n            SELECT\n                `kcu`.`TABLE_SCHEMA`,\n                `kcu`.`TABLE_NAME`,\n                `kcu`.`CONSTRAINT_NAME`,\n                `kcu`.`COLUMN_NAME`,\n                `kcu`.`REFERENCED_TABLE_SCHEMA`,\n                `kcu`.`REFERENCED_TABLE_NAME`,\n                `kcu`.`REFERENCED_COLUMN_NAME`,\n                `rc`.`DELETE_RULE` `ON_DELETE`,\n                `rc`.`UPDATE_RULE` `ON_UPDATE`\n            FROM (" + kcuSubquerySql + ") `kcu`\n            INNER JOIN (" + rcSubquerySql + ") `rc`\n                ON\n                    `rc`.`CONSTRAINT_SCHEMA` = `kcu`.`CONSTRAINT_SCHEMA`\n                    AND\n                    `rc`.`TABLE_NAME` = `kcu`.`TABLE_NAME`\n                    AND\n                    `rc`.`CONSTRAINT_NAME` = `kcu`.`CONSTRAINT_NAME`\n            ";
                         return [4 /*yield*/, Promise.all([
                                 this.query(tablesSql),
                                 this.query(columnsSql),
@@ -1663,7 +1786,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                                 this.query(foreignKeysSql)
                             ])];
                     case 2:
-                        _a = tslib_1.__read.apply(void 0, [_b.sent(), 6]), dbTables = _a[0], dbColumns = _a[1], dbPrimaryKeys = _a[2], dbCollations = _a[3], dbIndices = _a[4], dbForeignKeys = _a[5];
+                        _a = __read.apply(void 0, [_b.sent(), 6]), dbTables = _a[0], dbColumns = _a[1], dbPrimaryKeys = _a[2], dbCollations = _a[3], dbIndices = _a[4], dbForeignKeys = _a[5];
                         // if tables were not found in the db, no need to proceed
                         if (!dbTables.length)
                             return [2 /*return*/, []];
@@ -1672,10 +1795,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                     case 3:
                         dbVersion = _b.sent();
                         // create tables for loaded tables
-                        return [2 /*return*/, Promise.all(dbTables.map(function (dbTable) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        return [2 /*return*/, Promise.all(dbTables.map(function (dbTable) { return __awaiter(_this, void 0, void 0, function () {
                                 var table, dbCollation, defaultCollation, defaultCharset, db, tableFullName, tableForeignKeyConstraints, tableIndexConstraints;
                                 var _this = this;
-                                return tslib_1.__generator(this, function (_a) {
+                                return __generator(this, function (_a) {
                                     table = new Table();
                                     dbCollation = dbCollations.find(function (coll) { return coll["SCHEMA_NAME"] === dbTable["TABLE_SCHEMA"]; });
                                     defaultCollation = dbCollation["COLLATION"];
@@ -1708,6 +1831,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                                         var tableColumn = new TableColumn();
                                         tableColumn.name = dbColumn["COLUMN_NAME"];
                                         tableColumn.type = dbColumn["DATA_TYPE"].toLowerCase();
+                                        tableColumn.zerofill = dbColumn["COLUMN_TYPE"].indexOf("zerofill") !== -1;
+                                        tableColumn.unsigned = tableColumn.zerofill ? true : dbColumn["COLUMN_TYPE"].indexOf("unsigned") !== -1;
                                         if (_this.driver.withWidthColumnTypes.indexOf(tableColumn.type) !== -1) {
                                             var 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;
@@ -1731,7 +1856,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                                             tableColumn.default = "'" + dbColumn["COLUMN_DEFAULT"] + "'";
                                         }
                                         if (dbColumn["EXTRA"].indexOf("on update") !== -1) {
-                                            tableColumn.onUpdate = dbColumn["EXTRA"].substring(dbColumn["EXTRA"].indexOf("on update") + 10);
+                                            // New versions of MariaDB return expressions in lowercase.  We need to set it in
+                                            // uppercase so the comparison in MysqlDriver#compareExtraValues does not fail.
+                                            tableColumn.onUpdate = dbColumn["EXTRA"].substring(dbColumn["EXTRA"].indexOf("on update") + 10).toUpperCase();
                                         }
                                         if (dbColumn["GENERATION_EXPRESSION"]) {
                                             tableColumn.asExpression = dbColumn["GENERATION_EXPRESSION"];
@@ -1742,12 +1869,10 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                                         tableColumn.isPrimary = dbPrimaryKeys.some(function (dbPrimaryKey) {
                                             return _this.driver.buildTableName(dbPrimaryKey["TABLE_NAME"], undefined, dbPrimaryKey["TABLE_SCHEMA"]) === tableFullName && dbPrimaryKey["COLUMN_NAME"] === tableColumn.name;
                                         });
-                                        tableColumn.zerofill = dbColumn["COLUMN_TYPE"].indexOf("zerofill") !== -1;
-                                        tableColumn.unsigned = tableColumn.zerofill ? true : dbColumn["COLUMN_TYPE"].indexOf("unsigned") !== -1;
                                         tableColumn.isGenerated = dbColumn["EXTRA"].indexOf("auto_increment") !== -1;
                                         if (tableColumn.isGenerated)
                                             tableColumn.generationStrategy = "increment";
-                                        tableColumn.comment = dbColumn["COLUMN_COMMENT"];
+                                        tableColumn.comment = (typeof dbColumn["COLUMN_COMMENT"] === "string" && dbColumn["COLUMN_COMMENT"].length === 0) ? undefined : dbColumn["COLUMN_COMMENT"];
                                         if (dbColumn["CHARACTER_SET_NAME"])
                                             tableColumn.charset = dbColumn["CHARACTER_SET_NAME"] === defaultCharset ? undefined : dbColumn["CHARACTER_SET_NAME"];
                                         if (dbColumn["COLLATION_NAME"])
@@ -1913,15 +2038,15 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
         }
     };
     MysqlQueryRunner.prototype.insertViewDefinitionSql = function (view) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var currentDatabase, expression, _a, query, parameters;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getCurrentDatabase()];
                     case 1:
                         currentDatabase = _b.sent();
                         expression = typeof view.expression === "string" ? view.expression.trim() : view.expression(this.connection).getQuery();
-                        _a = tslib_1.__read(this.connection.createQueryBuilder()
+                        _a = __read(this.connection.createQueryBuilder()
                             .insert()
                             .into(this.getTypeormMetadataTableName())
                             .values({ type: "VIEW", schema: currentDatabase, name: view.name, value: expression })
@@ -1941,16 +2066,16 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      * Builds remove view sql.
      */
     MysqlQueryRunner.prototype.deleteViewDefinitionSql = function (viewOrPath) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var currentDatabase, viewName, qb, _a, query, parameters;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getCurrentDatabase()];
                     case 1:
                         currentDatabase = _b.sent();
                         viewName = viewOrPath instanceof View ? viewOrPath.name : viewOrPath;
                         qb = this.connection.createQueryBuilder();
-                        _a = tslib_1.__read(qb.delete()
+                        _a = __read(qb.delete()
                             .from(this.getTypeormMetadataTableName())
                             .where(qb.escape("type") + " = 'VIEW'")
                             .andWhere(qb.escape("schema") + " = :schema", { schema: currentDatabase })
@@ -2024,6 +2149,19 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
             tableName: tableName.indexOf(".") !== -1 ? tableName.split(".")[1] : tableName
         };
     };
+    /**
+     * Escapes a given comment so it's safe to include in a query.
+     */
+    MysqlQueryRunner.prototype.escapeComment = function (comment) {
+        if (comment === undefined || comment.length === 0) {
+            return "''";
+        }
+        comment = comment
+            .replace("\\", "\\\\") // MySQL allows escaping characters via backslashes
+            .replace("'", "''")
+            .replace("\0", ""); // Null bytes aren't allowed in comments
+        return "'" + comment + "'";
+    };
     /**
      * Escapes given table or view path.
      */
@@ -2066,8 +2204,8 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
             c += " PRIMARY KEY";
         if (column.isGenerated && column.generationStrategy === "increment") // don't use skipPrimary here since updates can update already exist primary without auto inc.
             c += " AUTO_INCREMENT";
-        if (column.comment)
-            c += " COMMENT '" + column.comment.replace("'", "''") + "'";
+        if (column.comment !== undefined && column.comment.length > 0)
+            c += " COMMENT " + this.escapeComment(column.comment);
         if (column.default !== undefined && column.default !== null)
             c += " DEFAULT " + column.default;
         if (column.onUpdate)
@@ -2075,9 +2213,9 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
         return c;
     };
     MysqlQueryRunner.prototype.getVersion = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var result;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.query("SELECT VERSION() AS `version`")];
                     case 1:
@@ -2087,6 +2225,34 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * Checks if column display width is by default.
+     */
+    MysqlQueryRunner.prototype.isDefaultColumnWidth = function (table, column, width) {
+        // if table have metadata, we check if length is specified in column metadata
+        if (this.connection.hasMetadata(table.name)) {
+            var metadata = this.connection.getMetadata(table.name);
+            var columnMetadata = metadata.findColumnWithDatabaseName(column.name);
+            if (columnMetadata && columnMetadata.width)
+                return false;
+        }
+        var 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.
+            var typesWithReducedUnsignedDefault = ["int", "tinyint", "smallint", "mediumint"];
+            var needsAdjustment = typesWithReducedUnsignedDefault.indexOf(column.type) !== -1;
+            if (column.unsigned && needsAdjustment) {
+                return (defaultWidthForType - 1) === width;
+            }
+            else {
+                return defaultWidthForType === width;
+            }
+        }
+        return false;
+    };
     return MysqlQueryRunner;
 }(BaseQueryRunner));
 export { MysqlQueryRunner };