Skip to content

fix(engine/sqlite): support quoted identifier #2556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyleconroy merged 2 commits into from
Aug 2, 2023
Merged

fix(engine/sqlite): support quoted identifier #2556

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1e1e3d
fix(engine/sqlite): support quoted identifier
orisano Aug 1, 2023
eb3d4f7
test: add endtoend
orisano Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(engine/sqlite): support quoted identifier 
close #1817
  • Loading branch information
@orisano
orisano committed Aug 1, 2023
commit f1e1e3d00ec82c3861e1ad9a6c524eb1654b8d0c
22 changes: 13 additions & 9 deletions internal/engine/sqlite/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,14 @@ func todo(funcname string, n node) *ast.TODO {
}

func identifier(id string) string {
if len(id) >= 2 && id[0] == '"' && id[len(id)-1] == '"' {
unquoted, _ := strconv.Unquote(id)
return unquoted
}
return strings.ToLower(id)
}

func NewIdentifer(t string) *ast.String {
func NewIdentifier(t string) *ast.String {
return &ast.String{Str: identifier(t)}
}

Expand Down Expand Up @@ -293,7 +297,7 @@ func (c *cc) convertFuncContext(n *parser.Expr_functionContext) ast.Node {
},
Funcname: &ast.List{
Items: []ast.Node{
NewIdentifer(funcName),
NewIdentifier(funcName),
},
},
AggStar: n.STAR() != nil,
Expand All @@ -317,16 +321,16 @@ func (c *cc) convertColumnNameExpr(n *parser.Expr_qualified_column_nameContext)
if schema, ok := n.Schema_name().(*parser.Schema_nameContext); ok {
schemaText := schema.GetText()
if schemaText != "" {
items = append(items, NewIdentifer(schemaText))
items = append(items, NewIdentifier(schemaText))
}
}
if table, ok := n.Table_name().(*parser.Table_nameContext); ok {
tableName := table.GetText()
if tableName != "" {
items = append(items, NewIdentifer(tableName))
items = append(items, NewIdentifier(tableName))
}
}
items = append(items, NewIdentifer(n.Column_name().GetText()))
items = append(items, NewIdentifier(n.Column_name().GetText()))
return &ast.ColumnRef{
Fields: &ast.List{
Items: items,
Expand Down Expand Up @@ -384,7 +388,7 @@ func (c *cc) convertMultiSelect_stmtContext(n *parser.Select_stmtContext) ast.No
tableName := identifier(cte.Table_name().GetText())
var cteCols ast.List
for _, col := range cte.AllColumn_name() {
cteCols.Items = append(cteCols.Items, NewIdentifer(col.GetText()))
cteCols.Items = append(cteCols.Items, NewIdentifier(col.GetText()))
}
ctes = append(ctes, &ast.CommonTableExpr{
Ctename: &tableName,
Expand Down Expand Up @@ -506,7 +510,7 @@ func (c *cc) getCols(core *parser.Select_coreContext) []ast.Node {
func (c *cc) convertWildCardField(n *parser.Result_columnContext) *ast.ColumnRef {
items := []ast.Node{}
if n.Table_name() != nil {
items = append(items, NewIdentifer(n.Table_name().GetText()))
items = append(items, NewIdentifier(n.Table_name().GetText()))
}
items = append(items, &ast.A_Star{})

Expand Down Expand Up @@ -853,7 +857,7 @@ func (c *cc) convertTablesOrSubquery(n []parser.ITable_or_subqueryContext) []ast
},
Funcname: &ast.List{
Items: []ast.Node{
NewIdentifer(rel),
NewIdentifier(rel),
},
},
Args: &ast.List{
Expand Down Expand Up @@ -965,7 +969,7 @@ func (c *cc) convertCastExpr(n *parser.Expr_castContext) ast.Node {
TypeName: &ast.TypeName{
Name: name,
Names: &ast.List{Items: []ast.Node{
NewIdentifer(name),
NewIdentifier(name),
}},
ArrayBounds: &ast.List{},
},
Expand Down