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

Fixed build after merge [#CLICKHOUSE-2].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-10-28 00:18:06 +03:00
parent ab490ec1fa
commit 5ab78c249d
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbms/src/Databases/DatabasesCommon.cpp
View File

@ -13,6 +13,11 @@
namespace DB namespace DB
{ {
namespace ErrorCodes
{
extern const int EMPTY_LIST_OF_COLUMNS_PASSED;
}
String getTableDefinitionFromCreateQuery(const ASTPtr & query) String getTableDefinitionFromCreateQuery(const ASTPtr & query)
{ {
@ -30,7 +35,7 @@ String getTableDefinitionFromCreateQuery(const ASTPtr & query)
create.select = nullptr; create.select = nullptr;
/// For "MATERIALIZED VIEW x TO y" it's necessary to save destination table /// For "MATERIALIZED VIEW x TO y" it's necessary to save destination table
if (engine != "MaterializedView" || create.inner_storage) if (!(create.is_materialized_view && !create.storage))
{ {
create.as_database.clear(); create.as_database.clear();
create.as_table.clear(); create.as_table.clear();

6
dbms/src/Interpreters/InterpreterCreateQuery.cpp
View File

@ -434,12 +434,6 @@ void InterpreterCreateQuery::setEngine(ASTCreateQuery & create) const
storage_ast->set(storage_ast->engine, engine_ast); storage_ast->set(storage_ast->engine, engine_ast);
create.set(create.storage, storage_ast); create.set(create.storage, storage_ast);
} }
else if (create.is_temporary)
set_engine("Memory");
else if (create.is_view)
set_engine("View");
else if (create.is_materialized_view)
set_engine("MaterializedView");
else if (!create.as_table.empty()) else if (!create.as_table.empty())
{ {
/// NOTE Getting the structure from the table specified in the AS is done not atomically with the creation of the table. /// NOTE Getting the structure from the table specified in the AS is done not atomically with the creation of the table.

6
dbms/src/Storages/StorageMaterializedView.cpp
View File

@ -81,10 +81,10 @@ StorageMaterializedView::StorageMaterializedView(
DatabaseAndTableName(database_name, table_name)); DatabaseAndTableName(database_name, table_name));
// If the destination table is not set, use inner table // If the destination table is not set, use inner table
if (!create.inner_storage) if (!query.storage)
{ {
target_database_name = create.as_database; target_database_name = query.as_database;
target_table_name = create.as_table; target_table_name = query.as_table;
} }
else else
{ {