From aa77d0b3042bb8c0d49c7d353ea5a7401c6a9802 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 7 Apr 2018 06:07:32 +0300
Subject: [PATCH] Moved SessionPoolHelpers #2180

---
 dbms/src/Dictionaries/ODBCDictionarySource.cpp | 2 +-
 dbms/src/Storages/StorageODBC.cpp              | 2 +-
 libs/libpocoext/CMakeLists.txt                 | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dbms/src/Dictionaries/ODBCDictionarySource.cpp b/dbms/src/Dictionaries/ODBCDictionarySource.cpp
index 7db8dbe9e34..489b168b3fa 100644
--- a/dbms/src/Dictionaries/ODBCDictionarySource.cpp
+++ b/dbms/src/Dictionaries/ODBCDictionarySource.cpp
@@ -1,6 +1,6 @@
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnString.h>
-#include <Common/PocoSessionPoolHelpers.h>
+#include <Poco/Ext/SessionPoolHelpers.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Dictionaries/ODBCDictionarySource.h>
 #include <Dictionaries/ODBCBlockInputStream.h>
diff --git a/dbms/src/Storages/StorageODBC.cpp b/dbms/src/Storages/StorageODBC.cpp
index 09791c0e314..39b51d46047 100644
--- a/dbms/src/Storages/StorageODBC.cpp
+++ b/dbms/src/Storages/StorageODBC.cpp
@@ -1,4 +1,4 @@
-#include <Common/PocoSessionPoolHelpers.h>
+#include <Poco/Ext/SessionPoolHelpers.h>
 #include <Storages/transformQueryForExternalDatabase.h>
 #include <Storages/StorageODBC.h>
 #include <Storages/StorageFactory.h>
diff --git a/libs/libpocoext/CMakeLists.txt b/libs/libpocoext/CMakeLists.txt
index 64745f6e8d2..6b2c09b4bf1 100644
--- a/libs/libpocoext/CMakeLists.txt
+++ b/libs/libpocoext/CMakeLists.txt
@@ -1,9 +1,16 @@
 add_library (pocoext ${SPLIT_SHARED}
     src/LevelFilterChannel.cpp
     src/ThreadNumber.cpp
+    src/SessionPoolHelpers.cpp
 
     include/Poco/Ext/LevelFilterChannel.h
-    include/Poco/Ext/ThreadNumber.h)
+    include/Poco/Ext/ThreadNumber.h
+    include/Poco/Ext/SessionPoolHelpers.h)
+
+if (Poco_Data_FOUND)
+    target_include_directories (pocoext PRIVATE ${Poco_Data_INCLUDE_DIRS})
+    target_link_libraries(pocoext ${Poco_Data_LIBRARY})
+endif()
 
 target_include_directories (pocoext PUBLIC include PRIVATE ${COMMON_INCLUDE_DIR})