From 0da372ec92dc1ad2fcfa307b32c1e24d6c3987ff Mon Sep 17 00:00:00 2001 From: Kaitmazian Maksim <m.kaitmazian@picodata.io> Date: Sun, 4 Feb 2024 23:39:40 +0300 Subject: [PATCH] fix: trim trailing spaces in query.pest --- sbroad-core/src/frontend/sql/query.pest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbroad-core/src/frontend/sql/query.pest b/sbroad-core/src/frontend/sql/query.pest index be7a257cdd..50834bfedf 100644 --- a/sbroad-core/src/frontend/sql/query.pest +++ b/sbroad-core/src/frontend/sql/query.pest @@ -102,7 +102,7 @@ Query = { (SelectWithOptionalContinuation | Values | Insert | Update | Delete) ~ UnionAllContinuation = { ^"union" ~ ^"all" ~ Select } Select = { ^"select" ~ Projection ~ ^"from" ~ Scan ~ - Join? ~ WhereClause? ~ + Join? ~ WhereClause? ~ (^"group" ~ ^"by" ~ GroupBy)? ~ (^"having" ~ Having)? } @@ -127,7 +127,7 @@ Query = { (SelectWithOptionalContinuation | Values | Insert | Update | Delete) ~ GroupBy = { GroupingElement ~ ("," ~ GroupingElement)* } Having = { Expr } SubQuery = { "(" ~ (SelectWithOptionalContinuation | Values) ~ ")" } - Insert = { ^"insert" ~ ^"into" ~ Table ~ ("(" ~ TargetColumns ~ ")")? ~ + Insert = { ^"insert" ~ ^"into" ~ Table ~ ("(" ~ TargetColumns ~ ")")? ~ (Values | Select) ~ OnConflict? } TargetColumns = { ColumnName ~ ("," ~ ColumnName)* } OnConflict = _{ ^"on conflict" ~ ^"do" ~ (DoNothing | DoReplace | DoFail) } -- GitLab