fix: add location info to sqlite ast (#2298)

sqlc-dev · Jun 7, 2023 · 9c64cfa · 9c64cfa
1 parent a022593
commit 9c64cfa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/internal/endtoend/testdata/invalid_group_by_reference/sqlite/stderr.txt b/internal/endtoend/testdata/invalid_group_by_reference/sqlite/stderr.txt
@@ -1,2 +1,2 @@
 # package querytest
-query.sql:9:1: column reference "invalid_reference" not found
+query.sql:11:10: column reference "invalid_reference" not found
diff --git a/internal/endtoend/testdata/invalid_table_alias/sqlite/stderr.txt b/internal/endtoend/testdata/invalid_table_alias/sqlite/stderr.txt
@@ -1,2 +1,2 @@
 # package querytest
-query.sql:9:1: table alias "p" does not exist
+query.sql:11:9: table alias "p" does not exist
diff --git a/internal/engine/sqlite/convert.go b/internal/engine/sqlite/convert.go
@@ -265,6 +265,7 @@ func (c *cc) convertColumnNameExpr(n *parser.Expr_qualified_column_nameContext)
 		Fields: &ast.List{
 			Items: items,
 		},
+		Location: n.GetStart().GetStart(),
 	}
 }
 
@@ -545,15 +546,17 @@ func (c *cc) convertLiteral(n *parser.Expr_literalContext) ast.Node {
 		if literal.NUMERIC_LITERAL() != nil {
 			i, _ := strconv.ParseInt(literal.GetText(), 10, 64)
 			return &ast.A_Const{
-				Val: &ast.Integer{Ival: i},
+				Val:      &ast.Integer{Ival: i},
+				Location: n.GetStart().GetStart(),
 			}
 		}
 
 		if literal.STRING_LITERAL() != nil {
 			// remove surrounding single quote
 			text := literal.GetText()
 			return &ast.A_Const{
-				Val: &ast.String{Str: text[1 : len(text)-1]},
+				Val:      &ast.String{Str: text[1 : len(text)-1]},
+				Location: n.GetStart().GetStart(),
 			}
 		}
 
@@ -564,7 +567,8 @@ func (c *cc) convertLiteral(n *parser.Expr_literalContext) ast.Node {
 			}
 
 			return &ast.A_Const{
-				Val: &ast.Integer{Ival: i},
+				Val:      &ast.Integer{Ival: i},
+				Location: n.GetStart().GetStart(),
 			}
 		}
 	}