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

Improve SQL error messages

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2017-04-12 18:45:52 +01:00
parent 9df4c5041a
commit a3da779190
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sql/exprs.go
View file

@ -100,7 +100,7 @@ func (p *parser) parseTable() (*Table, error) {
_, lit, err := p.shouldBe(IDENT) _, lit, err := p.shouldBe(IDENT)
if err != nil { if err != nil {
return nil, &ParseError{Found: lit, Expected: []string{"name"}} return nil, &ParseError{Found: lit, Expected: []string{"table"}}
} }
val, err := p.declare(TABLE, lit) val, err := p.declare(TABLE, lit)
@ -134,7 +134,7 @@ func (p *parser) parseThing() (*Thing, error) {
_, lit, err := p.shouldBe(THING) _, lit, err := p.shouldBe(THING)
if err != nil { if err != nil {
return nil, &ParseError{Found: lit, Expected: []string{"record id"}} return nil, &ParseError{Found: lit, Expected: []string{"thing"}}
} }
val, err := p.declare(THING, lit) val, err := p.declare(THING, lit)
@ -168,7 +168,7 @@ func (p *parser) parseIdiom() (*Ident, error) {
_, lit, err := p.shouldBe(IDENT, EXPR) _, lit, err := p.shouldBe(IDENT, EXPR)
if err != nil { if err != nil {
return nil, &ParseError{Found: lit, Expected: []string{"name"}} return nil, &ParseError{Found: lit, Expected: []string{"name, or expression"}}
} }
val, err := p.declare(IDENT, lit) val, err := p.declare(IDENT, lit)
@ -321,7 +321,7 @@ func (p *parser) parseScript() (string, error) {
_, lit, err := p.shouldBe(STRING, REGION) _, lit, err := p.shouldBe(STRING, REGION)
if err != nil { if err != nil {
return string(""), &ParseError{Found: lit, Expected: []string{"js/lua script"}} return string(""), &ParseError{Found: lit, Expected: []string{"script"}}
} }
return lit, err return lit, err