thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 01:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using lexer: better error messages [#CLICKHOUSE-2].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-07-13 07:27:00 +03:00 committed by alexey-milovidov
parent 0614ba5684
commit 96468884f3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Parsers/TokenIterator.h
View File

@ -77,7 +77,7 @@ public:
/// Returns positions of unmatched parentheses.
using UnmatchedParentheses = std::vector<char *>;
using UnmatchedParentheses = std::vector<const char *>;
UnmatchedParentheses checkUnmatchedParentheses(TokenIterator begin, TokenIterator end);
}

8
dbms/src/Parsers/parseQuery.cpp
View File

@ -67,7 +67,7 @@ void writeQueryWithHighlightedErrorPositions(
WriteBuffer & out,
const char * begin,
const char * end,
const char ** positions_to_hilite,
const char * const * positions_to_hilite,
size_t num_positions_to_hilite)
{
const char * pos = begin;
@ -76,7 +76,7 @@ void writeQueryWithHighlightedErrorPositions(
const char * current_position_to_hilite = positions_to_hilite[position_to_hilite_idx];
out.write(pos, current_position_to_hilite - pos);
size_t bytes_to_hilite = UTF8::seqLength(current_position_to_hilite);
size_t bytes_to_hilite = UTF8::seqLength(*current_position_to_hilite);
/// Bright on red background.
out << "\033[41;1m";
@ -93,7 +93,7 @@ void writeQueryAroundTheError(
const char * begin,
const char * end,
bool hilite,
const char ** positions_to_hilite,
const char * const * positions_to_hilite,
size_t num_positions_to_hilite)
{
if (hilite)
@ -239,7 +239,7 @@ ASTPtr tryParseQuery(
/// Lexical error
if (!parse_res && token_iterator->isError())
{
out_error_message = getLexicalErrorMessage(begin, end, max_parsed_pos, getErrorTokenDescription(token_iterator), hilite, query_description);
out_error_message = getLexicalErrorMessage(begin, end, max_parsed_pos, getErrorTokenDescription(token_iterator->type), hilite, query_description);
return nullptr;
}