thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ParsingException::displayText()

Browse Source 
Before it was silently try-catched for messages with additional {}, and
it is very easy to trigger, i.e.:

    SELECT toDateTime(format('{}-{}-01 00:00:00', '2021', '1'))

Will print:

    Code: 41. DB::Exception: Received from localhost:9000. DB::Exception: Cannot parse datetime 2021-1-01 00:00:00{}: Cannot parse DateTime from String: while executing 'FUNCTION toDateTime(format('{}-{}-01 00:00:00', '2021', '1') :: 3) -> toDateTime(format('{}-{}-01 00:00:00', '2021', '1')) DateTime : 2'.
This commit is contained in:
Azat Khuzhin 2021-03-03 23:44:51 +03:00
parent e8df9971f1
commit e7948819f9
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Common/Exception.cpp
View File

@ -458,33 +458,25 @@ ExecutionStatus ExecutionStatus::fromCurrentException(const std::string & start_
return ExecutionStatus(getCurrentExceptionCode(), msg); return ExecutionStatus(getCurrentExceptionCode(), msg);
} }
ParsingException::ParsingException() ParsingException::ParsingException() = default;
{
Exception::message(Exception::message() + "{}");
}
ParsingException::ParsingException(const std::string & msg, int code) ParsingException::ParsingException(const std::string & msg, int code)
: Exception(msg, code) : Exception(msg, code)
{ {
Exception::message(Exception::message() + "{}");
} }
ParsingException::ParsingException(int code, const std::string & message) ParsingException::ParsingException(int code, const std::string & message)
: Exception(message, code) : Exception(message, code)
{ {
Exception::message(Exception::message() + "{}");
} }
/// We use additional field formatted_message_ to make this method const. /// We use additional field formatted_message_ to make this method const.
std::string ParsingException::displayText() const std::string ParsingException::displayText() const
{ {
try try
{ {
if (line_number_ == -1) if (line_number_ == -1)
formatted_message_ = fmt::format(message(), ""); formatted_message_ = message();
else else
formatted_message_ = fmt::format(message(), fmt::format(": (at row {})\n", line_number_)); formatted_message_ = message() + fmt::format(": (at row {})\n", line_number_);
} }
catch (...) catch (...)
{} {}

4
src/Common/Exception.h
View File

@ -115,9 +115,7 @@ public:
template <typename ...Args> template <typename ...Args>
ParsingException(int code, const std::string & fmt, Args&&... args) ParsingException(int code, const std::string & fmt, Args&&... args)
: Exception(fmt::format(fmt, std::forward<Args>(args)...), code) : Exception(fmt::format(fmt, std::forward<Args>(args)...), code)
{ {}
Exception::message(Exception::message() + "{}");
}
std::string displayText() const std::string displayText() const

0
tests/queries/0_stateless/01750_parsing_exception.reference Normal file
View File

8
tests/queries/0_stateless/01750_parsing_exception.sh Executable file
View File

@ -0,0 +1,8 @@
#!/usr/bin/env bash
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh
. "$CURDIR"/../shell_config.sh
# if it will not match, the exit code of grep will be non-zero and the test will fail
$CLICKHOUSE_CLIENT -q "SELECT toDateTime(format('{}-{}-01 00:00:00', '2021', '1'))" |& grep -F -q 'Cannot parse datetime 2021-1-01 00:00:00: Cannot parse DateTime from String:'