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

dbms: Server: fix [#METR-19266]

Browse Source
This commit is contained in:
Alexey Arno 2016-10-18 22:31:07 +03:00
parent abe75277a3
commit e1099f47cb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbms/include/DB/Functions/FunctionsConversion.h
View File

@ -2345,7 +2345,12 @@ public:
void executeImpl(Block & block, const ColumnNumbers & arguments, const size_t result) override
{
wrapper_function(block, arguments, result);
/// drop second argument, pass others
ColumnNumbers new_arguments{arguments.front()};
if (arguments.size() > 2)
new_arguments.insert(std::end(new_arguments), std::next(std::begin(arguments), 2), std::end(arguments));
wrapper_function(block, new_arguments, result);
}
bool hasInformationAboutMonotonicity() const override

2
dbms/src/Storages/AlterCommands.cpp
View File

@ -210,7 +210,7 @@ void AlterCommands::validate(IStorage * table, const Context & context)
{
if (std::end(columns) != column_it)
throw Exception{
"Cannot add column " + column_name + ": column with this name already exisits",
"Cannot add column " + column_name + ": column with this name already exists",
DB::ErrorCodes::ILLEGAL_COLUMN
};
}