sqlc-dev · kyleconroy · Mar 28, 2024 · Mar 28, 2024
diff --git a/internal/codegen/golang/mysql_type.go b/internal/codegen/golang/mysql_type.go
@@ -31,14 +31,22 @@ func mysqlType(req *plugin.GenerateRequest, options *opts.Options, col *plugin.C
 		} else {
 			if notNull {
 				if unsigned {
-					return "uint32"
+					return "uint8"
 				}
-				return "int32"
+				return "int8"
 			}
-			return "sql.NullInt32"
+			// The database/sql package does not have a sql.NullInt8 type, so we
+			// use the smallest type they have which is NullInt16
+			return "sql.NullInt16"
 		}
 
-	case "smallint", "year":
+	case "year":
+		if notNull {
+			return "int16"
+		}
+		return "sql.NullInt16"
+
+	case "smallint":
 		if notNull {
 			if unsigned {
 				return "uint16"

diff --git a/internal/endtoend/testdata/datatype/mysql/go/models.go b/internal/endtoend/testdata/datatype/mysql/go/models.go
diff --git a/internal/endtoend/testdata/json/mysql/go/copyfrom.go b/internal/endtoend/testdata/json/mysql/go/copyfrom.go
diff --git a/internal/endtoend/testdata/vet_explain/mysql/db/models.go b/internal/endtoend/testdata/vet_explain/mysql/db/models.go
diff --git a/internal/endtoend/testdata/vet_explain/mysql/db/query.sql.go b/internal/endtoend/testdata/vet_explain/mysql/db/query.sql.go