mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-12-11 17:02:25 +00:00
add --backslash option for clickhouse-format
fix fix fix
This commit is contained in:
parent
af2135ef9d
commit
ba16896162
@ -1,6 +1,6 @@
|
|||||||
|
#include <functional>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
#include <functional>
|
|
||||||
#include <boost/program_options.hpp>
|
#include <boost/program_options.hpp>
|
||||||
|
|
||||||
#include <IO/ReadBufferFromFileDescriptor.h>
|
#include <IO/ReadBufferFromFileDescriptor.h>
|
||||||
@ -40,6 +40,7 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
|
|||||||
("quiet,q", "just check syntax, no output on success")
|
("quiet,q", "just check syntax, no output on success")
|
||||||
("multiquery,n", "allow multiple queries in the same file")
|
("multiquery,n", "allow multiple queries in the same file")
|
||||||
("obfuscate", "obfuscate instead of formatting")
|
("obfuscate", "obfuscate instead of formatting")
|
||||||
|
("backslash", "add a backslash at the end of each line of the formatted query")
|
||||||
("seed", po::value<std::string>(), "seed (arbitrary string) that determines the result of obfuscation")
|
("seed", po::value<std::string>(), "seed (arbitrary string) that determines the result of obfuscation")
|
||||||
;
|
;
|
||||||
|
|
||||||
@ -60,6 +61,7 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
|
|||||||
bool quiet = options.count("quiet");
|
bool quiet = options.count("quiet");
|
||||||
bool multiple = options.count("multiquery");
|
bool multiple = options.count("multiquery");
|
||||||
bool obfuscate = options.count("obfuscate");
|
bool obfuscate = options.count("obfuscate");
|
||||||
|
bool backslash = options.count("backslash");
|
||||||
|
|
||||||
if (quiet && (hilite || oneline || obfuscate))
|
if (quiet && (hilite || oneline || obfuscate))
|
||||||
{
|
{
|
||||||
@ -130,12 +132,39 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
|
|||||||
ASTPtr res = parseQueryAndMovePosition(parser, pos, end, "query", multiple, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
|
ASTPtr res = parseQueryAndMovePosition(parser, pos, end, "query", multiple, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
|
||||||
if (!quiet)
|
if (!quiet)
|
||||||
{
|
{
|
||||||
WriteBufferFromOStream res_buf(std::cout, 4096);
|
if (!backslash)
|
||||||
formatAST(*res, res_buf, hilite, oneline);
|
{
|
||||||
res_buf.next();
|
WriteBufferFromOStream res_buf(std::cout, 4096);
|
||||||
if (multiple)
|
formatAST(*res, res_buf, hilite, oneline);
|
||||||
std::cout << "\n;\n";
|
res_buf.next();
|
||||||
std::cout << std::endl;
|
if (multiple)
|
||||||
|
std::cout << "\n;\n";
|
||||||
|
std::cout << std::endl;
|
||||||
|
}
|
||||||
|
/// add additional '\' at the end of each line;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
WriteBufferFromOwnString str_buf;
|
||||||
|
formatAST(*res, str_buf, hilite, oneline);
|
||||||
|
|
||||||
|
auto res_string = str_buf.str();
|
||||||
|
WriteBufferFromOStream res_cout(std::cout, 4096);
|
||||||
|
|
||||||
|
const char * s_pos= res_string.data();
|
||||||
|
const char * s_end = s_pos + res_string.size();
|
||||||
|
|
||||||
|
while (s_pos != s_end)
|
||||||
|
{
|
||||||
|
if (*s_pos == '\n')
|
||||||
|
res_cout.write(" \\", 2);
|
||||||
|
res_cout.write(*s_pos++);
|
||||||
|
}
|
||||||
|
|
||||||
|
res_cout.next();
|
||||||
|
if (multiple)
|
||||||
|
std::cout << " \\\n;\n";
|
||||||
|
std::cout << std::endl;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} while (multiple && pos != end);
|
} while (multiple && pos != end);
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,16 @@
|
|||||||
|
SELECT * \
|
||||||
|
FROM \
|
||||||
|
( \
|
||||||
|
SELECT 1 AS x \
|
||||||
|
UNION ALL \
|
||||||
|
SELECT 1 \
|
||||||
|
UNION DISTINCT \
|
||||||
|
SELECT 3 \
|
||||||
|
)
|
||||||
|
SELECT 1 \
|
||||||
|
UNION ALL \
|
||||||
|
( \
|
||||||
|
SELECT 1 \
|
||||||
|
UNION DISTINCT \
|
||||||
|
SELECT 1 \
|
||||||
|
)
|
9
tests/queries/0_stateless/01754_clickhouse_format_backslash.sh
Executable file
9
tests/queries/0_stateless/01754_clickhouse_format_backslash.sh
Executable file
@ -0,0 +1,9 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
|
||||||
|
# shellcheck source=../shell_config.sh
|
||||||
|
. "$CURDIR"/../shell_config.sh
|
||||||
|
|
||||||
|
echo "select * from (select 1 as x union all select 1 union distinct select 3)" | $CLICKHOUSE_FORMAT --backslash;
|
||||||
|
|
||||||
|
echo "select 1 union all (select 1 union distinct select 1)" | $CLICKHOUSE_FORMAT --backslash;
|
Loading…
Reference in New Issue
Block a user