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

fix merge conflict

Browse Source
This commit is contained in:
Guillaume Tassery 2019-12-17 08:06:41 +01:00
parent 595815bdf5
commit de9ab66935
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Parsers/ASTAlterQuery.cpp
View File

@ -182,7 +182,7 @@ void ASTAlterCommand::formatImpl(
case PartDestinationType::VOLUME: case PartDestinationType::VOLUME:
settings.ostr << "VOLUME "; settings.ostr << "VOLUME ";
break; break;
case MoveDestinationType::TABLE: case PartDestinationType::TABLE:
settings.ostr << "TABLE "; settings.ostr << "TABLE ";
if (!to_database.empty()) if (!to_database.empty())
{ {
@ -196,7 +196,7 @@ void ASTAlterCommand::formatImpl(
default: default:
break; break;
} }
if (move_destination_type != MoveDestinationType::TABLE) if (move_destination_type != PartDestinationType::TABLE)
{ {
settings.ostr << quoteString(move_destination_name); settings.ostr << quoteString(move_destination_name);
} }

4
dbms/src/Parsers/ParserAlterQuery.cpp
View File

@ -250,7 +250,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
else else
return false; return false;
if (command->move_destination_type != ASTAlterCommand::MoveDestinationType::TABLE) if (command->move_destination_type != PartDestinationType::TABLE)
{ {
ASTPtr ast_space_name; ASTPtr ast_space_name;
if (!parser_string_literal.parse(pos, ast_space_name, expected)) if (!parser_string_literal.parse(pos, ast_space_name, expected))
@ -279,7 +279,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
else else
return false; return false;
if (command->move_destination_type != ASTAlterCommand::MoveDestinationType::TABLE) if (command->move_destination_type != PartDestinationType::TABLE)
{ {
ASTPtr ast_space_name; ASTPtr ast_space_name;
if (!parser_string_literal.parse(pos, ast_space_name, expected)) if (!parser_string_literal.parse(pos, ast_space_name, expected))

3
dbms/src/Storages/PartitionCommands.cpp
View File

@ -54,10 +54,11 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
case PartDestinationType::VOLUME: case PartDestinationType::VOLUME:
res.move_destination_type = PartitionCommand::MoveDestinationType::VOLUME; res.move_destination_type = PartitionCommand::MoveDestinationType::VOLUME;
break; break;
case ASTAlterCommand::MoveDestinationType::TABLE: case PartDestinationType::TABLE:
res.move_destination_type = PartitionCommand::MoveDestinationType::TABLE; res.move_destination_type = PartitionCommand::MoveDestinationType::TABLE;
res.to_database = command_ast->to_database; res.to_database = command_ast->to_database;
res.to_table = command_ast->to_table; res.to_table = command_ast->to_table;
break;
default: default:
break; break;
} }