typeorm 0.3.27-dev.fa3cd43 → 0.3.28-dev.02e7b71

package/driver/mysql/MysqlQueryRunner.d.ts

@@ -183,11 +183,11 @@ export declare class MysqlQueryRunner extends BaseQueryRunner implements QueryRu
      */
     createUniqueConstraints(tableOrName: Table | string, uniqueConstraints: TableUnique[]): Promise<void>;
     /**
-     * Drops an unique constraint.
+     * Drops a unique constraint.
      */
     dropUniqueConstraint(tableOrName: Table | string, uniqueOrName: TableUnique | string): Promise<void>;
     /**
-     * Drops an unique constraints.
+     * Drops a unique constraints.
      */
     dropUniqueConstraints(tableOrName: Table | string, uniqueConstraints: TableUnique[]): Promise<void>;
     /**
@@ -327,6 +327,7 @@ export declare class MysqlQueryRunner extends BaseQueryRunner implements QueryRu
     getVersion(): Promise<string>;
     /**
      * Checks if column display width is by default.
+     * @deprecated MySQL no longer supports column width in newer versions.
      */
     protected isDefaultColumnWidth(table: Table, column: TableColumn, width: number): boolean;
 }

package/driver/mysql/MysqlQueryRunner.js

@@ -18,6 +18,7 @@ const BroadcasterResult_1 = require("../../subscriber/BroadcasterResult");
 const InstanceChecker_1 = require("../../util/InstanceChecker");
 const OrmUtils_1 = require("../../util/OrmUtils");
 const VersionUtils_1 = require("../../util/VersionUtils");
+const DriverUtils_1 = require("../DriverUtils");
 const Query_1 = require("../Query");
 const MetadataTableType_1 = require("../types/MetadataTableType");
 /**
@@ -1135,13 +1136,13 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
         throw new error_1.TypeORMError(`MySql does not support unique constraints. Use unique index instead.`);
     }
     /**
-     * Drops an unique constraint.
+     * Drops a unique constraint.
      */
     async dropUniqueConstraint(tableOrName, uniqueOrName) {
         throw new error_1.TypeORMError(`MySql does not support unique constraints. Use unique index instead.`);
     }
     /**
-     * Drops an unique constraints.
+     * Drops a unique constraints.
      */
     async dropUniqueConstraints(tableOrName, uniqueConstraints) {
         throw new error_1.TypeORMError(`MySql does not support unique constraints. Use unique index instead.`);
@@ -1603,12 +1604,11 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
                     tableColumn.type = "geometrycollection";
                 }
                 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) {
+                    dbColumn["COLUMN_TYPE"].includes("zerofill");
+                tableColumn.unsigned =
+                    tableColumn.zerofill ||
+                        dbColumn["COLUMN_TYPE"].includes("unsigned");
+                if (this.driver.unsignedColumnTypes.includes(tableColumn.type)) {
                     const width = dbColumn["COLUMN_TYPE"].substring(dbColumn["COLUMN_TYPE"].indexOf("(") + 1, dbColumn["COLUMN_TYPE"].indexOf(")"));
                     tableColumn.width =
                         width &&
@@ -2102,8 +2102,14 @@ class MysqlQueryRunner extends BaseQueryRunner_1.BaseQueryRunner {
     }
     /**
      * Checks if column display width is by default.
+     * @deprecated MySQL no longer supports column width in newer versions.
      */
     isDefaultColumnWidth(table, column, width) {
+        // Skip the whole check on servers that no longer expose width metadata.
+        if (this.driver.options.type === "mysql" &&
+            DriverUtils_1.DriverUtils.isReleaseVersionOrGreater(this.driver, "8.0.0")) {
+            return true;
+        }
         // if table have metadata, we check if length is specified in column metadata
         if (this.connection.hasMetadata(table.name)) {
             const metadata = this.connection.getMetadata(table.name);