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 possible name collision in ALTER

Browse Source
This commit is contained in:
Alexey Milovidov 2020-11-02 21:37:23 +03:00
parent 2c8e42c232
commit e6d8ab2270
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Interpreters/InterpreterCreateQuery.cpp
View File

@ -6,6 +6,7 @@
#include <Common/escapeForFileName.h> #include <Common/escapeForFileName.h>
#include <Common/typeid_cast.h> #include <Common/typeid_cast.h>
#include <Common/Macros.h> #include <Common/Macros.h>
#include <Common/randomSeed.h>
#include <Core/Defines.h> #include <Core/Defines.h>
#include <Core/Settings.h> #include <Core/Settings.h>
@ -362,7 +363,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
if (col_decl.type) if (col_decl.type)
{ {
const auto & final_column_name = col_decl.name; const auto & final_column_name = col_decl.name;
const auto tmp_column_name = final_column_name + "_tmp"; const auto tmp_column_name = final_column_name + "_tmp_alter" + toString(randomSeed());
const auto * data_type_ptr = column_names_and_types.back().type.get(); const auto * data_type_ptr = column_names_and_types.back().type.get();
default_expr_list->children.emplace_back( default_expr_list->children.emplace_back(

9
src/Storages/AlterCommands.cpp
View File

@ -22,12 +22,11 @@
#include <Parsers/ASTIndexDeclaration.h> #include <Parsers/ASTIndexDeclaration.h>
#include <Parsers/ASTLiteral.h> #include <Parsers/ASTLiteral.h>
#include <Parsers/ASTSetQuery.h> #include <Parsers/ASTSetQuery.h>
#include <Parsers/queryToString.h>
#include <Storages/AlterCommands.h> #include <Storages/AlterCommands.h>
#include <Storages/IStorage.h> #include <Storages/IStorage.h>
#include <Common/typeid_cast.h> #include <Common/typeid_cast.h>
#include <Common/randomSeed.h>
#include <Parsers/queryToString.h>
namespace DB namespace DB
@ -1117,7 +1116,7 @@ void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Con
data_type_ptr = command.data_type; data_type_ptr = command.data_type;
const auto & final_column_name = column_name; const auto & final_column_name = column_name;
const auto tmp_column_name = final_column_name + "_tmp"; const auto tmp_column_name = final_column_name + "_tmp_alter" + toString(randomSeed());
default_expr_list->children.emplace_back(setAlias( default_expr_list->children.emplace_back(setAlias(
addTypeConversionToAST(std::make_shared<ASTIdentifier>(tmp_column_name), data_type_ptr->getName()), addTypeConversionToAST(std::make_shared<ASTIdentifier>(tmp_column_name), data_type_ptr->getName()),
@ -1133,7 +1132,7 @@ void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Con
continue; continue;
const auto & final_column_name = column_name; const auto & final_column_name = column_name;
const auto tmp_column_name = final_column_name + "_tmp"; const auto tmp_column_name = final_column_name + "_tmp_alter" + toString(randomSeed());
const auto data_type_ptr = command.data_type; const auto data_type_ptr = command.data_type;
default_expr_list->children.emplace_back(setAlias( default_expr_list->children.emplace_back(setAlias(

0
tests/queries/0_stateless/01552_alter_name_collision.reference Normal file
View File

3
tests/queries/0_stateless/01552_alter_name_collision.sql Normal file
View File

@ -0,0 +1,3 @@
DROP TABLE IF EXISTS test;
CREATE TABLE test(test String DEFAULT 'test', test_tmp Int DEFAULT 1)ENGINE = Memory;
DROP TABLE test;