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

Miscellaneous [#METR-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-01-04 12:04:01 +03:00
parent a4d9d766b6
commit 9acd77d985
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbms/include/DB/Parsers/ASTAlterQuery.h
View File

@ -6,11 +6,6 @@
namespace DB
{
namespace ErrorCodes
{
extern const int UNEXPECTED_AST_STRUCTURE;
}
/** ALTER запрос
* ALTER TABLE [db.]name_type
* ADD COLUMN col_name type [AFTER col_after],

2
dbms/include/DB/Parsers/ASTTablesInSelectQuery.h
View File

@ -135,7 +135,7 @@ struct ASTTablesInSelectQueryElement : public IAST
* For former elements, either table_join and table_expression are both non-nullptr, or array_join is non-nullptr.
*/
ASTPtr table_join; /// How to JOIN a table, if table_expression is non-nullptr.
ASTPtr table_expression; /// Table, first in list or JOINed.
ASTPtr table_expression; /// Table.
ASTPtr array_join; /// Arrays to JOIN.
using IAST::IAST;

3
dbms/src/TableFunctions/TableFunctionMerge.cpp
View File

@ -44,7 +44,8 @@ static NamesAndTypesList chooseColumns(const String & source_database, const Str
}
if (!any_table)
throw Exception("Error while executing table function merge. In database " + source_database + " no one matches regular expression: " + table_name_regexp_, ErrorCodes::UNKNOWN_TABLE);
throw Exception("Error while executing table function merge. In database " + source_database + " no one matches regular expression: "
+ table_name_regexp_, ErrorCodes::UNKNOWN_TABLE);
return any_table->getColumnsList();
}