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

Fix JSON parsing in SQL

Browse source 
Previously, JSON which contained bracket `[]` or brace `{}` characters inside strings would fail to parse as valid JSON.
This commit is contained in:
Tobie Morgan Hitchcock 2017-04-12 17:44:27 +01:00
parent b7f4984641
commit 17b1f9ff55
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sql/scanner.go
View file

@ -738,17 +738,18 @@ func (s *scanner) scanObject(chp ...rune) (tok Token, lit string, val interface{
beg := chp[0]
end := beg
sub := 0
qut := 0
if beg == '{' {
end = '}'
tok = JSON
}
if beg == '[' {
end = ']'
tok = ARRAY
}
tok = IDENT
// Create a buffer
var buf bytes.Buffer
@ -759,7 +760,7 @@ func (s *scanner) scanObject(chp ...rune) (tok Token, lit string, val interface{
// Read subsequent characters
for {
if ch := s.next(); ch == end && sub == 0 {
if ch := s.next(); ch == end && sub == 0 && qut == 0 {
buf.WriteRune(ch)
break
} else if ch == beg {
@ -770,6 +771,13 @@ func (s *scanner) scanObject(chp ...rune) (tok Token, lit string, val interface{
buf.WriteRune(ch)
} else if ch == eof {
return ILLEGAL, buf.String(), val
} else if ch == '"' {
if qut == 0 {
qut++
} else {
qut--
}
buf.WriteRune(ch)
} else if ch == '\\' {
switch chn := s.next(); chn {
default:
@ -783,14 +791,7 @@ func (s *scanner) scanObject(chp ...rune) (tok Token, lit string, val interface{
}
}
if beg == '{' {
return JSON, buf.String(), val
}
if beg == '[' {
return ARRAY, buf.String(), val
}
return ILLEGAL, buf.String(), val
return tok, buf.String(), val
}