fix bug where datatype is read from

See sqlc-dev#1460 (comment) DataType is never filled in so this comparison is buggy. This change mirrors what the go gen.go does instead. Deleting a field from proto can be not safe for compat, so we could use https://developers.google.com/protocol-buffers/docs/proto3#reserved, but I think these protos are transient so it should be ok.
stephen · Mar 2, 2022 · 2cec58a · 2cec58a
1 parent ccf980b
commit 2cec58a
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 94 deletions.
diff --git a/internal/codegen/python/gen.go b/internal/codegen/python/gen.go
@@ -187,6 +187,7 @@ func makePyType(req *plugin.CodeGenRequest, col *plugin.Column) pyType {
 }
 
 func pyInnerType(req *plugin.CodeGenRequest, col *plugin.Column) string {
+	columnType := sdk.DataType(col.Type)
 	for _, oride := range req.Settings.Overrides {
 		if !pyTypeIsSet(oride.PythonType) {
 			continue
@@ -195,7 +196,7 @@ func pyInnerType(req *plugin.CodeGenRequest, col *plugin.Column) string {
 		if oride.Column != "" && sdk.MatchString(oride.ColumnName, col.Name) && sameTable {
 			return pyTypeString(oride.PythonType)
 		}
-		if oride.DbType != "" && oride.DbType == col.DataType && oride.Nullable != (col.NotNull || col.IsArray) {
+		if oride.DbType != "" && oride.DbType == columnType && oride.Nullable != (col.NotNull || col.IsArray) {
 			return pyTypeString(oride.PythonType)
 		}
 	}

diff --git a/internal/plugin/codegen.pb.go b/internal/plugin/codegen.pb.go
diff --git a/internal/plugin/codegen_vtproto.pb.go b/internal/plugin/codegen_vtproto.pb.go
diff --git a/protos/plugin/codegen.proto b/protos/plugin/codegen.proto
@@ -158,7 +158,6 @@ message Column
   Identifier table = 10;
   string table_alias = 11;
   Identifier type = 12;
-  string data_type = 13;
 }
 
 message Query