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

Merge pull request #16586 from kitaisreal/create-query-nested-type-column-formatting-intendation-fix

Browse Source 
CreateQuery nested type column formatting fix
This commit is contained in:
alexey-milovidov 2020-11-07 13:42:20 +03:00 committed by GitHub
commit 59ea3e7db0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Parsers/ASTColumnDeclaration.cpp
View File

@ -55,7 +55,11 @@ void ASTColumnDeclaration::formatImpl(const FormatSettings & settings, FormatSta
if (type)
{
settings.ostr << ' ';
type->formatImpl(settings, state, frame);
FormatStateStacked type_frame = frame;
type_frame.indent = 0;
type->formatImpl(settings, state, type_frame);
}
if (null_modifier)

4
tests/queries/0_stateless/01458_named_tuple_millin.reference
View File

@ -1,12 +1,12 @@
CREATE TABLE default.tuple
(
`j` Tuple( a Int8, b String)
`j` Tuple(a Int8, b String)
)
ENGINE = Memory
j Tuple(a Int8, b String)
CREATE TABLE default.tuple
(
`j` Tuple( a Int8, b String)
`j` Tuple(a Int8, b String)
)
ENGINE = Memory
j Tuple(a Int8, b String)

4
tests/queries/0_stateless/01458_named_tuple_millin.sql
View File

@ -10,9 +10,7 @@ SHOW CREATE TABLE tuple FORMAT TSVRaw;
DESC tuple;
DROP TABLE tuple;
CREATE TABLE tuple
ENGINE = Memory AS
SELECT CAST((1, 'Test'), 'Tuple(a Int8, b String)') AS j;
CREATE TABLE tuple ENGINE = Memory AS SELECT CAST((1, 'Test'), 'Tuple(a Int8, b String)') AS j;
SHOW CREATE TABLE tuple FORMAT TSVRaw;
DESC tuple;

12
tests/queries/0_stateless/01548_create_table_compound_column_format.reference Normal file
View File

@ -0,0 +1,12 @@
CREATE TABLE test
(
`a` Int64,
`b` NESTED(a Int64)
)
ENGINE = TinyLog
CREATE TABLE test
(
`a` Int64,
`b` TUPLE(a Int64)
)
ENGINE = TinyLog

8
tests/queries/0_stateless/01548_create_table_compound_column_format.sh Executable file
View File

@ -0,0 +1,8 @@
#!/usr/bin/env bash
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
. "$CURDIR"/../shell_config.sh
echo "CREATE TABLE test(a Int64, b NESTED(a Int64)) ENGINE=TinyLog" | $CLICKHOUSE_FORMAT
echo "CREATE TABLE test(a Int64, b TUPLE(a Int64)) ENGINE=TinyLog" | $CLICKHOUSE_FORMAT