fix(codegen/golang): BREAKING: Use int16 for MySQL SMALLINT and `…

…YEAR` (#3106) Resolves #3088
sqlc-dev · Jan 5, 2024 · 8a58933 · 8a58933
1 parent 8d68872
commit 8a58933
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/internal/codegen/golang/mysql_type.go b/internal/codegen/golang/mysql_type.go
@@ -38,7 +38,16 @@ func mysqlType(req *plugin.GenerateRequest, options *opts.Options, col *plugin.C
 			return "sql.NullInt32"
 		}
 
-	case "int", "integer", "smallint", "mediumint", "year":
+	case "smallint", "year":
+		if notNull {
+			if unsigned {
+				return "uint16"
+			}
+			return "int16"
+		}
+		return "sql.NullInt16"
+
+	case "int", "integer", "mediumint":
 		if notNull {
 			if unsigned {
 				return "uint32"

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/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