thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60042 from Algunenano/format_not

Browse Source 
Fix formatting of NOT with single literals
This commit is contained in:
Alexey Milovidov 2024-02-16 01:28:45 +01:00 committed by GitHub
commit 885e8dad63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Parsers/ASTFunction.cpp
View File

@ -835,34 +835,37 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
const auto * literal = arguments->children[0]->as<ASTLiteral>();
const auto * function = arguments->children[0]->as<ASTFunction>();
bool negate = name == "negate";
bool is_tuple = literal && literal->value.getType() == Field::Types::Tuple;
// do not add parentheses for tuple literal, otherwise extra parens will be added `-((3, 7, 3), 1)` -> `-(((3, 7, 3), 1))`
bool literal_need_parens = literal && !is_tuple;
// negate always requires parentheses, otherwise -(-1) will be printed as --1
bool negate_need_parens = negate && (literal_need_parens || (function && function->name == "negate"));
// We don't need parentheses around a single literal.
bool need_parens = !literal && frame.need_parens && !negate_need_parens;
bool inside_parens = name == "negate" && (literal_need_parens || (function && function->name == "negate"));
/// We DO need parentheses around a single literal
/// For example, SELECT (NOT 0) + (NOT 0) cannot be transformed into SELECT NOT 0 + NOT 0, since
/// this is equal to SELECT NOT (0 + NOT 0)
bool outside_parens = frame.need_parens && !inside_parens;
// do not add extra parentheses for functions inside negate, i.e. -(-toUInt64(-(1)))
if (negate_need_parens)
if (inside_parens)
nested_need_parens.need_parens = false;
if (need_parens)
if (outside_parens)
settings.ostr << '(';
settings.ostr << (settings.hilite ? hilite_operator : "") << func[1] << (settings.hilite ? hilite_none : "");
if (negate_need_parens)
if (inside_parens)
settings.ostr << '(';
arguments->formatImpl(settings, state, nested_need_parens);
written = true;
if (negate_need_parens)
if (inside_parens)
settings.ostr << ')';
if (need_parens)
if (outside_parens)
settings.ostr << ')';
break;

4
tests/queries/0_stateless/01920_not_chain_format.reference
View File

@ -1,5 +1,5 @@
-- { echo }
EXPLAIN SYNTAX SELECT NOT NOT (NOT (NOT (NULL)));
SELECT NOT (NOT (NOT NOT NULL))
SELECT NOT (NOT (NOT (NOT NULL)))
EXPLAIN SYNTAX SELECT NOT (NOT (NOT NOT NULL));
SELECT NOT (NOT (NOT NOT NULL))
SELECT NOT (NOT (NOT (NOT NULL)))

4
tests/queries/0_stateless/01921_not_chain.reference
View File

@ -4,6 +4,6 @@ SELECT 1 != (NOT 1);
SELECT 1 != NOT 1;
1
EXPLAIN SYNTAX SELECT 1 != (NOT 1);
SELECT 1 != NOT 1
SELECT 1 != (NOT 1)
EXPLAIN SYNTAX SELECT 1 != NOT 1;
SELECT 1 != NOT 1
SELECT 1 != (NOT 1)

13
tests/queries/0_stateless/02990_format_not_precedence.reference Normal file
View File

@ -0,0 +1,13 @@
-- { echoOn }
SELECT NOT 0 + NOT 0;
0
SELECT NOT (0 + (NOT 0));
0
SELECT (NOT 0) + (NOT 0);
2
SELECT formatQuery('SELECT NOT 0 + NOT 0');
SELECT NOT (0 + (NOT 0))
SELECT formatQuery('SELECT NOT (0 + (NOT 0))');
SELECT NOT (0 + (NOT 0))
SELECT formatQuery('SELECT (NOT 0) + (NOT 0)');
SELECT (NOT 0) + (NOT 0)

7
tests/queries/0_stateless/02990_format_not_precedence.sql Normal file
View File

@ -0,0 +1,7 @@
-- { echoOn }
SELECT NOT 0 + NOT 0;
SELECT NOT (0 + (NOT 0));
SELECT (NOT 0) + (NOT 0);
SELECT formatQuery('SELECT NOT 0 + NOT 0');
SELECT formatQuery('SELECT NOT (0 + (NOT 0))');
SELECT formatQuery('SELECT (NOT 0) + (NOT 0)');