Preparations, part 3 [#CLICKHOUSE-31].

dbms/src/Databases/DatabaseOrdinary.cpp

@@ -7,6 +7,7 @@
 #include <Common/escapeForFileName.h>
 #include <Common/StringUtils.h>
 #include <Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ParserCreateQuery.h>

dbms/src/Databases/DatabasesCommon.cpp

+#include <sstream>
+
 #include <Parsers/parseQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/formatAST.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Storages/StorageFactory.h>
 #include <Databases/DatabasesCommon.h>

dbms/src/Databases/DatabasesCommon.h

@@ -5,11 +5,14 @@
 #include <Storages/IStorage.h>
 #include <Databases/IDatabase.h>
 
+
 /// General functionality for several different database engines.
 
 namespace DB
 {
 
+class Context;
+
 
 /** Get the row with the table definition based on the CREATE query.
   * It is an ATTACH query that you can execute to create a table from the correspondent database.

dbms/src/Interpreters/InterpreterCreateQuery.cpp

@@ -27,6 +27,7 @@
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageLog.h>
 
+#include <Interpreters/Context.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/ExpressionAnalyzer.h>
@@ -56,7 +57,7 @@ namespace ErrorCodes
 }
 
 
-InterpreterCreateQuery::InterpreterCreateQuery(ASTPtr query_ptr_, Context & context_)
+InterpreterCreateQuery::InterpreterCreateQuery(const ASTPtr & query_ptr_, Context & context_)
     : query_ptr(query_ptr_), context(context_)
 {
 }

dbms/src/Interpreters/InterpreterCreateQuery.h

 #pragma once
 
-#include <Storages/IStorage.h>
-#include <Interpreters/Context.h>
 #include <Interpreters/IInterpreter.h>
 #include <Storages/ColumnDefault.h>
-#include <Common/ThreadPool.h>
 
 
+class ThreadPool;
+
 namespace DB
 {
 
+class Context;
 class ASTCreateQuery;
+class IStorage;
+using StoragePtr = std::shared_ptr<IStorage>;
 
 
 /** Allows to create new table or database,
@@ -19,7 +21,7 @@ class ASTCreateQuery;
 class InterpreterCreateQuery : public IInterpreter
 {
 public:
-    InterpreterCreateQuery(ASTPtr query_ptr_, Context & context_);
+    InterpreterCreateQuery(const ASTPtr & query_ptr_, Context & context_);
 
     BlockIO execute() override;
 
@@ -61,7 +63,7 @@ private:
     String setEngine(ASTCreateQuery & create, const StoragePtr & as_storage) const;
 
     ASTPtr query_ptr;
-    Context context;
+    Context & context;
 
     /// Using while loading database.
     ThreadPool * thread_pool = nullptr;

dbms/src/Storages/StorageMaterializedView.cpp

 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTDropQuery.h>
 
+#include <Interpreters/Context.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterDropQuery.h>