noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enforce default RETURN value in sql parser

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2017-02-14 19:23:53 +00:00
parent 3ffaec9265
commit 83a64c6c29
9 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
db/create.go
View file

@ -87,7 +87,7 @@ func create(doc *item.Doc, ast *sql.CreateStatement) (out interface{}, err error
return
}
out = doc.Yield(ast.Echo, sql.AFTER)
out = doc.Yield(ast.Echo)
return

2
db/delete.go
View file

@ -96,7 +96,7 @@ func delete(doc *item.Doc, ast *sql.DeleteStatement) (out interface{}, err error
}
out = doc.Yield(ast.Echo, sql.NONE)
out = doc.Yield(ast.Echo)
return

2
db/update.go
View file

@ -92,7 +92,7 @@ func update(doc *item.Doc, ast *sql.UpdateStatement) (out interface{}, err error
return
}
out = doc.Yield(ast.Echo, sql.AFTER)
out = doc.Yield(ast.Echo)
return

2
sql/create.go
View file

@ -30,7 +30,7 @@ func (p *parser) parseCreateStatement() (stmt *CreateStatement, err error) {
return nil, err
}
if stmt.Echo, err = p.parseEcho(); err != nil {
if stmt.Echo, err = p.parseEcho(AFTER); err != nil {
return nil, err
}

2
sql/delete.go
View file

@ -39,7 +39,7 @@ func (p *parser) parseDeleteStatement() (stmt *DeleteStatement, err error) {
return nil, err
}
if stmt.Echo, err = p.parseEcho(); err != nil {
if stmt.Echo, err = p.parseEcho(NONE); err != nil {
return nil, err
}

4
sql/echo.go
View file

@ -14,7 +14,9 @@
package sql
func (p *parser) parseEcho() (exp Token, err error) {
func (p *parser) parseEcho(empty Token) (exp Token, err error) {
exp = empty
// The next token that we expect to see is a
// RETURN token, and if we don't find one then

2
sql/relate.go
View file

@ -48,7 +48,7 @@ func (p *parser) parseRelateStatement() (stmt *RelateStatement, err error) {
return nil, err
}
if stmt.Echo, err = p.parseEcho(); err != nil {
if stmt.Echo, err = p.parseEcho(AFTER); err != nil {
return nil, err
}

2
sql/update.go
View file

@ -41,7 +41,7 @@ func (p *parser) parseUpdateStatement() (stmt *UpdateStatement, err error) {
return nil, err
}
if stmt.Echo, err = p.parseEcho(); err != nil {
if stmt.Echo, err = p.parseEcho(AFTER); err != nil {
return nil, err
}

6
util/item/yield.go
View file

@ -18,11 +18,7 @@ import (
"github.com/abcum/surreal/sql"
)
func (this *Doc) Yield(output sql.Token, fallback sql.Token) (res interface{}) {
if output == 0 {
output = fallback
}
func (this *Doc) Yield(output sql.Token) (res interface{}) {
switch output {
case sql.ID: