thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37971 from Avogar/fix-alter-columns-with-dots

Browse Source 
Fix ALTER column with column names with dots
This commit is contained in:
alesapin 2022-06-22 12:20:30 +02:00 committed by GitHub
commit d3bc7c0190
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Storages/ColumnsDescription.cpp
View File

@ -173,16 +173,16 @@ static auto getNameRange(const ColumnsDescription::ColumnsContainer & columns, c
{
String name_with_dot = name_without_dot + ".";
auto begin = columns.begin();
for (; begin != columns.end(); ++begin)
/// First we need to check if we have column with name name_without_dot
/// and if not - check if we have names that start with name_with_dot
for (auto it = columns.begin(); it != columns.end(); ++it)
{
if (begin->name == name_without_dot)
return std::make_pair(begin, std::next(begin));
if (startsWith(begin->name, name_with_dot))
break;
if (it->name == name_without_dot)
return std::make_pair(it, std::next(it));
}
auto begin = std::find_if(columns.begin(), columns.end(), [&](const auto & column){ return startsWith(column.name, name_with_dot); });
if (begin == columns.end())
return std::make_pair(begin, begin);

27
tests/queries/0_stateless/02320_alter_columns_with_dots.reference Normal file
View File

@ -0,0 +1,27 @@
id String
abc.1 String
abc.2 String
abc String
id String
abc.2 String
abc String
abc.1 String
id String
abc String
abc.2 String
abc.1 String
id String
abc.2 String
abc String
abc.1 String
id String
abc String
abc.2 String
abc.1 String
id String
abc.2 String
abc.1 String
abc String
id String
abc.2 String
abc.1 String

15
tests/queries/0_stateless/02320_alter_columns_with_dots.sql Normal file
View File

@ -0,0 +1,15 @@
DROP TABLE IF EXISTS test;
CREATE TABLE test (id String, `abc.1` String, `abc.2` String, `abc` String) ENGINE MergeTree order by id;
DESC TABLE test;
ALTER TABLE test MODIFY COLUMN `abc.1` String AFTER `abc`;
DESC TABLE test;
ALTER TABLE test MODIFY COLUMN `abc.2` String AFTER `abc`;
DESC TABLE test;
ALTER TABLE test MODIFY COLUMN `abc` String AFTER `abc.2`;
DESC TABLE test;
ALTER TABLE test MODIFY COLUMN `abc` String AFTER `id`;
DESC TABLE test;
ALTER TABLE test MODIFY COLUMN `abc` String AFTER `abc.1`;
DESC TABLE test;
ALTER TABLE test DROP COLUMN `abc`;
DESC TABLE test;