opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 19:22:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

SQL Expressions: Add more functions to the allowlist (#103546)

Browse Source 
* SQL Expressions: Allow many more functions and nodes

* Also allow the `REGEXP_SUBSTR` function

* Add window functions

* add more JSON support, remove now and current time (for now)

---------

Co-authored-by: Kyle Brandt <kyle@grafana.com>
This commit is contained in:
Sam Jewell
2025-04-07 19:23:39 +01:00
committed by GitHub
parent 21fe9480a1
commit f8a72214cf
2 changed files with 161 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
pkg/expr/sql/parser_allow.go
View File

@ -66,7 +66,10 @@ func allowedNode(node sqlparser.SQLNode) (b bool) {
case *sqlparser.CaseExpr, *sqlparser.When:
return
case sqlparser.ColIdent, *sqlparser.ColName, sqlparser.Columns:
case *sqlparser.CharExpr:
return
case sqlparser.ColIdent, *sqlparser.ColName, sqlparser.Columns, sqlparser.ColumnType:
return
case sqlparser.Comments: // TODO: understand why some are pointer vs not
@ -87,6 +90,9 @@ func allowedNode(node sqlparser.SQLNode) (b bool) {
case sqlparser.Exprs:
return
case *sqlparser.ExtractFuncExpr:
return
case *sqlparser.GroupConcatExpr:
return
@ -108,6 +114,9 @@ func allowedNode(node sqlparser.SQLNode) (b bool) {
case *sqlparser.JoinTableExpr, sqlparser.JoinCondition:
return
case *sqlparser.JSONTableExpr, *sqlparser.JSONTableSpec, *sqlparser.JSONTableColDef:
return
case *sqlparser.Select, sqlparser.SelectExprs, *sqlparser.ParenSelect:
return
@ -141,6 +150,9 @@ func allowedNode(node sqlparser.SQLNode) (b bool) {
case sqlparser.TableName, sqlparser.TableExprs, sqlparser.TableIdent:
return
case *sqlparser.TimestampFuncExpr:
return
case *sqlparser.TrimExpr:
return
@ -174,6 +186,12 @@ func allowedFunction(f *sqlparser.FuncExpr) (b bool) {
return
case "variance", "var_pop":
return
case "group_concat":
return
case "row_number", "rank", "dense_rank", "lead", "lag":
return
case "first_value", "last_value":
return
// Mathematical functions
case "abs":
@ -184,7 +202,13 @@ func allowedFunction(f *sqlparser.FuncExpr) (b bool) {
return
case "mod", "log", "log10", "exp":
return
case "sign":
case "sign", "ln", "truncate":
return
case "sin", "cos", "tan":
return
case "asin", "acos", "atan", "atan2":
return
case "rand", "pi":
return
// String functions
@ -194,11 +218,25 @@ func allowedFunction(f *sqlparser.FuncExpr) (b bool) {
return
case "substring", "substring_index":
return
case "left", "right":
return
case "ltrim", "rtrim":
return
case "replace", "reverse":
return
case "lcase", "ucase", "mid", "repeat":
return
case "position", "instr", "locate":
return
case "ascii", "ord", "char":
return
case "regexp_substr":
return
// Date functions
case "str_to_date":
return
case "date_format", "now", "curdate", "curtime":
case "date_format":
return
case "date_add", "date_sub":
return
@ -208,15 +246,27 @@ func allowedFunction(f *sqlparser.FuncExpr) (b bool) {
return
case "unix_timestamp", "from_unixtime":
return
case "extract", "hour", "minute", "second":
return
case "dayname", "monthname", "dayofweek", "dayofmonth", "dayofyear":
return
case "week", "quarter", "time_to_sec", "sec_to_time":
return
case "timestampdiff", "timestampadd":
return
// Type conversion
case "cast":
case "cast", "convert":
return
// JSON functions
case "json_extract", "json_unquote", "json_contains",
"json_object", "json_array", "json_set", "json_remove",
"json_length", "json_search", "json_type":
case "json_extract", "json_object", "json_array", "json_merge_patch", "json_valid":
return
case "json_contains", "json_length", "json_type", "json_keys":
return
case "json_search", "json_quote", "json_unquote":
return
case "json_set", "json_insert", "json_replace", "json_remove":
return
default: