thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-04 21:42:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

try fix synchronization check

Browse Source
This commit is contained in:
Alexander Tokmakov 2020-08-06 22:44:42 +03:00
parent 789a6022c5
commit b9fdc49e1a
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Databases/MySQL/MaterializeMetadata.cpp
View File

@ -1,7 +1,10 @@
#include <Databases/MySQL/MaterializeMetadata.h>
#if USE_MYSQL
#include <Core/Block.h> #include <Core/Block.h>
#include <DataTypes/DataTypeString.h> #include <DataTypes/DataTypeString.h>
#include <DataTypes/DataTypesNumber.h> #include <DataTypes/DataTypesNumber.h>
#include <Databases/MySQL/MaterializeMetadata.h>
#include <Formats/MySQLBlockInputStream.h> #include <Formats/MySQLBlockInputStream.h>
#include <IO/ReadBufferFromFile.h> #include <IO/ReadBufferFromFile.h>
#include <IO/WriteBufferFromFile.h> #include <IO/WriteBufferFromFile.h>
@ -206,3 +209,5 @@ MaterializeMetadata::MaterializeMetadata(
} }
} }
#endif

7
src/Databases/MySQL/MaterializeMetadata.h
View File

@ -1,5 +1,11 @@
#pragma once #pragma once
#if !defined(ARCADIA_BUILD)
# include "config_core.h"
#endif
#if USE_MYSQL
#include <Core/Types.h> #include <Core/Types.h>
#include <Core/MySQLReplication.h> #include <Core/MySQLReplication.h>
#include <mysqlxx/Connection.h> #include <mysqlxx/Connection.h>
@ -42,3 +48,4 @@ struct MaterializeMetadata
} }
#endif

2
src/Interpreters/InterpreterExternalDDLQuery.cpp
View File

@ -3,6 +3,7 @@
#endif #endif
#include <Interpreters/InterpreterExternalDDLQuery.h> #include <Interpreters/InterpreterExternalDDLQuery.h>
#include <Interpreters/Context.h>
#include <Parsers/IAST.h> #include <Parsers/IAST.h>
#include <Parsers/ASTDropQuery.h> #include <Parsers/ASTDropQuery.h>
@ -11,7 +12,6 @@
#include <Parsers/ASTExternalDDLQuery.h> #include <Parsers/ASTExternalDDLQuery.h>
#ifdef USE_MYSQL #ifdef USE_MYSQL
# include <Interpreters/Context.h>
# include <Interpreters/MySQL/InterpretersMySQLDDLQuery.h> # include <Interpreters/MySQL/InterpretersMySQLDDLQuery.h>
# include <Parsers/MySQL/ASTAlterQuery.h> # include <Parsers/MySQL/ASTAlterQuery.h>
# include <Parsers/MySQL/ASTCreateQuery.h> # include <Parsers/MySQL/ASTCreateQuery.h>

6
src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
View File

@ -165,7 +165,7 @@ static inline std::tuple<NamesAndTypesList, NamesAndTypesList, NamesAndTypesList
if (options->changes.count("primary_key")) if (options->changes.count("primary_key"))
primary_keys->arguments->children.emplace_back(std::make_shared<ASTIdentifier>(declare_column->name)); primary_keys->arguments->children.emplace_back(std::make_shared<ASTIdentifier>(declare_column->name));
if (options->changes.contains("auto_increment")) if (options->changes.count("auto_increment"))
increment_columns.emplace(declare_column->name); increment_columns.emplace(declare_column->name);
} }
} }
@ -272,10 +272,10 @@ static ASTPtr getOrderByPolicy(
for (const auto & [name, type] : names_and_types) for (const auto & [name, type] : names_and_types)
{ {
if (order_by_columns_set.contains(name)) if (order_by_columns_set.count(name))
continue; continue;
if (increment_columns.contains(name)) if (increment_columns.count(name))
{ {
increment_keys.emplace_back(name); increment_keys.emplace_back(name);
order_by_columns_set.emplace(name); order_by_columns_set.emplace(name);

3
src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
View File

@ -16,12 +16,11 @@
using namespace DB; using namespace DB;
static inline ASTPtr tryRewrittenCreateQuery(const String & query, const Context & context_) static inline ASTPtr tryRewrittenCreateQuery(const String & query, const Context & context)
{ {
ParserExternalDDLQuery external_ddl_parser; ParserExternalDDLQuery external_ddl_parser;
ASTPtr ast = parseQuery(external_ddl_parser, query, 0, 0); ASTPtr ast = parseQuery(external_ddl_parser, query, 0, 0);
Context context = context_;
return MySQLInterpreter::InterpreterCreateImpl::getRewrittenQuery( return MySQLInterpreter::InterpreterCreateImpl::getRewrittenQuery(
*ast->as<ASTExternalDDLQuery>()->external_ddl->as<MySQLParser::ASTCreateQuery>(), *ast->as<ASTExternalDDLQuery>()->external_ddl->as<MySQLParser::ASTCreateQuery>(),
context, "test_database", "test_database"); context, "test_database", "test_database");