typeorm 0.3.11-dev.5253c8f → 0.3.11-dev.6eb674b

package/browser/driver/aurora-mysql/AuroraMysqlQueryRunner.js

@@ -1223,6 +1223,11 @@ export class AuroraMysqlQueryRunner extends BaseQueryRunner {
                 const tableColumn = new TableColumn();
                 tableColumn.name = dbColumn["COLUMN_NAME"];
                 tableColumn.type = dbColumn["DATA_TYPE"].toLowerCase();
+                // Unsigned columns are handled differently when it comes to width.
+                // Hence, we need to set the unsigned attribute before we check the width.
+                tableColumn.unsigned = tableColumn.zerofill
+                    ? true
+                    : dbColumn["COLUMN_TYPE"].indexOf("unsigned") !== -1;
                 if (this.driver.withWidthColumnTypes.indexOf(tableColumn.type) !== -1) {
                     const width = dbColumn["COLUMN_TYPE"].substring(dbColumn["COLUMN_TYPE"].indexOf("(") + 1, dbColumn["COLUMN_TYPE"].indexOf(")"));
                     tableColumn.width =
@@ -1269,9 +1274,6 @@ export class AuroraMysqlQueryRunner extends BaseQueryRunner {
                 });
                 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)
@@ -1673,7 +1675,22 @@ export class AuroraMysqlQueryRunner extends BaseQueryRunner {
             this.connection.driver.dataTypeDefaults[column.type] &&
             this.connection.driver.dataTypeDefaults[column.type].width;
         if (defaultWidthForType) {
-            return defaultWidthForType === width;
+            // In MariaDB & MySQL 5.7, the default widths of certain numeric types are 1 less than
+            // the usual defaults when the column is unsigned.
+            // This also applies to Aurora MySQL.
+            const typesWithReducedUnsignedDefault = [
+                "int",
+                "tinyint",
+                "smallint",
+                "mediumint",
+            ];
+            const needsAdjustment = typesWithReducedUnsignedDefault.indexOf(column.type) !== -1;
+            if (column.unsigned && needsAdjustment) {
+                return defaultWidthForType - 1 === width;
+            }
+            else {
+                return defaultWidthForType === width;
+            }
         }
         return false;
     }