Merge pull request #30288 from kssenii/fix-local-syntax-exception

kssenii · web-flow · commit e1969e26933e · 2021-10-17T12:16:40.000+03:00
Fix throwing syntax exception in clickhouse-local
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
@@ -32,7 +32,6 @@
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/ReadHelpers.h>
 #include <IO/UseSSL.h>
-#include <Parsers/parseQuery.h>
 #include <Parsers/IAST.h>
 #include <base/ErrorHandlers.h>
 #include <Functions/registerFunctions.h>
@@ -128,10 +127,9 @@ bool LocalServer::executeMultiQuery(const String & all_queries_text)
             }
             case MultiQueryProcessingStage::PARSING_EXCEPTION:
             {
-                this_query_end = find_first_symbols<'\n'>(this_query_end, all_queries_end);
-                this_query_begin = this_query_end; /// It's expected syntax error, skip the line
-                current_exception.reset();
-                continue;
+                if (current_exception)
+                    current_exception->rethrow();
+                return true;
             }
             case MultiQueryProcessingStage::EXECUTE_QUERY:
             {
diff --git a/tests/queries/0_stateless/01196_max_parser_depth.reference b/tests/queries/0_stateless/01196_max_parser_depth.reference
@@ -1,3 +1,4 @@
 Code: 306
 Code: 306
 Code: 306
+Code: 306
diff --git a/tests/queries/0_stateless/02050_clickhouse_local_parsing_exception.reference b/tests/queries/0_stateless/02050_clickhouse_local_parsing_exception.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/02050_clickhouse_local_parsing_exception.sh b/tests/queries/0_stateless/02050_clickhouse_local_parsing_exception.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL --query="SELECT number FROM system.numbers INTO OUTFILE test.native.zst FORMAT Native" 2>&1 | grep -q "Code: 62. DB::Exception: Syntax error: failed at position 48 ('test'): test.native.zst FORMAT Native. Expected string literal." && echo 'OK' || echo 'FAIL' ||:
+

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@`
`32`	`32`	`#include <IO/WriteBufferFromFileDescriptor.h>`
`33`	`33`	`#include <IO/ReadHelpers.h>`
`34`	`34`	`#include <IO/UseSSL.h>`
`35`		`-#include <Parsers/parseQuery.h>`
`36`	`35`	`#include <Parsers/IAST.h>`
`37`	`36`	`#include <base/ErrorHandlers.h>`
`38`	`37`	`#include <Functions/registerFunctions.h>`
`@@ -128,10 +127,9 @@ bool LocalServer::executeMultiQuery(const String & all_queries_text)`
`128`	`127`	`}`
`129`	`128`	`case MultiQueryProcessingStage::PARSING_EXCEPTION:`
`130`	`129`	`{`
`131`		`- this_query_end = find_first_symbols<'\n'>(this_query_end, all_queries_end);`
`132`		`- this_query_begin = this_query_end; /// It's expected syntax error, skip the line`
`133`		`- current_exception.reset();`
`134`		`- continue;`
	`130`	`+ if (current_exception)`
	`131`	`+ current_exception->rethrow();`
	`132`	`+ return true;`
`135`	`133`	`}`
`136`	`134`	`case MultiQueryProcessingStage::EXECUTE_QUERY:`
`137`	`135`	`{`