███████████: development [#CONV-2944].

dbms/include/DB/Core/Field.h

@@ -9,7 +9,9 @@
 
 #include <Poco/NumberFormatter.h>
 
-#include <mysqlxx/mysqlxx.h>	/// mysqlxx::Date, mysqlxx::DateTime
+#include <mysqlxx/Date.h>
+#include <mysqlxx/DateTime.h>
+#include <mysqlxx/Manip.h>
 
 #include <DB/Core/Types.h>
 #include <DB/Core/Exception.h>
@@ -216,3 +218,43 @@ template <> struct NearestFieldType<Array> 		{ typedef Array 	Type; };
 template <> struct NearestFieldType<bool> 		{ typedef UInt64 	Type; };
 
 }
+
+
+/// Заглушки, чтобы DBObject-ы с полем типа Array компилировались.
+namespace mysqlxx
+{
+	inline std::ostream & operator<< (mysqlxx::EscapeManipResult res, const DB::Array & value)
+	{
+		throw Poco::Exception("Cannot escape Array with mysqlxx::escape.");
+	}
+
+	inline std::ostream & operator<< (mysqlxx::QuoteManipResult res, const DB::Array & value)
+	{
+		throw Poco::Exception("Cannot quote Array with mysqlxx::quote.");
+	}
+
+	inline std::istream & operator>> (mysqlxx::UnEscapeManipResult res, DB::Array & value)
+	{
+		throw Poco::Exception("Cannot unescape Array with mysqlxx::unescape.");
+	}
+
+	inline std::istream & operator>> (mysqlxx::UnQuoteManipResult res, DB::Array & value)
+	{
+		throw Poco::Exception("Cannot unquote Array with mysqlxx::unquote.");
+	}
+}
+
+
+namespace DB
+{
+	class ReadBuffer;
+	class WriteBuffer;
+	
+	inline void readBinary(Array & x, ReadBuffer & buf) 		{ throw Exception("Cannot read Array.", ErrorCodes::NOT_IMPLEMENTED); }
+	inline void readText(Array & x, ReadBuffer & buf) 			{ throw Exception("Cannot read Array.", ErrorCodes::NOT_IMPLEMENTED); }
+	inline void readQuoted(Array & x, ReadBuffer & buf) 		{ throw Exception("Cannot read Array.", ErrorCodes::NOT_IMPLEMENTED); }
+
+	inline void writeBinary(const Array & x, WriteBuffer & buf) { throw Exception("Cannot write Array.", ErrorCodes::NOT_IMPLEMENTED); }
+	inline void writeText(const Array & x, WriteBuffer & buf) 	{ throw Exception("Cannot write Array.", ErrorCodes::NOT_IMPLEMENTED); }
+	inline void writeQuoted(const Array & x, WriteBuffer & buf) { throw Exception("Cannot write Array.", ErrorCodes::NOT_IMPLEMENTED); }
+}

dbms/include/DB/Core/NamesAndTypes.h

 #pragma once
 
 #include <map>
+#include <list>
 #include <string>
 
 #include <Poco/SharedPtr.h>

dbms/include/DB/DataStreams/CollapsingSortedBlockInputStream.h

 #pragma once
 
+#include <Yandex/logger_useful.h>
+
 #include <DB/Core/Row.h>
 #include <DB/DataStreams/MergingSortedBlockInputStream.h>
 

dbms/include/DB/DataStreams/MergeSortingBlockInputStream.h

 #pragma once
 
+#include <Yandex/logger_useful.h>
+
 #include <DB/Core/SortDescription.h>
 
 #include <DB/DataStreams/IProfilingBlockInputStream.h>

dbms/include/DB/DataStreams/MergingSortedBlockInputStream.h

@@ -2,6 +2,8 @@
 
 #include <queue>
 
+#include <Yandex/logger_useful.h>
+
 #include <DB/Core/SortDescription.h>
 
 #include <DB/DataStreams/IProfilingBlockInputStream.h>

dbms/include/DB/DataTypes/DataTypeFactory.h

 #pragma once
 
+#include <map>
+
 #include <Poco/RegularExpression.h>
 
 #include <DB/DataTypes/IDataType.h>

dbms/include/DB/Functions/FunctionsStringSearch.h

 #pragma once
 
+#include <Poco/Mutex.h>
+
 #include <statdaemons/OptimizedRegularExpression.h>
 
 #include <DB/DataTypes/DataTypesNumberFixed.h>

dbms/include/DB/Interpreters/Aggregator.h

@@ -5,6 +5,8 @@
 
 #include <Poco/Mutex.h>
 
+#include <Yandex/logger_useful.h>
+
 #include <DB/Core/ColumnNumbers.h>
 #include <DB/Core/Names.h>
 #include <DB/Core/StringRef.h>

dbms/include/DB/Interpreters/Context.h

@@ -6,6 +6,8 @@
 #include <Poco/SharedPtr.h>
 #include <Poco/Mutex.h>
 
+#include <Yandex/logger_useful.h>
+
 #include <DB/Core/NamesAndTypes.h>
 #include <DB/DataStreams/FormatFactory.h>
 #include <DB/Storages/IStorage.h>

dbms/include/DB/Interpreters/Set.h

@@ -4,6 +4,8 @@
 
 #include <statdaemons/Stopwatch.h>
 
+#include <Yandex/logger_useful.h>
+
 #include <DB/Core/ColumnNumbers.h>
 #include <DB/Core/StringPool.h>
 

dbms/src/Storages/StorageFactory.cpp

+#include <Poco/Util/Application.h>
+#include <Poco/Util/AbstractConfiguration.h>
+
 #include <DB/Parsers/ASTCreateQuery.h>
 #include <DB/Parsers/ASTIdentifier.h>
 #include <DB/Parsers/ASTLiteral.h>