Skip to content
This repository has been archived by the owner on Jun 3, 2024. It is now read-only.

sqlparser call signature adjustment #54

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

sqlparser call signature adjustment #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dd4977
SafeToSql util fn
Yaiba Mar 7, 2024
e0e0101
update gomod
Yaiba Mar 25, 2024
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
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21

require (
github.com/antlr4-go/antlr/v4 v4.13.0
github.com/kwilteam/kwil-db/parse v0.1.2
github.com/kwilteam/kwil-db/parse v0.1.2-0.20240325162245-a841d745a8a2
github.com/spf13/cobra v1.7.0
github.com/stretchr/testify v1.8.4
)
Expand All @@ -14,7 +14,6 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/kwilteam/action-grammar-go v0.1.1 // indirect
github.com/kwilteam/sql-grammar-go v0.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kwilteam/action-grammar-go v0.1.1 h1:0NeWrIN0B+pQMyiTwW/kWtqLWl7P4ExmfHwaXaJ14zI=
github.com/kwilteam/action-grammar-go v0.1.1/go.mod h1:hHGHtnrJpASW9P+F7pdr/EP2M1Hxy1N9Wx/TmjVdV6I=
github.com/kwilteam/kwil-db/parse v0.1.2 h1:RE8vzX+hZlDCz329hpoP7Az/v2BxfWZUQQQMkEVRWng=
github.com/kwilteam/kwil-db/parse v0.1.2/go.mod h1:lGzcCdSvjVrJj71nPuDQRYfF9Jnqj94wFPHEbbDq0+Y=
github.com/kwilteam/sql-grammar-go v0.1.0 h1:rSS7DER9PWVDmFwNyoInG5oXrn+E9UrZkjref84L4Qk=
github.com/kwilteam/sql-grammar-go v0.1.0/go.mod h1:A9AXaH5Vl/uPsY88fWqvU9O7z7P4YfvndaGyc8s//2s=
github.com/kwilteam/kwil-db/parse v0.1.2-0.20240325162245-a841d745a8a2 h1:EOY9P5bnQJoUzk7HqxiPkYxDM12pynq2Asy4PBpkZZQ=
github.com/kwilteam/kwil-db/parse v0.1.2-0.20240325162245-a841d745a8a2/go.mod h1:ZgelAtf4gWAOecXOrESXhFqRei3KvhJ4H7Ent28qAQs=
github.com/pganalyze/pg_query_go/v5 v5.1.0 h1:MlxQqHZnvA3cbRQYyIrjxEjzo560P6MyTgtlaf3pmXg=
github.com/pganalyze/pg_query_go/v5 v5.1.0/go.mod h1:FsglvxidZsVN+Ltw3Ai6nTgPVcK2BPukH3jCDEqc1Ug=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
10 changes: 5 additions & 5 deletions schema/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,22 +244,22 @@ func (c *ContextValidator) visitActions(actions []Action) error {
}

for _, statement := range a.Statements {
stmt, err := actparser.Parse(statement)
actStmt, err := actparser.Parse(statement)
if err != nil {
return fmt.Errorf("%w: %s", err, statement)
}

switch s := stmt.(type) {
switch s := actStmt.(type) {
case *actparser.DMLStmt:
astTree, err := sqlparser.ParseSql(statement, 1, nil, false)
sqlStmt, err := sqlparser.Parse(statement)
if err != nil {
return fmt.Errorf("%w: %s", err, statement)
}
if _, err := astTree.ToSQL(); err != nil {
if _, err := tree.SafeToSQL(sqlStmt); err != nil {
return fmt.Errorf("%w: %s", err, statement)
}
// TODO: validate reference in SQL statement
//switch t := astTree.(type) {
//switch t := sqlStmt.(type) {
//case *tree.Select:
case *actparser.ActionCallStmt:
if _, ok := c.actionCtx[s.Method]; !ok {
Expand Down
Loading