typeorm 0.2.27 → 0.2.31

package/browser/driver/mysql/MysqlQueryRunner.js

@@ -14,6 +14,7 @@ import { TableUnique } from "../../schema-builder/table/TableUnique";
 import { BaseQueryRunner } from "../../query-runner/BaseQueryRunner";
 import { Broadcaster } from "../../subscriber/Broadcaster";
 import { VersionUtils } from "../../util/VersionUtils";
+import { BroadcasterResult } from "../../subscriber/BroadcasterResult";
 /**
  * Runs queries on a single mysql database connection.
  */
@@ -72,25 +73,42 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      */
     MysqlQueryRunner.prototype.startTransaction = function (isolationLevel) {
         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*/];
                 }
             });
         });
@@ -101,16 +119,31 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      */
     MysqlQueryRunner.prototype.commitTransaction = function () {
         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*/];
                 }
             });
         });
@@ -121,16 +154,31 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      */
     MysqlQueryRunner.prototype.rollbackTransaction = function () {
         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*/];
                 }
             });
         });
@@ -826,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)));
                         }
@@ -1674,7 +1722,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
      */
     MysqlQueryRunner.prototype.loadTables = function (tableNames) {
         return __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;
+            var currentDatabase, statsSubquerySql, kcuSubquerySql, rcSubquerySql, tablesSql, columnsSql, collationsSql, primaryKeySql, indicesSql, foreignKeysSql, _a, dbTables, dbColumns, dbPrimaryKeys, dbCollations, dbIndices, dbForeignKeys, isMariaDb, dbVersion;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -1685,42 +1733,50 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.getCurrentDatabase()];
                     case 1:
                         currentDatabase = _b.sent();
-                        tablesCondition = tableNames.map(function (tableName) {
+                        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) {
+                            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` AND `s`.`TABLE_SCHEMA` = `rc`.`CONSTRAINT_SCHEMA`" +
-                            ("WHERE (" + indicesCondition + ") AND `s`.`INDEX_NAME` != 'PRIMARY' AND `rc`.`CONSTRAINT_NAME` IS NULL");
-                        foreignKeysCondition = tableNames.map(function (tableName) {
+                            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),
@@ -1816,7 +1872,7 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
                                         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"])
@@ -2093,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.
      */
@@ -2127,16 +2196,22 @@ var MysqlQueryRunner = /** @class */ (function (_super) {
             c += " CHARACTER SET \"" + column.charset + "\"";
         if (column.collation)
             c += " COLLATE \"" + column.collation + "\"";
-        if (!column.isNullable)
-            c += " NOT NULL";
-        if (column.isNullable)
-            c += " NULL";
+        var isMariaDb = this.driver.options.type === "mariadb";
+        if (isMariaDb && column.asExpression && (column.generatedType || "VIRTUAL") === "VIRTUAL") {
+            // do nothing - MariaDB does not support NULL/NOT NULL expressions for VIRTUAL columns
+        }
+        else {
+            if (!column.isNullable)
+                c += " NOT NULL";
+            if (column.isNullable)
+                c += " NULL";
+        }
         if (column.isPrimary && !skipPrimary)
             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)