Merge pull request ClickHouse#58710 from aiven-sal/aiven-sal/fix_normq2

Handle signed numeric literals in normalizeQuery
xleoken · Jan 15, 2024 · 61889fa · 61889fa
2 parents 3e1d7bf + 7b434a7
commit 61889fa
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/src/Parsers/queryNormalization.cpp b/src/Parsers/queryNormalization.cpp
@@ -167,6 +167,8 @@ void normalizeQueryToPODArray(const char * begin, const char * end, PaddedPODArr
                 continue;
             }
         }
+        else if (prev_comma && (token.type == TokenType::Plus || token.type == TokenType::Minus))
+            continue;
         else
         {
             if (num_literals_in_sequence > 1)

diff --git a/tests/queries/0_stateless/01451_normalize_query.reference b/tests/queries/0_stateless/01451_normalize_query.reference
@@ -23,3 +23,23 @@ SELECT ?..
 SELECT ? xyz11
 SELECT ?, xyz11
 SELECT ?..
+? - ?
+?..
+-?..
+? - ?..
+f(-?..)
+[-?..]
+? + ?
+?..
+-?..
+? + ?..
+f(+?..)
+[+?..]
+?.. + ?
+?.. - ?..
+f(+?..), ?
+[+?..] - ?
+-?.. - [+?..] - ?
+(+?..) - ?
+-?.. - (+?..) - ?
+(+?..)
diff --git a/tests/queries/0_stateless/01451_normalize_query.sql b/tests/queries/0_stateless/01451_normalize_query.sql
@@ -23,4 +23,23 @@ SELECT normalizeQuery('SELECT 1, ''xyz11''');
 SELECT normalizeQuery('SELECT $doc$VALUE$doc$ xyz11');
 SELECT normalizeQuery('SELECT $doc$VALUE$doc$, xyz11');
 SELECT normalizeQuery('SELECT $doc$VALUE$doc$, ''xyz11''');
-
+SELECT normalizeQuery('1 - 2');
+SELECT normalizeQuery('1, -2, 3');
+SELECT normalizeQuery('-1, -2, 3');
+SELECT normalizeQuery('1 - 2, 3, 4');
+SELECT normalizeQuery('f(-2, 3)');
+SELECT normalizeQuery('[-1, 2, 3]');
+SELECT normalizeQuery('1 + 2');
+SELECT normalizeQuery('1, +2, 3');
+SELECT normalizeQuery('-1, +2, 3');
+SELECT normalizeQuery('1 + 2, 3, 4');
+SELECT normalizeQuery('f(+2, 3)');
+SELECT normalizeQuery('[+1, 2, 3]');
+SELECT normalizeQuery('1, 2, 3 + 4');
+SELECT normalizeQuery('1, 2 - 3, 4');
+SELECT normalizeQuery('f(+2, 3), 1');
+SELECT normalizeQuery('[+1, 2, 3] - 1');
+SELECT normalizeQuery('-1, 1 - [+1, 2, 3] - 1');
+SELECT normalizeQuery('(+1, 2, 3) - 1');
+SELECT normalizeQuery('-1, 1 - (+1, 2, 3) - 1');
+SELECT normalizeQuery('(+1, 2, -3)');