From d21bcf440bb8a3d64a230028fc1db6c3678c39e0 Mon Sep 17 00:00:00 2001 From: Nao Yonashiro Date: Wed, 7 Jun 2023 08:03:28 +0900 Subject: [PATCH] fix: add location info to sqlite ast --- .../invalid_group_by_reference/sqlite/stderr.txt | 2 +- .../testdata/invalid_table_alias/sqlite/stderr.txt | 2 +- internal/engine/sqlite/convert.go | 10 +++++++--- 3 files changed, 9 insertions(+), 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 index 18a7d6bd0f..1fc9998d4c 100644 --- 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 index d4c26d650f..810c893a70 100644 --- 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 index de0ba609c8..43771cebb7 100644 --- 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,7 +546,8 @@ 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(), } } @@ -553,7 +555,8 @@ func (c *cc) convertLiteral(n *parser.Expr_literalContext) ast.Node { // 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(), } } }