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

Add support for array index ranges in SQL queries

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2018-05-13 22:14:19 +01:00
parent e120f8961c
commit 74785bd70d
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sql/scanner.go
View file

@ -489,14 +489,17 @@ func (s *scanner) scanIdiom(chp ...rune) (tok Token, lit string, val interface{}
break break
} else if isIdentChar(ch) { } else if isIdentChar(ch) {
buf.WriteRune(ch) buf.WriteRune(ch)
} else if isArrayChar(ch) {
tok = EXPR
buf.WriteRune(ch)
} else if isExprsChar(ch) { } else if isExprsChar(ch) {
tok = EXPR tok = EXPR
buf.WriteRune(ch) buf.WriteRune(ch)
} else if ch == ':' { } else if ch == ':' {
if tok == EXPR { if tok == EXPR {
s.undo() buf.WriteRune(ch)
break continue
} }
tbv = buf.String() tbv = buf.String()
@ -1048,9 +1051,14 @@ func isThingChar(ch rune) bool {
return isLetter(ch) || isNumber(ch) || ch == '_' return isLetter(ch) || isNumber(ch) || ch == '_'
} }
// isArrayChar returns true if the rune is allowed in an ARRAY.
func isArrayChar(ch rune) bool {
return ch == '[' || ch == ']'
}
// isExprsChar returns true if the rune is allowed in a IDENT. // isExprsChar returns true if the rune is allowed in a IDENT.
func isExprsChar(ch rune) bool { func isExprsChar(ch rune) bool {
return isLetter(ch) || isNumber(ch) || ch == '.' || ch == '_' || ch == '*' || ch == '[' || ch == '$' || ch == ']' return isLetter(ch) || isNumber(ch) || ch == '.' || ch == '_' || ch == '*' || ch == '$'
} }
// eof represents a marker rune for the end of the reader. // eof represents a marker rune for the end of the reader.