From 62d3597869cb854ed66ac61e3b477273ad6c5b94 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Thu, 7 Nov 2019 15:06:28 -0800 Subject: [PATCH] gen: Ignore empty override settings The previous `goInnerType` assumed that the column name and table would be non-empty. For computed columns, this is not true. Make sure to check if the override setting (PostgresType or Column) is non-empty before applying an override. --- internal/dinosql/gen.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/dinosql/gen.go b/internal/dinosql/gen.go index 32f7853853..24e1563112 100644 --- a/internal/dinosql/gen.go +++ b/internal/dinosql/gen.go @@ -445,10 +445,10 @@ func (r Result) goInnerType(col core.Column) string { // package overrides have a higher precedence for _, oride := range append(r.Settings.Overrides, r.packageSettings.Overrides...) { - if oride.PostgresType == columnType && oride.Null != notNull { + if oride.PostgresType != "" && oride.PostgresType == columnType && oride.Null != notNull { return oride.goTypeName } - if oride.columnName == col.Name && oride.table == col.Table { + if oride.Column != "" && oride.columnName == col.Name && oride.table == col.Table { return oride.goTypeName } }