From 61cd7f1129560fdcad5c2d4476bbdec626216f0b Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Thu, 12 Dec 2019 12:57:08 -0800 Subject: [PATCH] internal/dinosql: Dereference alias nodes on walk Fixes #153 --- internal/dinosql/soup.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/internal/dinosql/soup.go b/internal/dinosql/soup.go index 895096a9a3..17786526eb 100644 --- a/internal/dinosql/soup.go +++ b/internal/dinosql/soup.go @@ -854,19 +854,25 @@ func Walk(f Visitor, node nodes.Node) { case nodes.RangeFunction: walkn(f, n.Functions) - walkn(f, n.Alias) + if n.Alias != nil { + walkn(f, *n.Alias) + } walkn(f, n.Coldeflist) case nodes.RangeSubselect: walkn(f, n.Subquery) - walkn(f, n.Alias) + if n.Alias != nil { + walkn(f, *n.Alias) + } case nodes.RangeTableFunc: walkn(f, n.Docexpr) walkn(f, n.Rowexpr) walkn(f, n.Namespaces) walkn(f, n.Columns) - walkn(f, n.Alias) + if n.Alias != nil { + walkn(f, *n.Alias) + } case nodes.RangeTableFuncCol: if n.TypeName != nil { @@ -889,7 +895,9 @@ func Walk(f Visitor, node nodes.Node) { walkn(f, n.ValuesLists) walkn(f, n.Coltypes) walkn(f, n.Colcollations) - walkn(f, n.Alias) + if n.Alias != nil { + walkn(f, *n.Alias) + } walkn(f, n.Eref) walkn(f, n.SecurityQuals)