influxql: add tokens for user & DB admin

influxql/scanner_test.go

@@ -96,16 +96,21 @@ func TestScanner_Scan(t *testing.T) {
 		{s: `10x`, tok: influxql.NUMBER, lit: `10`}, // non-duration unit
 
 		// Keywords
+		{s: `ALL`, tok: influxql.ALL},
 		{s: `AS`, tok: influxql.AS},
 		{s: `ASC`, tok: influxql.ASC},
 		{s: `BY`, tok: influxql.BY},
 		{s: `CONTINUOUS`, tok: influxql.CONTINUOUS},
+		{s: `DATABASE`, tok: influxql.DATABASE},
 		{s: `DELETE`, tok: influxql.DELETE},
 		{s: `DESC`, tok: influxql.DESC},
 		{s: `DROP`, tok: influxql.DROP},
+		{s: `EXISTS`, tok: influxql.EXISTS},
 		{s: `EXPLAIN`, tok: influxql.EXPLAIN},
 		{s: `FIELD`, tok: influxql.FIELD},
 		{s: `FROM`, tok: influxql.FROM},
+		{s: `GROUP`, tok: influxql.GROUP},
+		{s: `IF`, tok: influxql.IF},
 		{s: `INNER`, tok: influxql.INNER},
 		{s: `INSERT`, tok: influxql.INSERT},
 		{s: `INTO`, tok: influxql.INTO},
@@ -114,13 +119,25 @@ func TestScanner_Scan(t *testing.T) {
 		{s: `LIST`, tok: influxql.LIST},
 		{s: `MEASUREMENT`, tok: influxql.MEASUREMENT},
 		{s: `MEASUREMENTS`, tok: influxql.MEASUREMENTS},
+		{s: `ON`, tok: influxql.ON},
 		{s: `ORDER`, tok: influxql.ORDER},
+		{s: `PASSWORD`, tok: influxql.PASSWORD},
+		{s: `POLICY`, tok: influxql.POLICY},
+		{s: `PRIVILEGES`, tok: influxql.PRIVILEGES},
 		{s: `QUERIES`, tok: influxql.QUERIES},
+		{s: `QUERY`, tok: influxql.QUERY},
+		{s: `READ`, tok: influxql.READ},
+		{s: `RETENTION`, tok: influxql.RETENTION},
+		{s: `REVOKE`, tok: influxql.REVOKE},
 		{s: `SELECT`, tok: influxql.SELECT},
 		{s: `SERIES`, tok: influxql.SERIES},
 		{s: `TAG`, tok: influxql.TAG},
+		{s: `TO`, tok: influxql.TO},
+		{s: `USER`, tok: influxql.USER},
 		{s: `VALUES`, tok: influxql.VALUES},
 		{s: `WHERE`, tok: influxql.WHERE},
+		{s: `WITH`, tok: influxql.WITH},
+		{s: `WRITE`, tok: influxql.WRITE},
 		{s: `explain`, tok: influxql.EXPLAIN}, // case insensitive
 	}
 

influxql/token.go

@@ -50,18 +50,22 @@ const (
 
 	keyword_beg
 	// Keywords
+	ALL
 	AS
 	ASC
 	BY
 	CREATE
 	CONTINUOUS
+	DATABASE
 	DELETE
 	DESC
 	DROP
+	EXISTS
 	EXPLAIN
 	FIELD
 	FROM
 	GROUP
+	IF
 	INNER
 	INSERT
 	INTO
@@ -70,14 +74,25 @@ const (
 	LIST
 	MEASUREMENT
 	MEASUREMENTS
+	ON
 	ORDER
+	PASSWORD
+	POLICY
+	PRIVILEGES
 	QUERIES
 	QUERY
+	READ
+	RETENTION
+	REVOKE
 	SELECT
 	SERIES
 	TAG
+	TO
+	USER
 	VALUES
 	WHERE
+	WITH
+	WRITE
 	keyword_end
 )
 
@@ -112,18 +127,22 @@ var tokens = [...]string{
 	COMMA:     ",",
 	SEMICOLON: ";",
 
+	ALL:          "ALL",
 	AS:           "AS",
 	ASC:          "ASC",
 	BY:           "BY",
 	CREATE:       "CREATE",
 	CONTINUOUS:   "CONTINUOUS",
+	DATABASE:     "DATABASE",
 	DELETE:       "DELETE",
 	DESC:         "DESC",
 	DROP:         "DROP",
+	EXISTS:       "EXISTS",
 	EXPLAIN:      "EXPLAIN",
 	FIELD:        "FIELD",
 	FROM:         "FROM",
 	GROUP:        "GROUP",
+	IF:           "IF",
 	INNER:        "INNER",
 	INSERT:       "INSERT",
 	INTO:         "INTO",
@@ -132,14 +151,25 @@ var tokens = [...]string{
 	LIST:         "LIST",
 	MEASUREMENT:  "MEASUREMENT",
 	MEASUREMENTS: "MEASUREMENTS",
+	ON:           "ON",
 	ORDER:        "ORDER",
+	PASSWORD:     "PASSWORD",
+	POLICY:       "POLICY",
+	PRIVILEGES:   "PRIVILEGES",
 	QUERIES:      "QUERIES",
 	QUERY:        "QUERY",
+	READ:         "READ",
+	RETENTION:    "RETENTION",
+	REVOKE:       "REVOKE",
 	SELECT:       "SELECT",
 	SERIES:       "SERIES",
 	TAG:          "TAG",
+	TO:           "TO",
+	USER:         "USER",
 	VALUES:       "VALUES",
 	WHERE:        "WHERE",
+	WITH:         "WITH",
+	WRITE:        "WRITE",
 }
 
 var keywords map[string]Token