Add a test

src/Parsers/ASTAlterQuery.cpp

@@ -101,7 +101,7 @@ void ASTAlterCommand::formatImpl(
 
         if (to_remove != RemoveProperty::NO_PROPERTY)
         {
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "REMOVE ";
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " REMOVE ";
             switch (to_remove)
             {
             case RemoveProperty::DEFAULT:

src/Parsers/ParserAlterQuery.cpp

@@ -438,7 +438,9 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             if (s_if_exists.ignore(pos, expected))
                 command->if_exists = true;
 
-            if (!parser_modify_col_decl.parse(pos, command->col_decl, expected))
+            ASTPtr column_name;
+            Pos stop_pos = pos;
+            if (!parser_name.parse(pos, column_name, expected))
                 return false;
 
             if (s_remove.ignore(pos, expected))
@@ -457,9 +459,17 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                     command->to_remove = RemoveProperty::TTL;
                 else
                     return false;
+
+                auto column_declaration = std::make_shared<ASTColumnDeclaration>();
+                tryGetIdentifierNameInto(column_name, column_declaration->name);
+                command->col_decl = column_declaration;
             }
             else
             {
+                pos = stop_pos;
+                if (!parser_modify_col_decl.parse(pos, command->col_decl, expected))
+                    return false;
+
                 if (s_first.ignore(pos, expected))
                     command->first = true;
                 else if (s_after.ignore(pos, expected))

src/Storages/AlterCommands.cpp

@@ -111,7 +111,6 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         command.type = AlterCommand::MODIFY_COLUMN;
 
         const auto & ast_col_decl = command_ast->col_decl->as<ASTColumnDeclaration &>();
-
         command.column_name = ast_col_decl.name;
         command.to_remove = command_ast->to_remove;
 

tests/queries/0_stateless/01493_alter_remove_properties.reference

+CREATE TABLE default.prop_table\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_materialized` UInt64 MATERIALIZED column_default * 42,\n    `column_alias` UInt64 ALIAS column_default + 1,\n    `column_codec` String CODEC(ZSTD(10)),\n    `column_comment` Date COMMENT \'Some comment\',\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = MergeTree()\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+42	1764	43	str	2019-10-01	1
+CREATE TABLE default.prop_table\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_materialized` UInt64 MATERIALIZED column_default * 42,\n    `column_alias` UInt64 ALIAS column_default + 1,\n    `column_codec` String CODEC(ZSTD(10)),\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = MergeTree()\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.prop_table\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_materialized` UInt64 MATERIALIZED column_default * 42,\n    `column_alias` UInt64 ALIAS column_default + 1,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = MergeTree()\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+42	1764	0	str	2019-10-01	1
+CREATE TABLE default.prop_table\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_materialized` UInt64 MATERIALIZED column_default * 42,\n    `column_alias` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = MergeTree()\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+42	1764	0	str	2019-10-01	1
+42	1764	33	trs	2020-01-01	2
+CREATE TABLE default.prop_table\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_materialized` UInt64,\n    `column_alias` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = MergeTree()\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+42	1764	0	str	2019-10-01	1
+42	1764	33	trs	2020-01-01	2
+42	11	44	rts	2020-02-01	3
+CREATE TABLE default.prop_table\n(\n    `column_default` UInt64,\n    `column_materialized` UInt64,\n    `column_alias` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = MergeTree()\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+42	1764	0	str	2019-10-01	1
+42	1764	33	trs	2020-01-01	2
+42	11	44	rts	2020-02-01	3
+0	22	55	tsr	2020-03-01	4

tests/queries/0_stateless/01493_alter_remove_properties.sql

+DROP TABLE IF EXISTS prop_table;
+
+CREATE TABLE prop_table
+(
+    column_default UInt64 DEFAULT 42,
+    column_materialized UInt64 MATERIALIZED column_default * 42,
+    column_alias UInt64 ALIAS column_default + 1,
+    column_codec String CODEC(ZSTD(10)),
+    column_comment Date COMMENT 'Some comment',
+    column_ttl UInt64 TTL column_comment + INTERVAL 1 MONTH
+)
+ENGINE MergeTree()
+ORDER BY tuple()
+TTL column_comment + INTERVAL 2 MONTH;
+
+SHOW CREATE TABLE prop_table;
+
+SYSTEM STOP TTL MERGES prop_table;
+
+INSERT INTO prop_table (column_codec, column_comment, column_ttl) VALUES ('str', toDate('2019-10-01'), 1);
+
+SELECT column_default, column_materialized, column_alias, column_codec, column_comment, column_ttl FROM prop_table;
+
+ALTER TABLE prop_table MODIFY COLUMN column_comment REMOVE COMMENT;
+
+SHOW CREATE TABLE prop_table;
+
+ALTER TABLE prop_table MODIFY COLUMN column_codec REMOVE CODEC;
+
+SHOW CREATE TABLE prop_table;
+
+ALTER TABLE prop_table MODIFY COLUMN column_alias REMOVE ALIAS;
+
+SELECT column_default, column_materialized, column_alias, column_codec, column_comment, column_ttl FROM prop_table;
+
+SHOW CREATE TABLE prop_table;
+
+INSERT INTO prop_table (column_alias, column_codec, column_comment, column_ttl) VALUES (33, 'trs', toDate('2020-01-01'), 2);
+
+SELECT column_default, column_materialized, column_alias, column_codec, column_comment, column_ttl FROM prop_table ORDER BY column_ttl;
+
+ALTER TABLE prop_table MODIFY COLUMN column_materialized REMOVE MATERIALIZED;
+
+SHOW CREATE TABLE prop_table;
+
+INSERT INTO prop_table (column_materialized, column_alias, column_codec, column_comment, column_ttl) VALUES (11, 44, 'rts', toDate('2020-02-01'), 3);
+
+SELECT column_default, column_materialized, column_alias, column_codec, column_comment, column_ttl FROM prop_table ORDER BY column_ttl;
+
+ALTER TABLE prop_table MODIFY COLUMN column_default REMOVE DEFAULT;
+
+SHOW CREATE TABLE prop_table;
+
+INSERT INTO prop_table (column_materialized, column_alias, column_codec, column_comment, column_ttl) VALUES (22, 55, 'tsr', toDate('2020-03-01'), 4);
+
+SELECT column_default, column_materialized, column_alias, column_codec, column_comment, column_ttl FROM prop_table ORDER BY column_ttl;
+
+DROP TABLE IF EXISTS prop_table;