From d3342e971f0e931480dcf6b36ffb0fda22514d96 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@clickhouse.com>
Date: Wed, 2 Oct 2024 10:52:34 +0200
Subject: [PATCH] Remove Poco::Data and Poco::ODBC

---
 contrib/poco/CMakeLists.txt                   |    2 -
 contrib/poco/Data/CMakeLists.txt              |   22 -
 contrib/poco/Data/ODBC/CMakeLists.txt         |   57 -
 .../Data/ODBC/include/Poco/Data/ODBC/Binder.h | 1534 -------------
 .../include/Poco/Data/ODBC/ConnectionHandle.h |   98 -
 .../ODBC/include/Poco/Data/ODBC/Connector.h   |  101 -
 .../ODBC/include/Poco/Data/ODBC/Diagnostics.h |  217 --
 .../Poco/Data/ODBC/EnvironmentHandle.h        |   96 -
 .../Data/ODBC/include/Poco/Data/ODBC/Error.h  |  124 --
 .../ODBC/include/Poco/Data/ODBC/Extractor.h   |  748 -------
 .../Data/ODBC/include/Poco/Data/ODBC/Handle.h |  111 -
 .../Data/ODBC/include/Poco/Data/ODBC/ODBC.h   |   53 -
 .../include/Poco/Data/ODBC/ODBCException.h    |  147 --
 .../include/Poco/Data/ODBC/ODBCMetaColumn.h   |   94 -
 .../Poco/Data/ODBC/ODBCStatementImpl.h        |  208 --
 .../ODBC/include/Poco/Data/ODBC/Parameter.h   |  113 -
 .../ODBC/include/Poco/Data/ODBC/Preparator.h  | 1256 -----------
 .../ODBC/include/Poco/Data/ODBC/SessionImpl.h |  294 ---
 .../ODBC/include/Poco/Data/ODBC/TypeInfo.h    |  121 --
 .../ODBC/include/Poco/Data/ODBC/Unicode.h     |  791 -------
 .../include/Poco/Data/ODBC/Unicode_UNIXODBC.h |   56 -
 .../ODBC/include/Poco/Data/ODBC/Utility.h     |  224 --
 contrib/poco/Data/ODBC/src/Binder.cpp         |  529 -----
 .../poco/Data/ODBC/src/ConnectionHandle.cpp   |   57 -
 contrib/poco/Data/ODBC/src/Connector.cpp      |   64 -
 .../poco/Data/ODBC/src/EnvironmentHandle.cpp  |   54 -
 contrib/poco/Data/ODBC/src/Extractor.cpp      | 1312 ------------
 contrib/poco/Data/ODBC/src/ODBCException.cpp  |   30 -
 contrib/poco/Data/ODBC/src/ODBCMetaColumn.cpp |  168 --
 .../poco/Data/ODBC/src/ODBCStatementImpl.cpp  |  455 ----
 contrib/poco/Data/ODBC/src/Parameter.cpp      |   53 -
 contrib/poco/Data/ODBC/src/Preparator.cpp     |  209 --
 contrib/poco/Data/ODBC/src/SessionImpl.cpp    |  418 ----
 contrib/poco/Data/ODBC/src/TypeInfo.cpp       |  265 ---
 contrib/poco/Data/ODBC/src/Unicode.cpp        |   22 -
 .../poco/Data/ODBC/src/Unicode_UNIXODBC.cpp   |  774 -------
 contrib/poco/Data/ODBC/src/Utility.cpp        |  159 --
 .../Data/include/Poco/Data/AbstractBinder.h   |  377 ----
 .../Data/include/Poco/Data/AbstractBinding.h  |  147 --
 .../include/Poco/Data/AbstractExtraction.h    |  281 ---
 .../include/Poco/Data/AbstractExtractor.h     |  355 ---
 .../include/Poco/Data/AbstractPreparation.h   |   74 -
 .../include/Poco/Data/AbstractPreparator.h    |  392 ----
 .../include/Poco/Data/AbstractSessionImpl.h   |  312 ---
 .../Data/include/Poco/Data/ArchiveStrategy.h  |  226 --
 contrib/poco/Data/include/Poco/Data/Binding.h | 1219 -----------
 contrib/poco/Data/include/Poco/Data/Bulk.h    |  100 -
 .../poco/Data/include/Poco/Data/BulkBinding.h |  141 --
 .../Data/include/Poco/Data/BulkExtraction.h   |  253 ---
 contrib/poco/Data/include/Poco/Data/Column.h  |  482 -----
 .../poco/Data/include/Poco/Data/Connector.h   |   59 -
 .../poco/Data/include/Poco/Data/Constants.h   |   39 -
 contrib/poco/Data/include/Poco/Data/Data.h    |   50 -
 .../Data/include/Poco/Data/DataException.h    |   53 -
 contrib/poco/Data/include/Poco/Data/Date.h    |  211 --
 .../Data/include/Poco/Data/DynamicDateTime.h  |   55 -
 .../poco/Data/include/Poco/Data/Extraction.h  |  692 ------
 contrib/poco/Data/include/Poco/Data/LOB.h     |  273 ---
 contrib/poco/Data/include/Poco/Data/Limit.h   |  112 -
 .../poco/Data/include/Poco/Data/MetaColumn.h  |  192 --
 .../include/Poco/Data/PooledSessionHolder.h   |  102 -
 .../include/Poco/Data/PooledSessionImpl.h     |  100 -
 .../poco/Data/include/Poco/Data/Position.h    |   79 -
 .../poco/Data/include/Poco/Data/Preparation.h |  156 --
 contrib/poco/Data/include/Poco/Data/Range.h   |  108 -
 .../poco/Data/include/Poco/Data/RecordSet.h   |  640 ------
 contrib/poco/Data/include/Poco/Data/Row.h     |  314 ---
 .../poco/Data/include/Poco/Data/RowFilter.h   |  275 ---
 .../Data/include/Poco/Data/RowFormatter.h     |  231 --
 .../poco/Data/include/Poco/Data/RowIterator.h |  152 --
 .../poco/Data/include/Poco/Data/SQLChannel.h  |  216 --
 contrib/poco/Data/include/Poco/Data/Session.h |  491 -----
 .../Data/include/Poco/Data/SessionFactory.h   |   98 -
 .../poco/Data/include/Poco/Data/SessionImpl.h |  222 --
 .../poco/Data/include/Poco/Data/SessionPool.h |  233 --
 .../include/Poco/Data/SessionPoolContainer.h  |  117 -
 .../include/Poco/Data/SimpleRowFormatter.h    |  124 --
 .../poco/Data/include/Poco/Data/Statement.h   |  830 -------
 .../Data/include/Poco/Data/StatementCreator.h |   76 -
 .../Data/include/Poco/Data/StatementImpl.h    |  635 ------
 contrib/poco/Data/include/Poco/Data/Time.h    |  221 --
 .../poco/Data/include/Poco/Data/Transaction.h |  199 --
 .../poco/Data/include/Poco/Data/TypeHandler.h | 1906 -----------------
 contrib/poco/Data/src/AbstractBinder.cpp      |  527 -----
 contrib/poco/Data/src/AbstractBinding.cpp     |   45 -
 contrib/poco/Data/src/AbstractExtraction.cpp  |   40 -
 contrib/poco/Data/src/AbstractExtractor.cpp   |  437 ----
 contrib/poco/Data/src/AbstractPreparation.cpp |   34 -
 contrib/poco/Data/src/AbstractPreparator.cpp  |  438 ----
 contrib/poco/Data/src/ArchiveStrategy.cpp     |  146 --
 contrib/poco/Data/src/Bulk.cpp                |   37 -
 contrib/poco/Data/src/Connector.cpp           |   32 -
 contrib/poco/Data/src/DataException.cpp       |   41 -
 contrib/poco/Data/src/Date.cpp                |  142 --
 contrib/poco/Data/src/Limit.cpp               |   35 -
 contrib/poco/Data/src/MetaColumn.cpp          |   53 -
 contrib/poco/Data/src/PooledSessionHolder.cpp |   34 -
 contrib/poco/Data/src/PooledSessionImpl.cpp   |  192 --
 contrib/poco/Data/src/Position.cpp            |   32 -
 contrib/poco/Data/src/Range.cpp               |   40 -
 contrib/poco/Data/src/RecordSet.cpp           |  392 ----
 contrib/poco/Data/src/Row.cpp                 |  369 ----
 contrib/poco/Data/src/RowFilter.cpp           |  225 --
 contrib/poco/Data/src/RowFormatter.cpp        |   80 -
 contrib/poco/Data/src/RowIterator.cpp         |  207 --
 contrib/poco/Data/src/SQLChannel.cpp          |  296 ---
 contrib/poco/Data/src/Session.cpp             |   78 -
 contrib/poco/Data/src/SessionFactory.cpp      |   93 -
 contrib/poco/Data/src/SessionImpl.cpp         |   52 -
 contrib/poco/Data/src/SessionPool.cpp         |  308 ---
 .../poco/Data/src/SessionPoolContainer.cpp    |  122 --
 contrib/poco/Data/src/SimpleRowFormatter.cpp  |  113 -
 contrib/poco/Data/src/Statement.cpp           |  296 ---
 contrib/poco/Data/src/StatementCreator.cpp    |   60 -
 contrib/poco/Data/src/StatementImpl.cpp       |  475 ----
 contrib/poco/Data/src/Time.cpp                |  139 --
 contrib/poco/Data/src/Transaction.cpp         |  124 --
 117 files changed, 30390 deletions(-)
 delete mode 100644 contrib/poco/Data/CMakeLists.txt
 delete mode 100644 contrib/poco/Data/ODBC/CMakeLists.txt
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Binder.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Connector.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Error.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Handle.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBC.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Preparator.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Unicode.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h
 delete mode 100644 contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Utility.h
 delete mode 100644 contrib/poco/Data/ODBC/src/Binder.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/ConnectionHandle.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/Connector.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/EnvironmentHandle.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/Extractor.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/ODBCException.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/ODBCMetaColumn.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/ODBCStatementImpl.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/Parameter.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/Preparator.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/SessionImpl.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/TypeInfo.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/Unicode.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/Unicode_UNIXODBC.cpp
 delete mode 100644 contrib/poco/Data/ODBC/src/Utility.cpp
 delete mode 100644 contrib/poco/Data/include/Poco/Data/AbstractBinder.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/AbstractBinding.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/AbstractExtraction.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/AbstractExtractor.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/AbstractPreparation.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/AbstractPreparator.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/AbstractSessionImpl.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/ArchiveStrategy.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Binding.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Bulk.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/BulkBinding.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/BulkExtraction.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Column.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Connector.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Constants.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Data.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/DataException.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Date.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/DynamicDateTime.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Extraction.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/LOB.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Limit.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/MetaColumn.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/PooledSessionHolder.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/PooledSessionImpl.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Position.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Preparation.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Range.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/RecordSet.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Row.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/RowFilter.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/RowFormatter.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/RowIterator.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/SQLChannel.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Session.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/SessionFactory.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/SessionImpl.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/SessionPool.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/SessionPoolContainer.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/SimpleRowFormatter.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Statement.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/StatementCreator.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/StatementImpl.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Time.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/Transaction.h
 delete mode 100644 contrib/poco/Data/include/Poco/Data/TypeHandler.h
 delete mode 100644 contrib/poco/Data/src/AbstractBinder.cpp
 delete mode 100644 contrib/poco/Data/src/AbstractBinding.cpp
 delete mode 100644 contrib/poco/Data/src/AbstractExtraction.cpp
 delete mode 100644 contrib/poco/Data/src/AbstractExtractor.cpp
 delete mode 100644 contrib/poco/Data/src/AbstractPreparation.cpp
 delete mode 100644 contrib/poco/Data/src/AbstractPreparator.cpp
 delete mode 100644 contrib/poco/Data/src/ArchiveStrategy.cpp
 delete mode 100644 contrib/poco/Data/src/Bulk.cpp
 delete mode 100644 contrib/poco/Data/src/Connector.cpp
 delete mode 100644 contrib/poco/Data/src/DataException.cpp
 delete mode 100644 contrib/poco/Data/src/Date.cpp
 delete mode 100644 contrib/poco/Data/src/Limit.cpp
 delete mode 100644 contrib/poco/Data/src/MetaColumn.cpp
 delete mode 100644 contrib/poco/Data/src/PooledSessionHolder.cpp
 delete mode 100644 contrib/poco/Data/src/PooledSessionImpl.cpp
 delete mode 100644 contrib/poco/Data/src/Position.cpp
 delete mode 100644 contrib/poco/Data/src/Range.cpp
 delete mode 100644 contrib/poco/Data/src/RecordSet.cpp
 delete mode 100644 contrib/poco/Data/src/Row.cpp
 delete mode 100644 contrib/poco/Data/src/RowFilter.cpp
 delete mode 100644 contrib/poco/Data/src/RowFormatter.cpp
 delete mode 100644 contrib/poco/Data/src/RowIterator.cpp
 delete mode 100644 contrib/poco/Data/src/SQLChannel.cpp
 delete mode 100644 contrib/poco/Data/src/Session.cpp
 delete mode 100644 contrib/poco/Data/src/SessionFactory.cpp
 delete mode 100644 contrib/poco/Data/src/SessionImpl.cpp
 delete mode 100644 contrib/poco/Data/src/SessionPool.cpp
 delete mode 100644 contrib/poco/Data/src/SessionPoolContainer.cpp
 delete mode 100644 contrib/poco/Data/src/SimpleRowFormatter.cpp
 delete mode 100644 contrib/poco/Data/src/Statement.cpp
 delete mode 100644 contrib/poco/Data/src/StatementCreator.cpp
 delete mode 100644 contrib/poco/Data/src/StatementImpl.cpp
 delete mode 100644 contrib/poco/Data/src/Time.cpp
 delete mode 100644 contrib/poco/Data/src/Transaction.cpp

diff --git a/contrib/poco/CMakeLists.txt b/contrib/poco/CMakeLists.txt
index e5f5d302a..f07e05eed 100644
--- a/contrib/poco/CMakeLists.txt
+++ b/contrib/poco/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_subdirectory (Data)
-add_subdirectory (Data/ODBC)
 add_subdirectory (Foundation)
 add_subdirectory (JSON)
 add_subdirectory (Net)
diff --git a/contrib/poco/Data/CMakeLists.txt b/contrib/poco/Data/CMakeLists.txt
deleted file mode 100644
index b2de7f3b6..000000000
--- a/contrib/poco/Data/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-file (GLOB SRCS src/*.cpp)
-
-add_library (_poco_data ${SRCS})
-add_library (Poco::Data ALIAS _poco_data)
-
-if (NOT MSVC)
-    # TODO: remove these warning exclusions
-    target_compile_options (_poco_data
-        PRIVATE
-            -Wno-comma
-            -Wno-covered-switch-default
-            -Wno-deprecated-dynamic-exception-spec
-            -Wno-extra-semi-stmt
-            -Wno-old-style-cast
-            -Wno-shorten-64-to-32
-            -Wno-sign-compare
-            -Wno-unused-parameter
-            -Wno-zero-as-null-pointer-constant
-    )
-endif()
-target_include_directories (_poco_data SYSTEM PUBLIC "include")
-target_link_libraries (_poco_data PUBLIC Poco::Foundation)
diff --git a/contrib/poco/Data/ODBC/CMakeLists.txt b/contrib/poco/Data/ODBC/CMakeLists.txt
deleted file mode 100644
index 158e3f726..000000000
--- a/contrib/poco/Data/ODBC/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-if (ENABLE_ODBC)
-    if ((OS_DARWIN OR OS_LINUX) AND NOT TARGET ch_contrib::unixodbc)
-        message(FATAL_ERROR "Configuration error: unixodbc is not a target")
-    endif()
-
-    set (SRCS
-        src/Binder.cpp
-        src/ConnectionHandle.cpp
-        src/Connector.cpp
-        src/EnvironmentHandle.cpp
-        src/Extractor.cpp
-        src/ODBCException.cpp
-        src/ODBCMetaColumn.cpp
-        src/ODBCStatementImpl.cpp
-        src/Parameter.cpp
-        src/Preparator.cpp
-        src/SessionImpl.cpp
-        src/TypeInfo.cpp
-        src/Unicode.cpp
-        src/Utility.cpp
-    )
-
-    add_library (_poco_data_odbc ${SRCS})
-    add_library (Poco::Data::ODBC ALIAS _poco_data_odbc)
-    if (NOT MSVC)
-        # TODO: remove these warning exclusions
-        target_compile_options (_poco_data_odbc
-            PRIVATE
-                -Wno-cast-qual
-                -Wno-deprecated-dynamic-exception-spec
-                -Wno-extra-semi-stmt
-                -Wno-old-style-cast
-                -Wno-sign-compare
-                -Wno-tautological-constant-out-of-range-compare
-                -Wno-tautological-unsigned-zero-compare
-                -Wno-unused-parameter
-                -Wno-unused-variable
-                -Wno-zero-as-null-pointer-constant
-        )
-    endif()
-    target_include_directories (_poco_data_odbc SYSTEM PUBLIC "include")
-    if (OS_LINUX OR OS_DARWIN)
-        target_link_libraries (_poco_data_odbc PUBLIC Poco::Data ch_contrib::unixodbc)
-    elseif(OS_WINDOWS)
-        target_link_libraries (_poco_data_odbc PUBLIC Poco::Data ODBC::Driver)
-    endif()
-
-    message (STATUS "Using Poco::Data::ODBC")
-else ()
-    add_library (_poco_data_odbc INTERFACE)
-    add_library (Poco::Data::ODBC ALIAS _poco_data_odbc)
-    if (TARGET ch_contrib::unixodbc)
-        target_link_libraries (_poco_data_odbc INTERFACE ch_contrib::unixodbc)
-    endif()
-
-    message (STATUS "Not using Poco::Data::ODBC")
-endif ()
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Binder.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Binder.h
deleted file mode 100644
index 316956387..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Binder.h
+++ /dev/null
@@ -1,1534 +0,0 @@
-//
-// Binder.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Binder
-//
-// Definition of the Binder class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Binder_INCLUDED
-#define Data_ODBC_Binder_INCLUDED
-
-
-#include <deque>
-#include <list>
-#include <map>
-#include <vector>
-#include "Poco/Data/AbstractBinder.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/Data/ODBC/Handle.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/ODBCMetaColumn.h"
-#include "Poco/Data/ODBC/Parameter.h"
-#include "Poco/Data/ODBC/TypeInfo.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Exception.h"
-#include <sqlext.h>
-
-
-namespace Poco
-{
-
-
-class DateTime;
-
-
-namespace Data
-{
-
-
-    class Date;
-    class Time;
-
-
-    namespace ODBC
-    {
-
-
-        class ODBC_API Binder : public Poco::Data::AbstractBinder
-        /// Binds placeholders in the sql query to the provided values. Performs data types mapping.
-        {
-        public:
-            typedef AbstractBinder::Direction Direction;
-            typedef std::map<SQLPOINTER, SQLLEN> ParamMap;
-
-            static const size_t DEFAULT_PARAM_SIZE = 1024;
-
-            enum ParameterBinding
-            {
-                PB_IMMEDIATE,
-                PB_AT_EXEC
-            };
-
-            Binder(
-                const StatementHandle & rStmt,
-                std::size_t maxFieldSize,
-                ParameterBinding dataBinding = PB_IMMEDIATE,
-                TypeInfo * pDataTypes = 0);
-            /// Creates the Binder.
-
-            ~Binder();
-            /// Destroys the Binder.
-
-            void bind(std::size_t pos, const Poco::Int8 & val, Direction dir);
-            /// Binds an Int8.
-
-            void bind(std::size_t pos, const std::vector<Poco::Int8> & val, Direction dir);
-            /// Binds an Int8 vector.
-
-            void bind(std::size_t pos, const std::deque<Poco::Int8> & val, Direction dir);
-            /// Binds an Int8 deque.
-
-            void bind(std::size_t pos, const std::list<Poco::Int8> & val, Direction dir);
-            /// Binds an Int8 list.
-
-            void bind(std::size_t pos, const Poco::UInt8 & val, Direction dir);
-            /// Binds an UInt8.
-
-            void bind(std::size_t pos, const std::vector<Poco::UInt8> & val, Direction dir);
-            /// Binds an UInt8 vector.
-
-            void bind(std::size_t pos, const std::deque<Poco::UInt8> & val, Direction dir);
-            /// Binds an UInt8 deque.
-
-            void bind(std::size_t pos, const std::list<Poco::UInt8> & val, Direction dir);
-            /// Binds an UInt8 list.
-
-            void bind(std::size_t pos, const Poco::Int16 & val, Direction dir);
-            /// Binds an Int16.
-
-            void bind(std::size_t pos, const std::vector<Poco::Int16> & val, Direction dir);
-            /// Binds an Int16 vector.
-
-            void bind(std::size_t pos, const std::deque<Poco::Int16> & val, Direction dir);
-            /// Binds an Int16 deque.
-
-            void bind(std::size_t pos, const std::list<Poco::Int16> & val, Direction dir);
-            /// Binds an Int16 list.
-
-            void bind(std::size_t pos, const Poco::UInt16 & val, Direction dir);
-            /// Binds an UInt16.
-
-            void bind(std::size_t pos, const std::vector<Poco::UInt16> & val, Direction dir);
-            /// Binds an UInt16 vector.
-
-            void bind(std::size_t pos, const std::deque<Poco::UInt16> & val, Direction dir);
-            /// Binds an UInt16 deque.
-
-            void bind(std::size_t pos, const std::list<Poco::UInt16> & val, Direction dir);
-            /// Binds an UInt16 list.
-
-            void bind(std::size_t pos, const Poco::Int32 & val, Direction dir);
-            /// Binds an Int32.
-
-            void bind(std::size_t pos, const std::vector<Poco::Int32> & val, Direction dir);
-            /// Binds an Int32 vector.
-
-            void bind(std::size_t pos, const std::deque<Poco::Int32> & val, Direction dir);
-            /// Binds an Int32 deque.
-
-            void bind(std::size_t pos, const std::list<Poco::Int32> & val, Direction dir);
-            /// Binds an Int32 list.
-
-            void bind(std::size_t pos, const Poco::UInt32 & val, Direction dir);
-            /// Binds an UInt32.
-
-            void bind(std::size_t pos, const std::vector<Poco::UInt32> & val, Direction dir);
-            /// Binds an UInt32 vector.
-
-            void bind(std::size_t pos, const std::deque<Poco::UInt32> & val, Direction dir);
-            /// Binds an UInt32 deque.
-
-            void bind(std::size_t pos, const std::list<Poco::UInt32> & val, Direction dir);
-            /// Binds an UInt32 list.
-
-            void bind(std::size_t pos, const Poco::Int64 & val, Direction dir);
-            /// Binds an Int64.
-
-            void bind(std::size_t pos, const std::vector<Poco::Int64> & val, Direction dir);
-            /// Binds an Int64 vector.
-
-            void bind(std::size_t pos, const std::deque<Poco::Int64> & val, Direction dir);
-            /// Binds an Int64 deque.
-
-            void bind(std::size_t pos, const std::list<Poco::Int64> & val, Direction dir);
-            /// Binds an Int64 list.
-
-            void bind(std::size_t pos, const Poco::UInt64 & val, Direction dir);
-            /// Binds an UInt64.
-
-            void bind(std::size_t pos, const std::vector<Poco::UInt64> & val, Direction dir);
-            /// Binds an UInt64 vector.
-
-            void bind(std::size_t pos, const std::deque<Poco::UInt64> & val, Direction dir);
-            /// Binds an UInt64 deque.
-
-            void bind(std::size_t pos, const std::list<Poco::UInt64> & val, Direction dir);
-            /// Binds an UInt64 list.
-
-#ifndef POCO_LONG_IS_64_BIT
-            void bind(std::size_t pos, const long & val, Direction dir);
-            /// Binds a long.
-
-            void bind(std::size_t pos, const unsigned long & val, Direction dir);
-            /// Binds an unsigned long.
-
-            void bind(std::size_t pos, const std::vector<long> & val, Direction dir);
-            /// Binds a long vector.
-
-            void bind(std::size_t pos, const std::deque<long> & val, Direction dir);
-            /// Binds a long deque.
-
-            void bind(std::size_t pos, const std::list<long> & val, Direction dir);
-            /// Binds a long list.
-#endif
-
-            void bind(std::size_t pos, const bool & val, Direction dir);
-            /// Binds a boolean.
-
-            void bind(std::size_t pos, const std::vector<bool> & val, Direction dir);
-            /// Binds a boolean vector.
-
-            void bind(std::size_t pos, const std::deque<bool> & val, Direction dir);
-            /// Binds a boolean deque.
-
-            void bind(std::size_t pos, const std::list<bool> & val, Direction dir);
-            /// Binds a boolean list.
-
-            void bind(std::size_t pos, const float & val, Direction dir);
-            /// Binds a float.
-
-            void bind(std::size_t pos, const std::vector<float> & val, Direction dir);
-            /// Binds a float vector.
-
-            void bind(std::size_t pos, const std::deque<float> & val, Direction dir);
-            /// Binds a float deque.
-
-            void bind(std::size_t pos, const std::list<float> & val, Direction dir);
-            /// Binds a float list.
-
-            void bind(std::size_t pos, const double & val, Direction dir);
-            /// Binds a double.
-
-            void bind(std::size_t pos, const std::vector<double> & val, Direction dir);
-            /// Binds a double vector.
-
-            void bind(std::size_t pos, const std::deque<double> & val, Direction dir);
-            /// Binds a double deque.
-
-            void bind(std::size_t pos, const std::list<double> & val, Direction dir);
-            /// Binds a double list.
-
-            void bind(std::size_t pos, const char & val, Direction dir);
-            /// Binds a single character.
-
-            void bind(std::size_t pos, const std::vector<char> & val, Direction dir);
-            /// Binds a character vector.
-
-            void bind(std::size_t pos, const std::deque<char> & val, Direction dir);
-            /// Binds a character deque.
-
-            void bind(std::size_t pos, const std::list<char> & val, Direction dir);
-            /// Binds a character list.
-
-            void bind(std::size_t pos, const std::string & val, Direction dir);
-            /// Binds a string.
-
-            void bind(std::size_t pos, const std::vector<std::string> & val, Direction dir);
-            /// Binds a string vector.
-
-            void bind(std::size_t pos, const std::deque<std::string> & val, Direction dir);
-            /// Binds a string deque.
-
-            void bind(std::size_t pos, const std::list<std::string> & val, Direction dir);
-            /// Binds a string list.
-
-            void bind(std::size_t pos, const UTF16String & val, Direction dir);
-            /// Binds a string.
-
-            void bind(std::size_t pos, const std::vector<UTF16String> & val, Direction dir);
-            /// Binds a string vector.
-
-            void bind(std::size_t pos, const std::deque<UTF16String> & val, Direction dir);
-            /// Binds a string deque.
-
-            void bind(std::size_t pos, const std::list<UTF16String> & val, Direction dir);
-            /// Binds a string list.
-
-            void bind(std::size_t pos, const BLOB & val, Direction dir);
-            /// Binds a BLOB. In-bound only.
-
-            void bind(std::size_t pos, const CLOB & val, Direction dir);
-            /// Binds a CLOB. In-bound only.
-
-            void bind(std::size_t pos, const std::vector<BLOB> & val, Direction dir);
-            /// Binds a BLOB vector.
-
-            void bind(std::size_t pos, const std::deque<BLOB> & val, Direction dir);
-            /// Binds a BLOB deque.
-
-            void bind(std::size_t pos, const std::list<BLOB> & val, Direction dir);
-            /// Binds a BLOB list.
-
-            void bind(std::size_t pos, const std::vector<CLOB> & val, Direction dir);
-            /// Binds a CLOB vector.
-
-            void bind(std::size_t pos, const std::deque<CLOB> & val, Direction dir);
-            /// Binds a CLOB deque.
-
-            void bind(std::size_t pos, const std::list<CLOB> & val, Direction dir);
-            /// Binds a CLOB list.
-
-            void bind(std::size_t pos, const Date & val, Direction dir);
-            /// Binds a Date.
-
-            void bind(std::size_t pos, const std::vector<Date> & val, Direction dir);
-            /// Binds a Date vector.
-
-            void bind(std::size_t pos, const std::deque<Date> & val, Direction dir);
-            /// Binds a Date deque.
-
-            void bind(std::size_t pos, const std::list<Date> & val, Direction dir);
-            /// Binds a Date list.
-
-            void bind(std::size_t pos, const Time & val, Direction dir);
-            /// Binds a Time.
-
-            void bind(std::size_t pos, const std::vector<Time> & val, Direction dir);
-            /// Binds a Time vector.
-
-            void bind(std::size_t pos, const std::deque<Time> & val, Direction dir);
-            /// Binds a Time deque.
-
-            void bind(std::size_t pos, const std::list<Time> & val, Direction dir);
-            /// Binds a Time list.
-
-            void bind(std::size_t pos, const DateTime & val, Direction dir);
-            /// Binds a DateTime.
-
-            void bind(std::size_t pos, const std::vector<DateTime> & val, Direction dir);
-            /// Binds a DateTime vector.
-
-            void bind(std::size_t pos, const std::deque<DateTime> & val, Direction dir);
-            /// Binds a DateTime deque.
-
-            void bind(std::size_t pos, const std::list<DateTime> & val, Direction dir);
-            /// Binds a DateTime list.
-
-            void bind(std::size_t pos, const NullData & val, Direction dir);
-            /// Binds a null. In-bound only.
-
-            void bind(std::size_t pos, const std::vector<NullData> & val, Direction dir);
-            /// Binds a null vector.
-
-            void bind(std::size_t pos, const std::deque<NullData> & val, Direction dir);
-            /// Binds a null deque.
-
-            void bind(std::size_t pos, const std::list<NullData> & val, Direction dir);
-            /// Binds a null list.
-
-            void setDataBinding(ParameterBinding binding);
-            /// Set data binding type.
-
-            ParameterBinding getDataBinding() const;
-            /// Return data binding type.
-
-            std::size_t parameterSize(SQLPOINTER pAddr) const;
-            /// Returns bound data size for parameter at specified position.
-
-            void synchronize();
-            /// Transfers the results of non-POD outbound parameters from internal
-            /// holders back into the externally supplied buffers.
-
-            void reset();
-            /// Clears the cached storage.
-
-        private:
-            typedef std::vector<SQLLEN *> LengthPtrVec;
-            typedef std::vector<SQLLEN> LengthVec;
-            typedef std::vector<LengthVec *> LengthVecVec;
-            typedef std::vector<char *> CharPtrVec;
-            typedef std::vector<UTF16Char *> UTF16CharPtrVec;
-            typedef std::vector<bool *> BoolPtrVec;
-            typedef std::vector<SQL_DATE_STRUCT> DateVec;
-            typedef std::vector<DateVec *> DateVecVec;
-            typedef std::vector<SQL_TIME_STRUCT> TimeVec;
-            typedef std::vector<TimeVec *> TimeVecVec;
-            typedef std::vector<SQL_TIMESTAMP_STRUCT> DateTimeVec;
-            typedef std::vector<DateTimeVec *> DateTimeVecVec;
-            typedef std::vector<Poco::Any> AnyVec;
-            typedef std::vector<AnyVec> AnyVecVec;
-            typedef std::map<char *, std::string *> StringMap;
-            typedef std::map<UTF16String::value_type *, UTF16String *> UTF16StringMap;
-            typedef std::map<SQL_DATE_STRUCT *, Date *> DateMap;
-            typedef std::map<SQL_TIME_STRUCT *, Time *> TimeMap;
-            typedef std::map<SQL_TIMESTAMP_STRUCT *, DateTime *> TimestampMap;
-
-            void describeParameter(std::size_t pos);
-            /// Sets the description field for the parameter, if needed.
-
-            void bind(std::size_t pos, const char * const & pVal, Direction dir);
-            /// Binds a const char ptr.
-            /// This is a private no-op in this implementation
-            /// due to security risk.
-
-            SQLSMALLINT toODBCDirection(Direction dir) const;
-            /// Returns ODBC parameter direction based on the parameter binding direction
-            /// specified by user.
-
-            template <typename T>
-            void bindImpl(std::size_t pos, T & val, SQLSMALLINT cDataType, Direction dir)
-            {
-                SQLINTEGER colSize = 0;
-                SQLSMALLINT decDigits = 0;
-                getColSizeAndPrecision(pos, cDataType, colSize, decDigits);
-
-                _lengthIndicator.push_back(0);
-
-                if (Utility::isError(SQLBindParameter(
-                        _rStmt,
-                        (SQLUSMALLINT)pos + 1,
-                        toODBCDirection(dir),
-                        cDataType,
-                        Utility::sqlDataType(cDataType),
-                        colSize,
-                        decDigits,
-                        (SQLPOINTER)&val,
-                        0,
-                        0)))
-                {
-                    throw StatementException(_rStmt, "SQLBindParameter()");
-                }
-            }
-
-            template <typename L>
-            void bindImplLOB(std::size_t pos, const L & val, Direction dir)
-            {
-                if (isOutBound(dir) || !isInBound(dir))
-                    throw NotImplementedException("LOB parameter type can only be inbound.");
-
-                SQLPOINTER pVal = (SQLPOINTER)val.rawContent();
-                SQLINTEGER size = (SQLINTEGER)val.size();
-
-                _inParams.insert(ParamMap::value_type(pVal, size));
-
-                SQLLEN * pLenIn = new SQLLEN;
-                *pLenIn = size;
-
-                if (PB_AT_EXEC == _paramBinding)
-                    *pLenIn = SQL_LEN_DATA_AT_EXEC(size);
-
-                _lengthIndicator.push_back(pLenIn);
-
-                if (Utility::isError(SQLBindParameter(
-                        _rStmt,
-                        (SQLUSMALLINT)pos + 1,
-                        SQL_PARAM_INPUT,
-                        SQL_C_BINARY,
-                        SQL_LONGVARBINARY,
-                        (SQLUINTEGER)size,
-                        0,
-                        pVal,
-                        (SQLINTEGER)size,
-                        _lengthIndicator.back())))
-                {
-                    throw StatementException(_rStmt, "SQLBindParameter(LOB)");
-                }
-            }
-
-            template <typename T>
-            void bindImplVec(std::size_t pos, const std::vector<T> & val, SQLSMALLINT cDataType, Direction dir)
-            {
-                if (PB_IMMEDIATE != _paramBinding)
-                    throw InvalidAccessException("std::vector can only be bound immediately.");
-
-                std::size_t length = val.size();
-                SQLINTEGER colSize = 0;
-                SQLSMALLINT decDigits = 0;
-                getColSizeAndPrecision(pos, cDataType, colSize, decDigits);
-                setParamSetSize(length);
-
-                if (_vecLengthIndicator.size() <= pos)
-                {
-                    _vecLengthIndicator.resize(pos + 1, 0);
-                    _vecLengthIndicator[pos] = new LengthVec(length);
-                }
-
-                if (Utility::isError(SQLBindParameter(
-                        _rStmt,
-                        (SQLUSMALLINT)pos + 1,
-                        toODBCDirection(dir),
-                        cDataType,
-                        Utility::sqlDataType(cDataType),
-                        colSize,
-                        decDigits,
-                        (SQLPOINTER)&val[0],
-                        0,
-                        &(*_vecLengthIndicator[pos])[0])))
-                {
-                    throw StatementException(_rStmt, "SQLBindParameter()");
-                }
-            }
-
-            template <typename C>
-            void bindImplContainer(std::size_t pos, const C & val, SQLSMALLINT cDataType, Direction dir)
-            /// Utility function - a "stand-in" for non-vector containers.
-            /// Creates, fills and stores the reference to the replacement std::vector container
-            /// for std::deque and std::list. Calls std::vector binding.
-            {
-                typedef typename C::value_type Type;
-
-                if (_containers.size() <= pos)
-                    _containers.resize(pos + 1);
-
-                _containers[pos].push_back(std::vector<Type>());
-
-                std::vector<Type> & cont = RefAnyCast<std::vector<Type>>(_containers[pos].back());
-                cont.assign(val.begin(), val.end());
-                bindImplVec(pos, cont, cDataType, dir);
-            }
-
-            template <typename C>
-            void bindImplContainerBool(std::size_t pos, const C & val, SQLSMALLINT cDataType, Direction dir)
-            {
-                if (PB_IMMEDIATE != _paramBinding)
-                    throw InvalidAccessException("std::vector can only be bound immediately.");
-
-                std::size_t length = val.size();
-                SQLINTEGER colSize = 0;
-                SQLSMALLINT decDigits = 0;
-                getColSizeAndPrecision(pos, cDataType, colSize, decDigits);
-
-                setParamSetSize(val.size());
-
-                if (_vecLengthIndicator.size() <= pos)
-                {
-                    _vecLengthIndicator.resize(pos + 1, 0);
-                    _vecLengthIndicator[pos] = new LengthVec(length);
-                }
-
-                if (_boolPtrs.size() <= pos)
-                    _boolPtrs.resize(pos + 1);
-
-                _boolPtrs[pos] = new bool[val.size()];
-
-                typename C::const_iterator it = val.begin();
-                typename C::const_iterator end = val.end();
-                for (int i = 0; it != end; ++it, ++i)
-                    _boolPtrs[pos][i] = *it;
-
-                if (Utility::isError(SQLBindParameter(
-                        _rStmt,
-                        (SQLUSMALLINT)pos + 1,
-                        toODBCDirection(dir),
-                        cDataType,
-                        Utility::sqlDataType(cDataType),
-                        colSize,
-                        decDigits,
-                        (SQLPOINTER)&_boolPtrs[pos][0],
-                        0,
-                        &(*_vecLengthIndicator[pos])[0])))
-                {
-                    throw StatementException(_rStmt, "SQLBindParameter()");
-                }
-            }
-
-            template <typename C>
-            void bindImplContainerString(std::size_t pos, const C & val, Direction dir)
-            /// Utility function to bind containers of strings.
-            {
-                if (isOutBound(dir) || !isInBound(dir))
-                    throw NotImplementedException("String container parameter type can only be inbound.");
-
-                if (PB_IMMEDIATE != _paramBinding)
-                    throw InvalidAccessException("Containers can only be bound immediately.");
-
-                std::size_t length = val.size();
-
-                if (0 == length)
-                    throw InvalidArgumentException("Empty container not allowed.");
-
-                setParamSetSize(length);
-
-                SQLINTEGER size = 0;
-                getColumnOrParameterSize(pos, size);
-                poco_assert(size > 0);
-
-                if (size == _maxFieldSize)
-                {
-                    getMinValueSize(val, size);
-                    // accommodate for terminating zero
-                    if (size != _maxFieldSize)
-                        ++size;
-                }
-
-                if (_vecLengthIndicator.size() <= pos)
-                {
-                    _vecLengthIndicator.resize(pos + 1, 0);
-                    _vecLengthIndicator[pos] = new LengthVec(length ? length : 1, SQL_NTS);
-                }
-
-                if (_charPtrs.size() <= pos)
-                    _charPtrs.resize(pos + 1, 0);
-
-                _charPtrs[pos] = (char *)std::calloc(val.size() * size, sizeof(char));
-
-                std::size_t strSize;
-                std::size_t offset = 0;
-                typename C::const_iterator it = val.begin();
-                typename C::const_iterator end = val.end();
-                for (; it != end; ++it)
-                {
-                    strSize = it->size();
-                    if (strSize > size)
-                        throw LengthExceededException("SQLBindParameter(std::vector<std::string>)");
-                    std::memcpy(_charPtrs[pos] + offset, it->c_str(), strSize);
-                    offset += size;
-                }
-
-                if (Utility::isError(SQLBindParameter(
-                        _rStmt,
-                        (SQLUSMALLINT)pos + 1,
-                        toODBCDirection(dir),
-                        SQL_C_CHAR,
-                        SQL_LONGVARCHAR,
-                        (SQLUINTEGER)size - 1,
-                        0,
-                        _charPtrs[pos],
-                        (SQLINTEGER)size,
-                        &(*_vecLengthIndicator[pos])[0])))
-                {
-                    throw StatementException(_rStmt, "SQLBindParameter(std::vector<std::string>)");
-                }
-            }
-
-            template <typename C>
-            void bindImplContainerUTF16String(std::size_t pos, const C & val, Direction dir)
-            /// Utility function to bind containers of strings.
-            {
-                if (isOutBound(dir) || !isInBound(dir))
-                    throw NotImplementedException("String container parameter type can only be inbound.");
-
-                if (PB_IMMEDIATE != _paramBinding)
-                    throw InvalidAccessException("Containers can only be bound immediately.");
-
-                std::size_t length = val.size();
-                if (0 == length)
-                    throw InvalidArgumentException("Empty container not allowed.");
-
-                setParamSetSize(val.size());
-
-                SQLINTEGER size = 0;
-                getColumnOrParameterSize(pos, size);
-                poco_assert(size > 0);
-
-                if (size == _maxFieldSize)
-                {
-                    getMinValueSize(val, size);
-                    // accommodate for terminating zero
-                    if (size != _maxFieldSize)
-                        size += sizeof(UTF16Char);
-                }
-
-                if (_vecLengthIndicator.size() <= pos)
-                {
-                    _vecLengthIndicator.resize(pos + 1, 0);
-                    _vecLengthIndicator[pos] = new LengthVec(length ? length : 1, SQL_NTS);
-                }
-
-                if (_utf16CharPtrs.size() <= pos)
-                    _utf16CharPtrs.resize(pos + 1, 0);
-
-                _utf16CharPtrs[pos] = (UTF16Char *)std::calloc(val.size() * size, sizeof(UTF16Char));
-
-                std::size_t strSize;
-                std::size_t offset = 0;
-                char * pBuf = (char *)_utf16CharPtrs[pos];
-                typename C::const_iterator it = val.begin();
-                typename C::const_iterator end = val.end();
-                for (; it != end; ++it)
-                {
-                    strSize = it->size() * sizeof(UTF16Char);
-                    if (strSize > size)
-                        throw LengthExceededException("SQLBindParameter(std::vector<UTF16String>)");
-                    std::memcpy(pBuf + offset, it->data(), strSize);
-                    offset += size;
-                }
-
-                if (Utility::isError(SQLBindParameter(
-                        _rStmt,
-                        (SQLUSMALLINT)pos + 1,
-                        toODBCDirection(dir),
-                        SQL_C_WCHAR,
-                        SQL_WLONGVARCHAR,
-                        (SQLUINTEGER)size - 1,
-                        0,
-                        _utf16CharPtrs[pos],
-                        (SQLINTEGER)size,
-                        &(*_vecLengthIndicator[pos])[0])))
-                {
-                    throw StatementException(_rStmt, "SQLBindParameter(std::vector<UTF16String>)");
-                }
-            }
-
-            template <typename C>
-            void bindImplContainerLOB(std::size_t pos, const C & val, Direction dir)
-            {
-                typedef typename C::value_type LOBType;
-                typedef typename LOBType::ValueType CharType;
-
-                if (isOutBound(dir) || !isInBound(dir))
-                    throw NotImplementedException("BLOB container parameter type can only be inbound.");
-
-                if (PB_IMMEDIATE != _paramBinding)
-                    throw InvalidAccessException("Containers can only be bound immediately.");
-
-                std::size_t length = val.size();
-                if (0 == length)
-                    throw InvalidArgumentException("Empty container not allowed.");
-
-                setParamSetSize(length);
-
-                SQLINTEGER size = 0;
-
-                if (_vecLengthIndicator.size() <= pos)
-                {
-                    _vecLengthIndicator.resize(pos + 1, 0);
-                    _vecLengthIndicator[pos] = new LengthVec(length ? length : 1);
-                }
-
-                std::vector<SQLLEN>::iterator lIt = _vecLengthIndicator[pos]->begin();
-                std::vector<SQLLEN>::iterator lEnd = _vecLengthIndicator[pos]->end();
-                typename C::const_iterator cIt = val.begin();
-                for (; lIt != lEnd; ++lIt, ++cIt)
-                {
-                    SQLLEN sz = static_cast<SQLLEN>(cIt->size());
-                    if (sz > size)
-                        size = static_cast<SQLINTEGER>(sz);
-                    *lIt = sz;
-                }
-
-                if (_charPtrs.size() <= pos)
-                    _charPtrs.resize(pos + 1, 0);
-
-                _charPtrs[pos] = (char *)std::calloc(val.size() * size, sizeof(CharType));
-                poco_check_ptr(_charPtrs[pos]);
-
-                std::size_t blobSize;
-                std::size_t offset = 0;
-                cIt = val.begin();
-                typename C::const_iterator cEnd = val.end();
-                for (; cIt != cEnd; ++cIt)
-                {
-                    blobSize = cIt->size();
-                    if (blobSize > size)
-                        throw LengthExceededException("SQLBindParameter(std::vector<BLOB>)");
-                    std::memcpy(_charPtrs[pos] + offset, cIt->rawContent(), blobSize * sizeof(CharType));
-                    offset += size;
-                }
-
-                if (Utility::isError(SQLBindParameter(
-                        _rStmt,
-                        (SQLUSMALLINT)pos + 1,
-                        SQL_PARAM_INPUT,
-                        SQL_C_BINARY,
-                        SQL_LONGVARBINARY,
-                        (SQLUINTEGER)size,
-                        0,
-                        _charPtrs[pos],
-                        (SQLINTEGER)size,
-                        &(*_vecLengthIndicator[pos])[0])))
-                {
-                    throw StatementException(_rStmt, "SQLBindParameter(std::vector<BLOB>)");
-                }
-            }
-
-            template <typename C>
-            void bindImplContainerDate(std::size_t pos, const C & val, Direction dir)
-            {
-                if (isOutBound(dir) || !isInBound(dir))
-                    throw NotImplementedException("Date vector parameter type can only be inbound.");
-
-                if (PB_IMMEDIATE != _paramBinding)
-                    throw InvalidAccessException("std::vector can only be bound immediately.");
-
-                std::size_t length = val.size();
-
-                if (0 == length)
-                    throw InvalidArgumentException("Empty vector not allowed.");
-
-                setParamSetSize(length);
-
-                SQLINTEGER size = (SQLINTEGER)sizeof(SQL_DATE_STRUCT);
-
-                if (_vecLengthIndicator.size() <= pos)
-                {
-                    _vecLengthIndicator.resize(pos + 1, 0);
-                    _vecLengthIndicator[pos] = new LengthVec(length ? length : 1);
-                }
-
-                if (_dateVecVec.size() <= pos)
-                {
-                    _dateVecVec.resize(pos + 1, 0);
-                    _dateVecVec[pos] = new DateVec(length ? length : 1);
-                }
-
-                Utility::dateSync(*_dateVecVec[pos], val);
-
-                SQLINTEGER colSize = 0;
-                SQLSMALLINT decDigits = 0;
-                getColSizeAndPrecision(pos, SQL_TYPE_DATE, colSize, decDigits);
-
-                if (Utility::isError(SQLBindParameter(
-                        _rStmt,
-                        (SQLUSMALLINT)pos + 1,
-                        toODBCDirection(dir),
-                        SQL_C_TYPE_DATE,
-                        SQL_TYPE_DATE,
-                        colSize,
-                        decDigits,
-                        (SQLPOINTER) & (*_dateVecVec[pos])[0],
-                        0,
-                        &(*_vecLengthIndicator[pos])[0])))
-                {
-                    throw StatementException(_rStmt, "SQLBindParameter(Date[])");
-                }
-            }
-
-            template <typename C>
-            void bindImplContainerTime(std::size_t pos, const C & val, Direction dir)
-            {
-                if (isOutBound(dir) || !isInBound(dir))
-                    throw NotImplementedException("Time container parameter type can only be inbound.");
-
-                if (PB_IMMEDIATE != _paramBinding)
-                    throw InvalidAccessException("Containers can only be bound immediately.");
-
-                std::size_t length = val.size();
-                if (0 == length)
-                    throw InvalidArgumentException("Empty container not allowed.");
-
-                setParamSetSize(val.size());
-
-                SQLINTEGER size = (SQLINTEGER)sizeof(SQL_TIME_STRUCT);
-
-                if (_vecLengthIndicator.size() <= pos)
-                {
-                    _vecLengthIndicator.resize(pos + 1, 0);
-                    _vecLengthIndicator[pos] = new LengthVec(length ? length : 1);
-                }
-
-                if (_timeVecVec.size() <= pos)
-                {
-                    _timeVecVec.resize(pos + 1, 0);
-                    _timeVecVec[pos] = new TimeVec(length ? length : 1);
-                }
-
-                Utility::timeSync(*_timeVecVec[pos], val);
-
-                SQLINTEGER colSize = 0;
-                SQLSMALLINT decDigits = 0;
-                getColSizeAndPrecision(pos, SQL_TYPE_TIME, colSize, decDigits);
-
-                if (Utility::isError(SQLBindParameter(
-                        _rStmt,
-                        (SQLUSMALLINT)pos + 1,
-                        toODBCDirection(dir),
-                        SQL_C_TYPE_TIME,
-                        SQL_TYPE_TIME,
-                        colSize,
-                        decDigits,
-                        (SQLPOINTER) & (*_timeVecVec[pos])[0],
-                        0,
-                        &(*_vecLengthIndicator[pos])[0])))
-                {
-                    throw StatementException(_rStmt, "SQLBindParameter(Time[])");
-                }
-            }
-
-            template <typename C>
-            void bindImplContainerDateTime(std::size_t pos, const C & val, Direction dir)
-            {
-                if (isOutBound(dir) || !isInBound(dir))
-                    throw NotImplementedException("DateTime container parameter type can only be inbound.");
-
-                if (PB_IMMEDIATE != _paramBinding)
-                    throw InvalidAccessException("Containers can only be bound immediately.");
-
-                std::size_t length = val.size();
-
-                if (0 == length)
-                    throw InvalidArgumentException("Empty Containers not allowed.");
-
-                setParamSetSize(length);
-
-                SQLINTEGER size = (SQLINTEGER)sizeof(SQL_TIMESTAMP_STRUCT);
-
-                if (_vecLengthIndicator.size() <= pos)
-                {
-                    _vecLengthIndicator.resize(pos + 1, 0);
-                    _vecLengthIndicator[pos] = new LengthVec(length ? length : 1);
-                }
-
-                if (_dateTimeVecVec.size() <= pos)
-                {
-                    _dateTimeVecVec.resize(pos + 1, 0);
-                    _dateTimeVecVec[pos] = new DateTimeVec(length ? length : 1);
-                }
-
-                Utility::dateTimeSync(*_dateTimeVecVec[pos], val);
-
-                SQLINTEGER colSize = 0;
-                SQLSMALLINT decDigits = 0;
-                getColSizeAndPrecision(pos, SQL_TYPE_TIMESTAMP, colSize, decDigits);
-
-                if (Utility::isError(SQLBindParameter(
-                        _rStmt,
-                        (SQLUSMALLINT)pos + 1,
-                        toODBCDirection(dir),
-                        SQL_C_TYPE_TIMESTAMP,
-                        SQL_TYPE_TIMESTAMP,
-                        colSize,
-                        decDigits,
-                        (SQLPOINTER) & (*_dateTimeVecVec[pos])[0],
-                        0,
-                        &(*_vecLengthIndicator[pos])[0])))
-                {
-                    throw StatementException(_rStmt, "SQLBindParameter(Time[])");
-                }
-            }
-
-            template <typename C>
-            void bindImplNullContainer(std::size_t pos, const C & val, Direction dir)
-            {
-                if (isOutBound(dir) || !isInBound(dir))
-                    throw NotImplementedException("Null container parameter type can only be inbound.");
-
-                if (PB_IMMEDIATE != _paramBinding)
-                    throw InvalidAccessException("Container can only be bound immediately.");
-
-                std::size_t length = val.size();
-
-                if (0 == length)
-                    throw InvalidArgumentException("Empty container not allowed.");
-
-                setParamSetSize(length);
-
-                SQLINTEGER size = SQL_NULL_DATA;
-
-                if (_vecLengthIndicator.size() <= pos)
-                {
-                    _vecLengthIndicator.resize(pos + 1, 0);
-                    _vecLengthIndicator[pos] = new LengthVec(length ? length : 1);
-                }
-
-                SQLINTEGER colSize = 0;
-                SQLSMALLINT decDigits = 0;
-                getColSizeAndPrecision(pos, SQL_C_STINYINT, colSize, decDigits);
-
-                if (Utility::isError(SQLBindParameter(
-                        _rStmt,
-                        (SQLUSMALLINT)pos + 1,
-                        SQL_PARAM_INPUT,
-                        SQL_C_STINYINT,
-                        Utility::sqlDataType(SQL_C_STINYINT),
-                        colSize,
-                        decDigits,
-                        0,
-                        0,
-                        &(*_vecLengthIndicator[pos])[0])))
-                {
-                    throw StatementException(_rStmt, "SQLBindParameter()");
-                }
-            }
-
-            void getColSizeAndPrecision(
-                std::size_t pos, SQLSMALLINT cDataType, SQLINTEGER & colSize, SQLSMALLINT & decDigits, std::size_t actualSize = 0);
-            /// Used to retrieve column size and precision.
-            /// Not all drivers cooperate with this inquiry under all circumstances
-            /// This function runs for query and stored procedure parameters (in and
-            /// out-bound). Some drivers, however, do not care about knowing this
-            /// information to start with. For that reason, after all the attempts
-            /// to discover the required values are unsuccessfully exhausted, the values
-            /// are both set to zero and no exception is thrown.
-            /// However, if the colSize is successfully retrieved and it is greater than
-            /// session-wide maximum allowed field size, LengthExceededException is thrown.
-
-            void setParamSetSize(std::size_t length);
-            /// Sets the parameter set size. Used for column-wise binding.
-
-            void getColumnOrParameterSize(std::size_t pos, SQLINTEGER & size);
-            /// Fills the column or parameter size into the 'size' argument.
-            /// Does nothing if neither can be obtained from the driver, so
-            /// size should be set to some default value prior to calling this
-            /// function in order to avoid undefined size value.
-
-            void freeMemory();
-            /// Frees all dynamically allocated memory resources.
-
-            template <typename T>
-            void getMinValueSize(T & val, SQLINTEGER & size)
-            /// Some ODBC drivers return DB-wide maximum allowed size for variable size columns,
-            /// rather than the allowed size for the actual column. In such cases, the length is
-            /// automatically resized to the maximum field size allowed by the session.
-            /// This function, in order to prevent unnecessary memory allocation, does further
-            /// optimization, looking for the maximum length within supplied data container and
-            /// uses the smaller of maximum found and maximum predefined data length.
-            {
-                typedef typename T::value_type ContainedValType;
-                typedef typename ContainedValType::value_type BaseValType;
-                std::size_t typeSize = sizeof(BaseValType);
-                std::size_t maxSize = 0;
-                typename T::const_iterator it = val.begin();
-                typename T::const_iterator end = val.end();
-                for (; it != end; ++it)
-                {
-                    std::size_t sz = it->size() * typeSize;
-                    if (sz > _maxFieldSize)
-                        throw LengthExceededException();
-
-                    if (sz == _maxFieldSize)
-                    {
-                        maxSize = 0;
-                        break;
-                    }
-
-                    if (sz < _maxFieldSize && sz > maxSize)
-                        maxSize = sz;
-                }
-                if (maxSize)
-                    size = static_cast<SQLINTEGER>(maxSize);
-            }
-
-            const StatementHandle & _rStmt;
-
-            LengthPtrVec _lengthIndicator;
-            LengthVecVec _vecLengthIndicator;
-
-            ParamMap _inParams;
-            ParamMap _outParams;
-            ParameterBinding _paramBinding;
-
-            DateMap _dates;
-            TimeMap _times;
-            TimestampMap _timestamps;
-            StringMap _strings;
-            UTF16StringMap _utf16Strings;
-
-            DateVecVec _dateVecVec;
-            TimeVecVec _timeVecVec;
-            DateTimeVecVec _dateTimeVecVec;
-            CharPtrVec _charPtrs;
-            UTF16CharPtrVec _utf16CharPtrs;
-            BoolPtrVec _boolPtrs;
-            const TypeInfo * _pTypeInfo;
-            SQLINTEGER _paramSetSize;
-            std::size_t _maxFieldSize;
-            AnyVecVec _containers;
-        };
-
-
-        //
-        // inlines
-        //
-        inline void Binder::bind(std::size_t pos, const Poco::Int8 & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_STINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<Poco::Int8> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_STINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<Poco::Int8> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_STINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<Poco::Int8> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_STINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const Poco::UInt8 & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_UTINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<Poco::UInt8> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_UTINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<Poco::UInt8> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_UTINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<Poco::UInt8> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_UTINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const Poco::Int16 & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_SSHORT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<Poco::Int16> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_SSHORT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<Poco::Int16> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_SSHORT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<Poco::Int16> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_SSHORT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const Poco::UInt16 & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_USHORT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<Poco::UInt16> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_USHORT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<Poco::UInt16> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_USHORT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<Poco::UInt16> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_USHORT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const Poco::Int32 & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_SLONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<Poco::Int32> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_SLONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<Poco::Int32> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_SLONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<Poco::Int32> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_SLONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const Poco::UInt32 & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_ULONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<Poco::UInt32> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_ULONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<Poco::UInt32> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_ULONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<Poco::UInt32> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_ULONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const Poco::Int64 & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_SBIGINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<Poco::Int64> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_SBIGINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<Poco::Int64> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_SBIGINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<Poco::Int64> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_SBIGINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const Poco::UInt64 & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_UBIGINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<Poco::UInt64> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_UBIGINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<Poco::UInt64> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_UBIGINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<Poco::UInt64> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_UBIGINT, dir);
-        }
-
-
-#ifndef POCO_LONG_IS_64_BIT
-        inline void Binder::bind(std::size_t pos, const long & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_SLONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const unsigned long & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_SLONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<long> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_SLONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<long> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_SLONG, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<long> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_SLONG, dir);
-        }
-#endif
-
-
-        inline void Binder::bind(std::size_t pos, const float & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_FLOAT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<float> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_FLOAT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<float> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_FLOAT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<float> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_FLOAT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const double & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_DOUBLE, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<double> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_DOUBLE, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<double> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_DOUBLE, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<double> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_DOUBLE, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const bool & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_BIT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<bool> & val, Direction dir)
-        {
-            bindImplContainerBool(pos, val, SQL_C_BIT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<bool> & val, Direction dir)
-        {
-            bindImplContainerBool(pos, val, SQL_C_BIT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<bool> & val, Direction dir)
-        {
-            bindImplContainerBool(pos, val, SQL_C_BIT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const char & val, Direction dir)
-        {
-            bindImpl(pos, val, SQL_C_STINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<char> & val, Direction dir)
-        {
-            bindImplVec(pos, val, SQL_C_STINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<char> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_STINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<char> & val, Direction dir)
-        {
-            bindImplContainer(pos, val, SQL_C_STINYINT, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<std::string> & val, Direction dir)
-        {
-            bindImplContainerString(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<std::string> & val, Direction dir)
-        {
-            bindImplContainerString(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<std::string> & val, Direction dir)
-        {
-            bindImplContainerString(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<UTF16String> & val, Direction dir)
-        {
-            bindImplContainerUTF16String(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<UTF16String> & val, Direction dir)
-        {
-            bindImplContainerUTF16String(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<UTF16String> & val, Direction dir)
-        {
-            bindImplContainerUTF16String(pos, val, dir);
-        }
-
-        inline void Binder::bind(std::size_t pos, const BLOB & val, Direction dir)
-        {
-            bindImplLOB<BLOB>(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const CLOB & val, Direction dir)
-        {
-            bindImplLOB<CLOB>(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<BLOB> & val, Direction dir)
-        {
-            bindImplContainerLOB(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<BLOB> & val, Direction dir)
-        {
-            bindImplContainerLOB(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<BLOB> & val, Direction dir)
-        {
-            bindImplContainerLOB(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<CLOB> & val, Direction dir)
-        {
-            bindImplContainerLOB(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<CLOB> & val, Direction dir)
-        {
-            bindImplContainerLOB(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<CLOB> & val, Direction dir)
-        {
-            bindImplContainerLOB(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<Date> & val, Direction dir)
-        {
-            bindImplContainerDate(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<Date> & val, Direction dir)
-        {
-            bindImplContainerDate(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<Date> & val, Direction dir)
-        {
-            bindImplContainerDate(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<Time> & val, Direction dir)
-        {
-            bindImplContainerTime(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<Time> & val, Direction dir)
-        {
-            bindImplContainerTime(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<Time> & val, Direction dir)
-        {
-            bindImplContainerTime(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<DateTime> & val, Direction dir)
-        {
-            bindImplContainerDateTime(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<DateTime> & val, Direction dir)
-        {
-            bindImplContainerDateTime(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<DateTime> & val, Direction dir)
-        {
-            bindImplContainerDateTime(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::vector<NullData> & val, Direction dir)
-        {
-            bindImplNullContainer(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::deque<NullData> & val, Direction dir)
-        {
-            bindImplNullContainer(pos, val, dir);
-        }
-
-
-        inline void Binder::bind(std::size_t pos, const std::list<NullData> & val, Direction dir)
-        {
-            bindImplNullContainer(pos, val, dir);
-        }
-
-
-        inline void Binder::setDataBinding(Binder::ParameterBinding binding)
-        {
-            _paramBinding = binding;
-        }
-
-
-        inline Binder::ParameterBinding Binder::getDataBinding() const
-        {
-            return _paramBinding;
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif // Data_ODBC_Binder_INCLUDED
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h
deleted file mode 100644
index 362361af7..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// ConnectionHandle.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  ConnectionHandle
-//
-// Definition of ConnectionHandle.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_ConnectionHandle_INCLUDED
-#define Data_ODBC_ConnectionHandle_INCLUDED
-
-
-#include "Poco/Data/ODBC/EnvironmentHandle.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include <sqltypes.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        class ODBC_API ConnectionHandle
-        /// ODBC connection handle class
-        {
-        public:
-            ConnectionHandle(EnvironmentHandle * pEnvironment = 0);
-            /// Creates the ConnectionHandle.
-
-            ~ConnectionHandle();
-            /// Creates the ConnectionHandle.
-
-            operator const SQLHDBC &() const;
-            /// Const conversion operator into reference to native type.
-
-            const SQLHDBC & handle() const;
-            /// Returns const reference to handle;
-
-        private:
-            operator SQLHDBC &();
-            /// Conversion operator into reference to native type.
-
-            SQLHDBC & handle();
-            /// Returns reference to handle;
-
-            ConnectionHandle(const ConnectionHandle &);
-            const ConnectionHandle & operator=(const ConnectionHandle &);
-
-            const EnvironmentHandle * _pEnvironment;
-            SQLHDBC _hdbc;
-            bool _ownsEnvironment;
-        };
-
-
-        //
-        // inlines
-        //
-        inline ConnectionHandle::operator const SQLHDBC &() const
-        {
-            return handle();
-        }
-
-
-        inline const SQLHDBC & ConnectionHandle::handle() const
-        {
-            return _hdbc;
-        }
-
-
-        inline ConnectionHandle::operator SQLHDBC &()
-        {
-            return handle();
-        }
-
-
-        inline SQLHDBC & ConnectionHandle::handle()
-        {
-            return _hdbc;
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Connector.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Connector.h
deleted file mode 100644
index 7da312244..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Connector.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// Connector.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Connector
-//
-// Definition of the Connector class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Connector_INCLUDED
-#define Data_ODBC_Connector_INCLUDED
-
-
-#include "Poco/Data/Connector.h"
-#include "Poco/Data/ODBC/ODBC.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        class ODBC_API Connector : public Poco::Data::Connector
-        /// Connector instantiates SqLite SessionImpl objects.
-        {
-        public:
-            static const std::string KEY;
-            /// Keyword for creating ODBC sessions.
-
-            Connector();
-            /// Creates the Connector.
-
-            ~Connector();
-            /// Destroys the Connector.
-
-            const std::string & name() const;
-            /// Returns the name associated with this connector.
-
-            Poco::AutoPtr<Poco::Data::SessionImpl>
-            createSession(const std::string & connectionString, std::size_t timeout = Poco::Data::SessionImpl::LOGIN_TIMEOUT_DEFAULT);
-            /// Creates a ODBC SessionImpl object and initializes it with the given connectionString.
-
-            static void registerConnector();
-            /// Registers the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory
-
-            static void unregisterConnector();
-            /// Unregisters the Connector under the Keyword Connector::KEY at the Poco::Data::SessionFactory
-
-            static void bindStringToLongVarChar(bool flag = true);
-            /// If set to true (default), std::string is bound to SQL_LONGVARCHAR.
-            ///
-            /// This can cause issues with SQL Server, resulting in an error
-            /// ("The data types varchar and text are incompatible in the equal to operator")
-            /// when comparing against a VARCHAR.
-            ///
-            /// Set this to false to bind std::string to SQL_VARCHAR.
-            ///
-            /// NOTE: This is a global setting, affecting all sessions.
-            /// This setting should not be changed after the first Session has
-            /// been created.
-
-            static bool stringBoundToLongVarChar();
-            /// Returns true if std::string is bound to SQL_LONGVARCHAR,
-            /// otherwise false (bound to SQL_VARCHAR).
-
-        private:
-            static bool _bindStringToLongVarChar;
-        };
-
-
-        ///
-        /// inlines
-        ///
-        inline const std::string & Connector::name() const
-        {
-            return KEY;
-        }
-
-
-        inline bool Connector::stringBoundToLongVarChar()
-        {
-            return _bindStringToLongVarChar;
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif // Data_ODBC_Connector_INCLUDED
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
deleted file mode 100644
index 135a368ef..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
+++ /dev/null
@@ -1,217 +0,0 @@
-//
-// Diagnostics.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Diagnostics
-//
-// Definition of Diagnostics.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Diagnostics_INCLUDED
-#define Data_ODBC_Diagnostics_INCLUDED
-
-
-#include <cstring>
-#include <vector>
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include <sqlext.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        template <typename H, SQLSMALLINT handleType>
-        class Diagnostics
-        /// Utility class providing functionality for retrieving ODBC diagnostic
-        /// records. Diagnostics object must be created with corresponding handle
-        /// as constructor argument. During construction, diagnostic records fields
-        /// are populated and the object is ready for querying.
-        {
-        public:
-            static const unsigned int SQL_STATE_SIZE = SQL_SQLSTATE_SIZE + 1;
-            static const unsigned int SQL_MESSAGE_LENGTH = SQL_MAX_MESSAGE_LENGTH + 1;
-            static const unsigned int SQL_NAME_LENGTH = 128;
-            static const std::string DATA_TRUNCATED;
-
-            struct DiagnosticFields
-            {
-                /// SQLGetDiagRec fields
-                SQLCHAR _sqlState[SQL_STATE_SIZE];
-                SQLCHAR _message[SQL_MESSAGE_LENGTH];
-                SQLINTEGER _nativeError;
-            };
-
-            typedef std::vector<DiagnosticFields> FieldVec;
-            typedef typename FieldVec::const_iterator Iterator;
-
-            explicit Diagnostics(const H & handle) : _handle(handle)
-            /// Creates and initializes the Diagnostics.
-            {
-                std::memset(_connectionName, 0, sizeof(_connectionName));
-                std::memset(_serverName, 0, sizeof(_serverName));
-                diagnostics();
-            }
-
-            ~Diagnostics()
-            /// Destroys the Diagnostics.
-            {
-            }
-
-            std::string sqlState(int index) const
-            /// Returns SQL state.
-            {
-                poco_assert(index < count());
-                return std::string((char *)_fields[index]._sqlState);
-            }
-
-            std::string message(int index) const
-            /// Returns error message.
-            {
-                poco_assert(index < count());
-                return std::string((char *)_fields[index]._message);
-            }
-
-            long nativeError(int index) const
-            /// Returns native error code.
-            {
-                poco_assert(index < count());
-                return _fields[index]._nativeError;
-            }
-
-            std::string connectionName() const
-            /// Returns the connection name.
-            /// If there is no active connection, connection name defaults to NONE.
-            /// If connection name is not applicable for query context (such as when querying environment handle),
-            /// connection name defaults to NOT_APPLICABLE.
-            {
-                return std::string((char *)_connectionName);
-            }
-
-            std::string serverName() const
-            /// Returns the server name.
-            /// If the connection has not been established, server name defaults to NONE.
-            /// If server name is not applicable for query context (such as when querying environment handle),
-            /// connection name defaults to NOT_APPLICABLE.
-            {
-                return std::string((char *)_serverName);
-            }
-
-            int count() const
-            /// Returns the number of contained diagnostic records.
-            {
-                return (int)_fields.size();
-            }
-
-            void reset()
-            /// Resets the diagnostic fields container.
-            {
-                _fields.clear();
-            }
-
-            const FieldVec & fields() const { return _fields; }
-
-            Iterator begin() const { return _fields.begin(); }
-
-            Iterator end() const { return _fields.end(); }
-
-            const Diagnostics & diagnostics()
-            {
-                DiagnosticFields df;
-                SQLSMALLINT count = 1;
-                SQLSMALLINT messageLength = 0;
-                static const std::string none = "None";
-                static const std::string na = "Not applicable";
-
-                reset();
-
-                while (!Utility::isError(SQLGetDiagRec(
-                    handleType, _handle, count, df._sqlState, &df._nativeError, df._message, SQL_MESSAGE_LENGTH, &messageLength)))
-                {
-                    if (1 == count)
-                    {
-                        // success of the following two calls is optional
-                        // (they fail if connection has not been established yet
-                        //  or return empty string if not applicable for the context)
-                        if (Utility::isError(SQLGetDiagField(
-                                handleType,
-                                _handle,
-                                count,
-                                SQL_DIAG_CONNECTION_NAME,
-                                _connectionName,
-                                sizeof(_connectionName),
-                                &messageLength)))
-                        {
-                            std::size_t len = sizeof(_connectionName) > none.length() ? none.length() : sizeof(_connectionName) - 1;
-                            std::memcpy(_connectionName, none.c_str(), len);
-                        }
-                        else if (0 == _connectionName[0])
-                        {
-                            std::size_t len = sizeof(_connectionName) > na.length() ? na.length() : sizeof(_connectionName) - 1;
-                            std::memcpy(_connectionName, na.c_str(), len);
-                        }
-
-                        if (Utility::isError(SQLGetDiagField(
-                                handleType, _handle, count, SQL_DIAG_SERVER_NAME, _serverName, sizeof(_serverName), &messageLength)))
-                        {
-                            std::size_t len = sizeof(_serverName) > none.length() ? none.length() : sizeof(_serverName) - 1;
-                            std::memcpy(_serverName, none.c_str(), len);
-                        }
-                        else if (0 == _serverName[0])
-                        {
-                            std::size_t len = sizeof(_serverName) > na.length() ? na.length() : sizeof(_serverName) - 1;
-                            std::memcpy(_serverName, na.c_str(), len);
-                        }
-                    }
-
-                    _fields.push_back(df);
-
-                    std::memset(df._sqlState, 0, SQL_STATE_SIZE);
-                    std::memset(df._message, 0, SQL_MESSAGE_LENGTH);
-                    df._nativeError = 0;
-
-                    ++count;
-                }
-
-                return *this;
-            }
-
-        private:
-            Diagnostics();
-
-            /// SQLGetDiagField fields
-            SQLCHAR _connectionName[SQL_NAME_LENGTH];
-            SQLCHAR _serverName[SQL_NAME_LENGTH];
-
-            /// Diagnostics container
-            FieldVec _fields;
-
-            /// Context handle
-            const H & _handle;
-        };
-
-
-        typedef Diagnostics<SQLHENV, SQL_HANDLE_ENV> EnvironmentDiagnostics;
-        typedef Diagnostics<SQLHDBC, SQL_HANDLE_DBC> ConnectionDiagnostics;
-        typedef Diagnostics<SQLHSTMT, SQL_HANDLE_STMT> StatementDiagnostics;
-        typedef Diagnostics<SQLHDESC, SQL_HANDLE_DESC> DescriptorDiagnostics;
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h
deleted file mode 100644
index adf567e41..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// EnvironmentHandle.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  EnvironmentHandle
-//
-// Definition of EnvironmentHandle.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_EnvironmentHandle_INCLUDED
-#define Data_ODBC_EnvironmentHandle_INCLUDED
-
-
-#include "Poco/Data/ODBC/ODBC.h"
-#include <sqltypes.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        class ODBC_API EnvironmentHandle
-        /// ODBC environment handle class
-        {
-        public:
-            EnvironmentHandle();
-            /// Creates the EnvironmentHandle.
-
-            ~EnvironmentHandle();
-            /// Destroys the EnvironmentHandle.
-
-            operator const SQLHENV &() const;
-            /// Const conversion operator into reference to native type.
-
-            const SQLHENV & handle() const;
-            /// Returns const reference to handle.
-
-        private:
-            operator SQLHENV &();
-            /// Conversion operator into reference to native type.
-
-            SQLHENV & handle();
-            /// Returns reference to handle.
-
-            EnvironmentHandle(const EnvironmentHandle &);
-            const EnvironmentHandle & operator=(const EnvironmentHandle &);
-
-            SQLHENV _henv;
-            bool _isOwner;
-        };
-
-
-        ///
-        /// inlines
-        ///
-        inline EnvironmentHandle::operator const SQLHENV &() const
-        {
-            return handle();
-        }
-
-
-        inline const SQLHENV & EnvironmentHandle::handle() const
-        {
-            return _henv;
-        }
-
-
-        inline EnvironmentHandle::operator SQLHENV &()
-        {
-            return handle();
-        }
-
-
-        inline SQLHENV & EnvironmentHandle::handle()
-        {
-            return _henv;
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Error.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Error.h
deleted file mode 100644
index dcded9f21..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Error.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Error.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Error
-//
-// Definition of Error.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Error_INCLUDED
-#define Data_ODBC_Error_INCLUDED
-
-
-#include <vector>
-#include "Poco/Data/ODBC/Diagnostics.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Format.h"
-#include <sqlext.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        template <typename H, SQLSMALLINT handleType>
-        class Error
-        /// Class encapsulating ODBC diagnostic record collection. Collection is generated
-        /// during construction. Class provides access and string generation for the collection
-        /// as well as individual diagnostic records.
-        {
-        public:
-            explicit Error(const H & handle) : _diagnostics(handle)
-            /// Creates the Error.
-            {
-            }
-
-            ~Error()
-            /// Destroys the Error.
-            {
-            }
-
-            const Diagnostics<H, handleType> & diagnostics() const
-            /// Returns the associated diagnostics.
-            {
-                return _diagnostics;
-            }
-
-            int count() const
-            /// Returns the count of diagnostic records.
-            {
-                return (int)_diagnostics.count();
-            }
-
-            std::string & toString(int index, std::string & str) const
-            /// Generates the string for the diagnostic record.
-            {
-                if ((index < 0) || (index > (count() - 1)))
-                    return str;
-
-                std::string s;
-                Poco::format(
-                    s,
-                    "===========================\n"
-                    "ODBC Diagnostic record #%d:\n"
-                    "===========================\n"
-                    "SQLSTATE = %s\nNative Error Code = %ld\n%s\n\n",
-                    index + 1,
-                    _diagnostics.sqlState(index),
-                    _diagnostics.nativeError(index),
-                    _diagnostics.message(index));
-
-                str.append(s);
-
-                return str;
-            }
-
-            std::string toString() const
-            /// Generates the string for the diagnostic record collection.
-            {
-                std::string str;
-
-                Poco::format(str, "Connection:%s\nServer:%s\n", _diagnostics.connectionName(), _diagnostics.serverName());
-
-                std::string s;
-                for (int i = 0; i < count(); ++i)
-                {
-                    s.clear();
-                    str.append(toString(i, s));
-                }
-
-                return str;
-            }
-
-        private:
-            Error();
-
-            Diagnostics<H, handleType> _diagnostics;
-        };
-
-
-        typedef Error<SQLHENV, SQL_HANDLE_ENV> EnvironmentError;
-        typedef Error<SQLHDBC, SQL_HANDLE_DBC> ConnectionError;
-        typedef Error<SQLHSTMT, SQL_HANDLE_STMT> StatementError;
-        typedef Error<SQLHSTMT, SQL_HANDLE_DESC> DescriptorError;
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Extractor.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
deleted file mode 100644
index 3914f33df..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
+++ /dev/null
@@ -1,748 +0,0 @@
-//
-// Extractor.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Extractor
-//
-// Definition of the Extractor class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Extractor_INCLUDED
-#define Data_ODBC_Extractor_INCLUDED
-
-
-#include <map>
-#include "Poco/Any.h"
-#include "Poco/Data/AbstractExtractor.h"
-#include "Poco/Data/Constants.h"
-#include "Poco/Data/Date.h"
-#include "Poco/Data/ODBC/Error.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/ODBCMetaColumn.h"
-#include "Poco/Data/ODBC/Preparator.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Data/Time.h"
-#include "Poco/DateTime.h"
-#include "Poco/Dynamic/Var.h"
-#include "Poco/Exception.h"
-#include "Poco/Nullable.h"
-#include "Poco/UTFString.h"
-#include <sqltypes.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        class ODBC_API Extractor : public Poco::Data::AbstractExtractor
-        /// Extracts and converts data values from the result row returned by ODBC.
-        /// If NULL is received, the incoming val value is not changed and false is returned
-        {
-        public:
-            typedef Preparator::Ptr PreparatorPtr;
-
-            Extractor(const StatementHandle & rStmt, Preparator::Ptr pPreparator);
-            /// Creates the Extractor.
-
-            ~Extractor();
-            /// Destroys the Extractor.
-
-            bool extract(std::size_t pos, Poco::Int8 & val);
-            /// Extracts an Int8.
-
-            bool extract(std::size_t pos, std::vector<Poco::Int8> & val);
-            /// Extracts an Int8 vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::Int8> & val);
-            /// Extracts an Int8 deque.
-
-            bool extract(std::size_t pos, std::list<Poco::Int8> & val);
-            /// Extracts an Int8 list.
-
-            bool extract(std::size_t pos, Poco::UInt8 & val);
-            /// Extracts an UInt8.
-
-            bool extract(std::size_t pos, std::vector<Poco::UInt8> & val);
-            /// Extracts an UInt8 vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::UInt8> & val);
-            /// Extracts an UInt8 deque.
-
-            bool extract(std::size_t pos, std::list<Poco::UInt8> & val);
-            /// Extracts an UInt8 list.
-
-            bool extract(std::size_t pos, Poco::Int16 & val);
-            /// Extracts an Int16.
-
-            bool extract(std::size_t pos, std::vector<Poco::Int16> & val);
-            /// Extracts an Int16 vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::Int16> & val);
-            /// Extracts an Int16 deque.
-
-            bool extract(std::size_t pos, std::list<Poco::Int16> & val);
-            /// Extracts an Int16 list.
-
-            bool extract(std::size_t pos, Poco::UInt16 & val);
-            /// Extracts an UInt16.
-
-            bool extract(std::size_t pos, std::vector<Poco::UInt16> & val);
-            /// Extracts an UInt16 vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::UInt16> & val);
-            /// Extracts an UInt16 deque.
-
-            bool extract(std::size_t pos, std::list<Poco::UInt16> & val);
-            /// Extracts an UInt16 list.
-
-            bool extract(std::size_t pos, Poco::Int32 & val);
-            /// Extracts an Int32.
-
-            bool extract(std::size_t pos, std::vector<Poco::Int32> & val);
-            /// Extracts an Int32 vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::Int32> & val);
-            /// Extracts an Int32 deque.
-
-            bool extract(std::size_t pos, std::list<Poco::Int32> & val);
-            /// Extracts an Int32 list.
-
-            bool extract(std::size_t pos, Poco::UInt32 & val);
-            /// Extracts an UInt32.
-
-            bool extract(std::size_t pos, std::vector<Poco::UInt32> & val);
-            /// Extracts an UInt32 vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::UInt32> & val);
-            /// Extracts an UInt32 deque.
-
-            bool extract(std::size_t pos, std::list<Poco::UInt32> & val);
-            /// Extracts an UInt32 list.
-
-            bool extract(std::size_t pos, Poco::Int64 & val);
-            /// Extracts an Int64.
-
-            bool extract(std::size_t pos, std::vector<Poco::Int64> & val);
-            /// Extracts an Int64 vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::Int64> & val);
-            /// Extracts an Int64 deque.
-
-            bool extract(std::size_t pos, std::list<Poco::Int64> & val);
-            /// Extracts an Int64 list.
-
-            bool extract(std::size_t pos, Poco::UInt64 & val);
-            /// Extracts an UInt64.
-
-            bool extract(std::size_t pos, std::vector<Poco::UInt64> & val);
-            /// Extracts an UInt64 vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::UInt64> & val);
-            /// Extracts an UInt64 deque.
-
-            bool extract(std::size_t pos, std::list<Poco::UInt64> & val);
-            /// Extracts an UInt64 list.
-
-#ifndef POCO_LONG_IS_64_BIT
-            bool extract(std::size_t pos, long & val);
-            /// Extracts a long.
-
-            bool extract(std::size_t pos, unsigned long & val);
-            /// Extracts an unsigned long.
-
-            bool extract(std::size_t pos, std::vector<long> & val);
-            /// Extracts a long vector.
-
-            bool extract(std::size_t pos, std::deque<long> & val);
-            /// Extracts a long deque.
-
-            bool extract(std::size_t pos, std::list<long> & val);
-            /// Extracts a long list.
-#endif
-
-            bool extract(std::size_t pos, bool & val);
-            /// Extracts a boolean.
-
-            bool extract(std::size_t pos, std::vector<bool> & val);
-            /// Extracts a boolean vector.
-
-            bool extract(std::size_t pos, std::deque<bool> & val);
-            /// Extracts a boolean deque.
-
-            bool extract(std::size_t pos, std::list<bool> & val);
-            /// Extracts a boolean list.
-
-            bool extract(std::size_t pos, float & val);
-            /// Extracts a float.
-
-            bool extract(std::size_t pos, std::vector<float> & val);
-            /// Extracts a float vector.
-
-            bool extract(std::size_t pos, std::deque<float> & val);
-            /// Extracts a float deque.
-
-            bool extract(std::size_t pos, std::list<float> & val);
-            /// Extracts a float list.
-
-            bool extract(std::size_t pos, double & val);
-            /// Extracts a double.
-
-            bool extract(std::size_t pos, std::vector<double> & val);
-            /// Extracts a double vector.
-
-            bool extract(std::size_t pos, std::deque<double> & val);
-            /// Extracts a double deque.
-
-            bool extract(std::size_t pos, std::list<double> & val);
-            /// Extracts a double list.
-
-            bool extract(std::size_t pos, char & val);
-            /// Extracts a single character.
-
-            bool extract(std::size_t pos, std::vector<char> & val);
-            /// Extracts a single character vector.
-
-            bool extract(std::size_t pos, std::deque<char> & val);
-            /// Extracts a single character deque.
-
-            bool extract(std::size_t pos, std::list<char> & val);
-            /// Extracts a single character list.
-
-            bool extract(std::size_t pos, std::string & val);
-            /// Extracts a string.
-
-            bool extract(std::size_t pos, std::vector<std::string> & val);
-            /// Extracts a string vector.
-
-            bool extract(std::size_t pos, std::deque<std::string> & val);
-            /// Extracts a string deque.
-
-            bool extract(std::size_t pos, std::list<std::string> & val);
-            /// Extracts a string list.
-            /// Extracts a single character list.
-
-            bool extract(std::size_t pos, UTF16String & val);
-            /// Extracts a string.
-
-            bool extract(std::size_t pos, std::vector<UTF16String> & val);
-            /// Extracts a string vector.
-
-            bool extract(std::size_t pos, std::deque<UTF16String> & val);
-            /// Extracts a string deque.
-
-            bool extract(std::size_t pos, std::list<UTF16String> & val);
-            /// Extracts a string list.
-
-            bool extract(std::size_t pos, Poco::Data::BLOB & val);
-            /// Extracts a BLOB.
-
-            bool extract(std::size_t pos, Poco::Data::CLOB & val);
-            /// Extracts a CLOB.
-
-            bool extract(std::size_t pos, std::vector<Poco::Data::BLOB> & val);
-            /// Extracts a BLOB vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::Data::BLOB> & val);
-            /// Extracts a BLOB deque.
-
-            bool extract(std::size_t pos, std::list<Poco::Data::BLOB> & val);
-            /// Extracts a BLOB list.
-
-            bool extract(std::size_t pos, std::vector<Poco::Data::CLOB> & val);
-            /// Extracts a CLOB vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::Data::CLOB> & val);
-            /// Extracts a CLOB deque.
-
-            bool extract(std::size_t pos, std::list<Poco::Data::CLOB> & val);
-            /// Extracts a CLOB list.
-
-            bool extract(std::size_t pos, Poco::Data::Date & val);
-            /// Extracts a Date.
-
-            bool extract(std::size_t pos, std::vector<Poco::Data::Date> & val);
-            /// Extracts a Date vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::Data::Date> & val);
-            /// Extracts a Date deque.
-
-            bool extract(std::size_t pos, std::list<Poco::Data::Date> & val);
-            /// Extracts a Date list.
-
-            bool extract(std::size_t pos, Poco::Data::Time & val);
-            /// Extracts a Time.
-
-            bool extract(std::size_t pos, std::vector<Poco::Data::Time> & val);
-            /// Extracts a Time vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::Data::Time> & val);
-            /// Extracts a Time deque.
-
-            bool extract(std::size_t pos, std::list<Poco::Data::Time> & val);
-            /// Extracts a Time list.
-
-            bool extract(std::size_t pos, Poco::DateTime & val);
-            /// Extracts a DateTime.
-
-            bool extract(std::size_t pos, std::vector<Poco::DateTime> & val);
-            /// Extracts a DateTime vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::DateTime> & val);
-            /// Extracts a DateTime deque.
-
-            bool extract(std::size_t pos, std::list<Poco::DateTime> & val);
-            /// Extracts a DateTime list.
-
-            bool extract(std::size_t pos, Poco::Any & val);
-            /// Extracts an Any.
-
-            bool extract(std::size_t pos, std::vector<Poco::Any> & val);
-            /// Extracts an Any vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::Any> & val);
-            /// Extracts an Any deque.
-
-            bool extract(std::size_t pos, std::list<Poco::Any> & val);
-            /// Extracts an Any list.
-
-            bool extract(std::size_t pos, Poco::DynamicAny & val);
-            /// Extracts a DynamicAny.
-
-            bool extract(std::size_t pos, std::vector<Poco::DynamicAny> & val);
-            /// Extracts a DynamicAny vector.
-
-            bool extract(std::size_t pos, std::deque<Poco::DynamicAny> & val);
-            /// Extracts a DynamicAny deque.
-
-            bool extract(std::size_t pos, std::list<Poco::DynamicAny> & val);
-            /// Extracts a DynamicAny list.
-
-            void setDataExtraction(Preparator::DataExtraction ext);
-            /// Set data extraction mode.
-
-            Preparator::DataExtraction getDataExtraction() const;
-            /// Returns data extraction mode.
-
-            bool isNull(std::size_t col, std::size_t row = POCO_DATA_INVALID_ROW);
-            /// Returns true if the value at [col,row] is null.
-
-            void reset();
-            /// Resets the internally cached length indicators.
-
-        private:
-            static const int CHUNK_SIZE = 1024;
-            /// Amount of data retrieved in one SQLGetData() request when doing manual extract.
-
-            static const std::string FLD_SIZE_EXCEEDED_FMT;
-            /// String format for the exception message when the field size is exceeded.
-
-            void checkDataSize(std::size_t size);
-            /// This check is only performed for bound data
-            /// retrieval from variable length columns.
-            /// The reason for this check is to ensure we can
-            /// accept the value ODBC driver is supplying
-            /// (i.e. the bound buffer is large enough to receive
-            /// the returned value)
-
-            void resizeLengths(std::size_t pos);
-            /// Resizes the vector holding extracted data lengths to the
-            /// appropriate size.
-
-            template <typename T>
-            bool extractBoundImpl(std::size_t pos, T & val)
-            {
-                if (isNull(pos))
-                    return false;
-                poco_assert_dbg(typeid(T) == _pPreparator->at(pos).type());
-                val = *AnyCast<T>(&_pPreparator->at(pos));
-                return true;
-            }
-
-            bool extractBoundImpl(std::size_t pos, Poco::Data::BLOB & val);
-            bool extractBoundImpl(std::size_t pos, Poco::Data::CLOB & val);
-
-            template <typename C>
-            bool extractBoundImplContainer(std::size_t pos, C & val)
-            {
-                typedef typename C::value_type Type;
-                poco_assert_dbg(typeid(std::vector<Type>) == _pPreparator->at(pos).type());
-                std::vector<Type> & v = RefAnyCast<std::vector<Type>>(_pPreparator->at(pos));
-                val.assign(v.begin(), v.end());
-                return true;
-            }
-
-            bool extractBoundImplContainer(std::size_t pos, std::vector<std::string> & values);
-            bool extractBoundImplContainer(std::size_t pos, std::deque<std::string> & values);
-            bool extractBoundImplContainer(std::size_t pos, std::list<std::string> & values);
-            bool extractBoundImplContainer(std::size_t pos, std::vector<Poco::UTF16String> & values);
-            bool extractBoundImplContainer(std::size_t pos, std::deque<Poco::UTF16String> & values);
-            bool extractBoundImplContainer(std::size_t pos, std::list<Poco::UTF16String> & values);
-            bool extractBoundImplContainer(std::size_t pos, std::vector<Poco::Data::CLOB> & values);
-            bool extractBoundImplContainer(std::size_t pos, std::deque<Poco::Data::CLOB> & values);
-            bool extractBoundImplContainer(std::size_t pos, std::list<Poco::Data::CLOB> & values);
-            bool extractBoundImplContainer(std::size_t pos, std::vector<Poco::Data::BLOB> & values);
-            bool extractBoundImplContainer(std::size_t pos, std::deque<Poco::Data::BLOB> & values);
-            bool extractBoundImplContainer(std::size_t pos, std::list<Poco::Data::BLOB> & values);
-
-            template <typename C>
-            bool extractBoundImplContainerString(std::size_t pos, C & values)
-            {
-                typedef typename C::value_type StringType;
-                typedef typename C::iterator ItType;
-                typedef typename StringType::value_type CharType;
-
-                CharType ** pc = AnyCast<CharType *>(&(_pPreparator->at(pos)));
-                poco_assert_dbg(pc);
-                poco_assert_dbg(_pPreparator->bulkSize() == values.size());
-                std::size_t colWidth = columnSize(pos);
-                ItType it = values.begin();
-                ItType end = values.end();
-                for (int row = 0; it != end; ++it, ++row)
-                {
-                    it->assign(*pc + row * colWidth / sizeof(CharType), _pPreparator->actualDataSize(pos, row));
-                    // clean up superfluous null chars returned by some drivers
-                    typename StringType::size_type trimLen = 0;
-                    typename StringType::reverse_iterator sIt = it->rbegin();
-                    typename StringType::reverse_iterator sEnd = it->rend();
-                    for (; sIt != sEnd; ++sIt)
-                    {
-                        if (*sIt == '\0')
-                            ++trimLen;
-                        else
-                            break;
-                    }
-                    if (trimLen)
-                        it->assign(it->begin(), it->begin() + it->length() - trimLen);
-                }
-
-                return true;
-            }
-
-            template <typename C>
-            bool extractBoundImplContainerLOB(std::size_t pos, C & values)
-            {
-                typedef typename C::value_type LOBType;
-                typedef typename LOBType::ValueType CharType;
-                typedef typename C::iterator ItType;
-
-                CharType ** pc = AnyCast<CharType *>(&(_pPreparator->at(pos)));
-                poco_assert_dbg(pc);
-                poco_assert_dbg(_pPreparator->bulkSize() == values.size());
-                std::size_t colWidth = _pPreparator->maxDataSize(pos);
-                ItType it = values.begin();
-                ItType end = values.end();
-                for (int row = 0; it != end; ++it, ++row)
-                    it->assignRaw(*pc + row * colWidth, _pPreparator->actualDataSize(pos, row));
-
-                return true;
-            }
-
-            template <typename T>
-            bool extractBoundImplLOB(std::size_t pos, Poco::Data::LOB<T> & val)
-            {
-                if (isNull(pos))
-                    return false;
-
-                std::size_t dataSize = _pPreparator->actualDataSize(pos);
-                checkDataSize(dataSize);
-                T * sp = AnyCast<T *>(_pPreparator->at(pos));
-                val.assignRaw(sp, dataSize);
-
-                return true;
-            }
-
-            template <typename T>
-            bool extractManualImpl(std::size_t pos, T & val, SQLSMALLINT cType)
-            {
-                SQLRETURN rc = 0;
-                T value;
-
-                resizeLengths(pos);
-
-                rc = SQLGetData(
-                    _rStmt,
-                    (SQLUSMALLINT)pos + 1,
-                    cType, //C data type
-                    &value, //returned value
-                    0, //buffer length (ignored)
-                    &_lengths[pos]); //length indicator
-
-                if (Utility::isError(rc))
-                    throw StatementException(_rStmt, "SQLGetData()");
-
-                if (isNullLengthIndicator(_lengths[pos]))
-                    return false;
-                else
-                {
-                    //for fixed-length data, buffer must be large enough
-                    //otherwise, driver may write past the end
-                    poco_assert_dbg(_lengths[pos] <= sizeof(T));
-                    val = value;
-                }
-
-                return true;
-            }
-
-            template <typename T, typename NT>
-            bool extAny(std::size_t pos, T & val)
-            {
-                NT i;
-                if (extract(pos, i))
-                {
-                    val = i;
-                    return true;
-                }
-                else
-                {
-                    val = Nullable<NT>();
-                    return false;
-                }
-            }
-
-            template <typename T>
-            bool extractImpl(std::size_t pos, T & val)
-            /// Utility function for extraction of Any and DynamicAny.
-            {
-                ODBCMetaColumn column(_rStmt, pos);
-
-                switch (column.type())
-                {
-                    case MetaColumn::FDT_INT8: {
-                        return extAny<T, Poco::Int8>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_UINT8: {
-                        return extAny<T, Poco::UInt8>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_INT16: {
-                        return extAny<T, Poco::Int16>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_UINT16: {
-                        return extAny<T, Poco::UInt16>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_INT32: {
-                        return extAny<T, Poco::Int32>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_UINT32: {
-                        return extAny<T, Poco::UInt32>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_INT64: {
-                        return extAny<T, Poco::Int64>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_UINT64: {
-                        return extAny<T, Poco::UInt64>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_BOOL: {
-                        return extAny<T, bool>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_FLOAT: {
-                        return extAny<T, float>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_DOUBLE: {
-                        return extAny<T, double>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_STRING: {
-                        return extAny<T, std::string>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_WSTRING: {
-                        return extAny<T, Poco::UTF16String>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_BLOB: {
-                        return extAny<T, Poco::Data::BLOB>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_CLOB: {
-                        return extAny<T, Poco::Data::CLOB>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_DATE: {
-                        return extAny<T, Poco::Data::Date>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_TIME: {
-                        return extAny<T, Poco::Data::Time>(pos, val);
-                    }
-
-                    case MetaColumn::FDT_TIMESTAMP: {
-                        return extAny<T, Poco::DateTime>(pos, val);
-                    }
-
-                    default:
-                        throw DataFormatException("Unsupported data type.");
-                }
-
-                return false;
-            }
-
-            bool isNullLengthIndicator(SQLLEN val) const;
-            /// The reason for this utility wrapper are platforms where
-            /// SQLLEN macro (a.k.a. SQLINTEGER) yields 64-bit value,
-            /// while SQL_NULL_DATA (#define'd as -1 literal) remains 32-bit.
-
-            SQLINTEGER columnSize(std::size_t pos) const;
-
-            const StatementHandle & _rStmt;
-            PreparatorPtr _pPreparator;
-            Preparator::DataExtraction _dataExtraction;
-            std::vector<SQLLEN> _lengths;
-        };
-
-
-        ///
-        /// inlines
-        ///
-
-        inline bool Extractor::extractBoundImpl(std::size_t pos, Poco::Data::BLOB & val)
-        {
-            return extractBoundImplLOB<BLOB::ValueType>(pos, val);
-        }
-
-
-        inline bool Extractor::extractBoundImpl(std::size_t pos, Poco::Data::CLOB & val)
-        {
-            return extractBoundImplLOB<CLOB::ValueType>(pos, val);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::vector<std::string> & values)
-        {
-            return extractBoundImplContainerString(pos, values);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::deque<std::string> & values)
-        {
-            return extractBoundImplContainerString(pos, values);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::list<std::string> & values)
-        {
-            return extractBoundImplContainerString(pos, values);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::vector<Poco::UTF16String> & values)
-        {
-            return extractBoundImplContainerString(pos, values);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::deque<Poco::UTF16String> & values)
-        {
-            return extractBoundImplContainerString(pos, values);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::list<Poco::UTF16String> & values)
-        {
-            return extractBoundImplContainerString(pos, values);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::vector<Poco::Data::CLOB> & values)
-        {
-            return extractBoundImplContainerLOB(pos, values);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::deque<Poco::Data::CLOB> & values)
-        {
-            return extractBoundImplContainerLOB(pos, values);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::list<Poco::Data::CLOB> & values)
-        {
-            return extractBoundImplContainerLOB(pos, values);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::vector<Poco::Data::BLOB> & values)
-        {
-            return extractBoundImplContainerLOB(pos, values);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::deque<Poco::Data::BLOB> & values)
-        {
-            return extractBoundImplContainerLOB(pos, values);
-        }
-
-
-        inline bool Extractor::extractBoundImplContainer(std::size_t pos, std::list<Poco::Data::BLOB> & values)
-        {
-            return extractBoundImplContainerLOB(pos, values);
-        }
-
-
-        inline void Extractor::setDataExtraction(Preparator::DataExtraction ext)
-        {
-            _pPreparator->setDataExtraction(_dataExtraction = ext);
-        }
-
-
-        inline Preparator::DataExtraction Extractor::getDataExtraction() const
-        {
-            return _dataExtraction;
-        }
-
-
-        inline void Extractor::reset()
-        {
-            _lengths.clear();
-        }
-
-
-        inline void Extractor::resizeLengths(std::size_t pos)
-        {
-            if (pos >= _lengths.size())
-                _lengths.resize(pos + 1, (SQLLEN)0);
-        }
-
-
-        inline bool Extractor::isNullLengthIndicator(SQLLEN val) const
-        {
-            return SQL_NULL_DATA == (int)val;
-        }
-
-
-        inline SQLINTEGER Extractor::columnSize(std::size_t pos) const
-        {
-            std::size_t size = ODBCMetaColumn(_rStmt, pos).length();
-            std::size_t maxSize = _pPreparator->maxDataSize(pos);
-            if (size > maxSize)
-                size = maxSize;
-            return (SQLINTEGER)size;
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif // Data_ODBC_Extractor_INCLUDED
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Handle.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Handle.h
deleted file mode 100644
index 0d1cee48f..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Handle.h
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-// Handle.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Handle
-//
-// Definition of Handle.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Handle_INCLUDED
-#define Data_ODBC_Handle_INCLUDED
-
-
-#include "Poco/Data/ODBC/ConnectionHandle.h"
-#include "Poco/Data/ODBC/EnvironmentHandle.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include <sqltypes.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        template <typename H, SQLSMALLINT handleType>
-        class Handle
-        /// ODBC handle class template
-        {
-        public:
-            Handle(const ConnectionHandle & rConnection) : _rConnection(rConnection), _handle(0)
-            /// Creates the Handle.
-            {
-                if (Utility::isError(SQLAllocHandle(handleType, _rConnection, &_handle)))
-                {
-                    throw ODBCException("Could not allocate statement handle.");
-                }
-            }
-
-            ~Handle()
-            /// Destroys the Handle.
-            {
-                try
-                {
-                    SQLRETURN rc = SQLFreeHandle(handleType, _handle);
-                    // N.B. Destructors should not throw, but neither do we want to
-                    // leak resources. So, we throw here in debug mode if things go bad.
-                    poco_assert_dbg(!Utility::isError(rc));
-                }
-                catch (...)
-                {
-                    poco_unexpected();
-                }
-            }
-
-            operator const H &() const
-            /// Const conversion operator into reference to native type.
-            {
-                return handle();
-            }
-
-            const H & handle() const
-            /// Returns const reference to native type.
-            {
-                return _handle;
-            }
-
-        private:
-            Handle(const Handle &);
-            const Handle & operator=(const Handle &);
-
-            operator H &()
-            /// Conversion operator into reference to native type.
-            {
-                return handle();
-            }
-
-            H & handle()
-            /// Returns reference to native type.
-            {
-                return _handle;
-            }
-
-            const ConnectionHandle & _rConnection;
-            H _handle;
-
-            friend class ODBCStatementImpl;
-        };
-
-
-        typedef Handle<SQLHSTMT, SQL_HANDLE_STMT> StatementHandle;
-        typedef Handle<SQLHDESC, SQL_HANDLE_DESC> DescriptorHandle;
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBC.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBC.h
deleted file mode 100644
index 4ae6d3aeb..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBC.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// ODBC.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  ODBC
-//
-// Basic definitions for the Poco ODBC library.
-// This file must be the first file included by every other ODBC
-// header file.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_ODBC_INCLUDED
-#define Data_ODBC_ODBC_INCLUDED
-
-
-#include "Poco/Foundation.h"
-
-
-//
-// The following block is the standard way of creating macros which make exporting
-// from a DLL simpler. All files within this DLL are compiled with the ODBC_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see
-// ODBC_API functions as being imported from a DLL, whereas this DLL sees symbols
-// defined with this macro as being exported.
-//
-
-
-#if !defined(ODBC_API)
-#    if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined(__GNUC__) && (__GNUC__ >= 4)
-#        define ODBC_API __attribute__((visibility("default")))
-#    else
-#        define ODBC_API
-#    endif
-#endif
-
-
-#include "Poco/Data/ODBC/Unicode.h"
-
-
-//
-// Automatically link Data library.
-//
-
-
-#endif // ODBC_ODBC_INCLUDED
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h
deleted file mode 100644
index 3c9fbf822..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// ODBCException.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  ODBCException
-//
-// Definition of ODBCException.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_ODBCException_INCLUDED
-#define Data_ODBC_ODBCException_INCLUDED
-
-
-#include "Poco/Data/DataException.h"
-#include "Poco/Data/ODBC/Diagnostics.h"
-#include "Poco/Data/ODBC/Error.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Format.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        POCO_DECLARE_EXCEPTION(ODBC_API, ODBCException, Poco::Data::DataException)
-        POCO_DECLARE_EXCEPTION(ODBC_API, InsufficientStorageException, ODBCException)
-        POCO_DECLARE_EXCEPTION(ODBC_API, UnknownDataLengthException, ODBCException)
-        POCO_DECLARE_EXCEPTION(ODBC_API, DataTruncatedException, ODBCException)
-
-
-        template <class H, SQLSMALLINT handleType>
-        class HandleException : public ODBCException
-        {
-        public:
-            HandleException(const H & handle) : _error(handle)
-            /// Creates HandleException
-            {
-                message(_error.toString());
-            }
-
-            HandleException(const H & handle, const std::string & msg) : ODBCException(msg), _error(handle)
-            /// Creates HandleException
-            {
-                extendedMessage(_error.toString());
-            }
-
-            HandleException(const H & handle, const std::string & msg, const std::string & arg) : ODBCException(msg, arg), _error(handle)
-            /// Creates HandleException
-            {
-            }
-
-            HandleException(const H & handle, const std::string & msg, const Poco::Exception & exc)
-                : ODBCException(msg, exc), _error(handle)
-            /// Creates HandleException
-            {
-            }
-
-            HandleException(const HandleException & exc) : ODBCException(exc), _error(exc._error)
-            /// Creates HandleException
-            {
-            }
-
-            ~HandleException() throw()
-            /// Destroys HandleException
-            {
-            }
-
-            HandleException & operator=(const HandleException & exc)
-            /// Assignment operator
-            {
-                if (&exc != this)
-                    _error = exc._error;
-
-                return *this;
-            }
-
-            const char * name() const throw()
-            /// Returns the name of the exception
-            {
-                return "ODBC handle exception";
-            }
-
-            const char * className() const throw()
-            /// Returns the HandleException class name.
-            {
-                return typeid(*this).name();
-            }
-
-            Poco::Exception * clone() const
-            /// Clones the HandleException
-            {
-                return new HandleException(*this);
-            }
-
-            void rethrow() const
-            /// Re-throws the HandleException.
-            {
-                throw *this;
-            }
-
-            const Diagnostics<H, handleType> & diagnostics() const
-            /// Returns error diagnostics.
-            {
-                return _error.diagnostics();
-            }
-
-            std::string toString() const
-            /// Returns the formatted error diagnostics for the handle.
-            {
-                return Poco::format("ODBC Error: %s\n===================\n%s\n", std::string(what()), _error.toString());
-            }
-
-            static std::string errorString(const H & handle)
-            /// Returns the error diagnostics string for the handle.
-            {
-                return Error<H, handleType>(handle).toString();
-            }
-
-        private:
-            Error<H, handleType> _error;
-        };
-
-
-        typedef HandleException<SQLHENV, SQL_HANDLE_ENV> EnvironmentException;
-        typedef HandleException<SQLHDBC, SQL_HANDLE_DBC> ConnectionException;
-        typedef HandleException<SQLHSTMT, SQL_HANDLE_STMT> StatementException;
-        typedef HandleException<SQLHDESC, SQL_HANDLE_DESC> DescriptorException;
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
deleted file mode 100644
index 4783427fe..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// ODBCMetaColumn.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  ODBCMetaColumn
-//
-// Definition of ODBCMetaColumn.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_ODBCColumn_INCLUDED
-#define Data_ODBC_ODBCColumn_INCLUDED
-
-
-#include "Poco/Data/MetaColumn.h"
-#include "Poco/Data/ODBC/Error.h"
-#include "Poco/Data/ODBC/Handle.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-#include <sqlext.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        class ODBC_API ODBCMetaColumn : public MetaColumn
-        {
-        public:
-            explicit ODBCMetaColumn(const StatementHandle & rStmt, std::size_t position);
-            /// Creates the ODBCMetaColumn.
-
-            ~ODBCMetaColumn();
-            /// Destroys the ODBCMetaColumn.
-
-            std::size_t dataLength() const;
-            /// A numeric value that is either the maximum or actual character length of a character
-            /// string or binary data type. It is the maximum character length for a fixed-length data type,
-            /// or the actual character length for a variable-length data type. Its value always excludes the
-            /// null-termination byte that ends the character string.
-            /// This information is returned from the SQL_DESC_LENGTH record field of the IRD.
-
-            bool isUnsigned() const;
-            /// Returns true if column is unsigned or a non-numeric data type.
-
-        private:
-            ODBCMetaColumn();
-
-            static const int NAME_BUFFER_LENGTH = 2048;
-
-            struct ColumnDescription
-            {
-                SQLCHAR name[NAME_BUFFER_LENGTH];
-                SQLSMALLINT nameBufferLength;
-                SQLSMALLINT dataType;
-                SQLULEN size;
-                SQLSMALLINT decimalDigits;
-                SQLSMALLINT isNullable;
-            };
-
-            void init();
-            void getDescription();
-
-            SQLLEN _dataLength;
-            const StatementHandle & _rStmt;
-            ColumnDescription _columnDesc;
-        };
-
-
-        ///
-        /// inlines
-        ///
-        inline std::size_t ODBCMetaColumn::dataLength() const
-        {
-            return _dataLength;
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
deleted file mode 100644
index e50228a6d..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
+++ /dev/null
@@ -1,208 +0,0 @@
-//
-// ODBCStatementImpl.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  ODBCStatementImpl
-//
-// Definition of the ODBCStatementImpl class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_ODBCStatementImpl_INCLUDED
-#define Data_ODBC_ODBCStatementImpl_INCLUDED
-
-
-#include <sstream>
-#include "Poco/Data/Column.h"
-#include "Poco/Data/ODBC/Binder.h"
-#include "Poco/Data/ODBC/Extractor.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/ODBCMetaColumn.h"
-#include "Poco/Data/ODBC/Preparator.h"
-#include "Poco/Data/ODBC/SessionImpl.h"
-#include "Poco/Data/StatementImpl.h"
-#include "Poco/Format.h"
-#include "Poco/SharedPtr.h"
-#include <sqltypes.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        class ODBC_API ODBCStatementImpl : public Poco::Data::StatementImpl
-        /// Implements statement functionality needed for ODBC
-        {
-        public:
-            ODBCStatementImpl(SessionImpl & rSession);
-            /// Creates the ODBCStatementImpl.
-
-            ~ODBCStatementImpl();
-            /// Destroys the ODBCStatementImpl.
-
-        protected:
-            std::size_t columnsReturned() const;
-            /// Returns number of columns returned by query.
-
-            int affectedRowCount() const;
-            /// Returns the number of affected rows.
-            /// Used to find out the number of rows affected by insert or update.
-
-            const MetaColumn & metaColumn(std::size_t pos) const;
-            /// Returns column meta data.
-
-            bool hasNext();
-            /// Returns true if a call to next() will return data.
-
-            std::size_t next();
-            /// Retrieves the next row or set of rows from the resultset.
-            /// Returns the number of rows retrieved.
-            /// Will throw, if the resultset is empty.
-
-            bool canBind() const;
-            /// Returns true if a valid statement is set and we can bind.
-
-            bool canCompile() const;
-            /// Returns true if another compile is possible.
-
-            void compileImpl();
-            /// Compiles the statement, doesn't bind yet.
-            /// Does nothing if the statement has already been compiled.
-
-            void bindImpl();
-            /// Binds all parameters and executes the statement.
-
-            AbstractExtraction::ExtractorPtr extractor();
-            /// Returns the concrete extractor used by the statement.
-
-            AbstractBinding::BinderPtr binder();
-            /// Returns the concrete binder used by the statement.
-
-            std::string nativeSQL();
-            /// Returns the SQL string as modified by the driver.
-
-        private:
-            typedef Poco::Data::AbstractBindingVec Bindings;
-            typedef Poco::SharedPtr<Binder> BinderPtr;
-            typedef Poco::Data::AbstractExtractionVec Extractions;
-            typedef Poco::SharedPtr<Preparator> PreparatorPtr;
-            typedef std::vector<PreparatorPtr> PreparatorVec;
-            typedef Poco::SharedPtr<Extractor> ExtractorPtr;
-            typedef std::vector<ExtractorPtr> ExtractorVec;
-            typedef std::vector<ODBCMetaColumn *> ColumnPtrVec;
-            typedef std::vector<ColumnPtrVec> ColumnPtrVecVec;
-
-            static const std::string INVALID_CURSOR_STATE;
-
-            void clear();
-            /// Closes the cursor and resets indicator variables.
-
-            void doBind();
-            /// Binds parameters.
-
-            void makeInternalExtractors();
-            /// Creates internal extractors if none were supplied from the user.
-
-            bool isStoredProcedure() const;
-            /// Returns true if SQL is a stored procedure call.
-
-            void doPrepare();
-            /// Prepares placeholders for data returned by statement.
-            /// It is called during statement compilation for SQL statements
-            /// returning data. For stored procedures returning datasets,
-            /// it is called upon the first check for data availability
-            /// (see hasNext() function).
-
-            bool hasData() const;
-            /// Returns true if statement returns data.
-
-            void makeStep();
-            /// Fetches the next row of data.
-
-            bool nextRowReady() const;
-            /// Returns true if there is a row fetched but not yet extracted.
-
-            void putData();
-            /// Called whenever SQLExecute returns SQL_NEED_DATA. This is expected
-            /// behavior for PB_AT_EXEC binding mode.
-
-            void getData();
-
-            void addPreparator();
-            void fillColumns();
-            void checkError(SQLRETURN rc, const std::string & msg = "");
-
-            const SQLHDBC & _rConnection;
-            const StatementHandle _stmt;
-            PreparatorVec _preparations;
-            BinderPtr _pBinder;
-            ExtractorVec _extractors;
-            bool _stepCalled;
-            int _nextResponse;
-            ColumnPtrVecVec _columnPtrs;
-            bool _prepared;
-            mutable std::size_t _affectedRowCount;
-            bool _canCompile;
-        };
-
-
-        //
-        // inlines
-        //
-        inline AbstractExtraction::ExtractorPtr ODBCStatementImpl::extractor()
-        {
-            poco_assert_dbg(currentDataSet() < _extractors.size());
-            poco_assert_dbg(_extractors[currentDataSet()]);
-            return _extractors[currentDataSet()];
-        }
-
-
-        inline AbstractBinding::BinderPtr ODBCStatementImpl::binder()
-        {
-            poco_assert_dbg(!_pBinder.isNull());
-            return _pBinder;
-        }
-
-
-        inline std::size_t ODBCStatementImpl::columnsReturned() const
-        {
-            poco_assert_dbg(currentDataSet() < _preparations.size());
-            poco_assert_dbg(_preparations[currentDataSet()]);
-            return static_cast<std::size_t>(_preparations[currentDataSet()]->columns());
-        }
-
-
-        inline bool ODBCStatementImpl::hasData() const
-        {
-            return (columnsReturned() > 0);
-        }
-
-
-        inline bool ODBCStatementImpl::nextRowReady() const
-        {
-            return (!Utility::isError(_nextResponse));
-        }
-
-
-        inline bool ODBCStatementImpl::canCompile() const
-        {
-            return _canCompile;
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif // Data_ODBC_ODBCStatementImpl_INCLUDED
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Parameter.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
deleted file mode 100644
index b5baee3b5..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// Parameter.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Parameter
-//
-// Definition of Parameter.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Parameter_INCLUDED
-#define Data_ODBC_Parameter_INCLUDED
-
-
-#include "Poco/Data/ODBC/Handle.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include <sqlext.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        class ODBC_API Parameter
-        {
-        public:
-            explicit Parameter(const StatementHandle & rStmt, std::size_t colNum);
-            /// Creates the Parameter.
-
-            ~Parameter();
-            /// Destroys the Parameter.
-
-            std::size_t number() const;
-            /// Returns the column number.
-
-            std::size_t dataType() const;
-            /// Returns the SQL data type.
-
-            std::size_t columnSize() const;
-            /// Returns the the size of the column or expression of the corresponding
-            /// parameter marker as defined by the data source.
-
-            std::size_t decimalDigits() const;
-            /// Returns the number of decimal digits of the column or expression
-            /// of the corresponding parameter as defined by the data source.
-
-            bool isNullable() const;
-            /// Returns true if column allows null values, false otherwise.
-
-        private:
-            Parameter();
-
-            void init();
-
-            SQLSMALLINT _dataType;
-            SQLULEN _columnSize;
-            SQLSMALLINT _decimalDigits;
-            SQLSMALLINT _isNullable;
-
-            const StatementHandle & _rStmt;
-            std::size_t _number;
-        };
-
-
-        ///
-        /// inlines
-        ///
-        inline std::size_t Parameter::number() const
-        {
-            return _number;
-        }
-
-
-        inline std::size_t Parameter::dataType() const
-        {
-            return _dataType;
-        }
-
-
-        inline std::size_t Parameter::columnSize() const
-        {
-            return _columnSize;
-        }
-
-
-        inline std::size_t Parameter::decimalDigits() const
-        {
-            return _decimalDigits;
-        }
-
-
-        inline bool Parameter::isNullable() const
-        {
-            return SQL_NULLABLE == _isNullable;
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Preparator.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Preparator.h
deleted file mode 100644
index f92e4ea70..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Preparator.h
+++ /dev/null
@@ -1,1256 +0,0 @@
-//
-// Preparator.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Preparator
-//
-// Definition of the Preparator class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Preparator_INCLUDED
-#define Data_ODBC_Preparator_INCLUDED
-
-
-#include <vector>
-#include "Poco/Any.h"
-#include "Poco/Data/AbstractPreparator.h"
-#include "Poco/Data/Constants.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/Data/ODBC/Handle.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/ODBCMetaColumn.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/DateTime.h"
-#include "Poco/DynamicAny.h"
-#include "Poco/SharedPtr.h"
-#include "Poco/UTFString.h"
-#include <sqlext.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Date;
-    class Time;
-
-
-    namespace ODBC
-    {
-
-
-        class ODBC_API Preparator : public AbstractPreparator
-        /// Class used for database preparation where we first have to register all data types
-        /// with respective memory output locations before extracting data.
-        /// Extraction works in two-phases: first prepare is called once, then extract n-times.
-        /// In ODBC, SQLBindCol/SQLFetch is the preferred method of data retrieval (SQLGetData is available,
-        /// however with numerous driver implementation dependent limitations and inferior performance).
-        /// In order to fit this functionality into Poco DataConnectors framework, every ODBC SQL statement
-        /// instantiates its own Preparator object.
-        /// This is done once per statement execution (from StatementImpl::bindImpl()).
-        ///
-        /// Preparator object is used to :
-        ///
-        ///   1) Prepare SQL statement.
-        ///   2) Provide and contain the memory locations where retrieved values are placed during recordset iteration.
-        ///   3) Keep count of returned number of columns with their respective datatypes and sizes.
-        ///
-        /// Notes:
-        ///
-        /// - Value datatypes in this interface prepare() calls serve only for the purpose of type distinction.
-        /// - Preparator keeps its own std::vector<Any> buffer for fetched data to be later retrieved by Extractor.
-        /// - prepare() methods should not be called when extraction mode is DE_MANUAL
-        ///
-        {
-        public:
-            typedef std::vector<char *> CharArray;
-            typedef SharedPtr<Preparator> Ptr;
-
-            enum DataExtraction
-            {
-                DE_MANUAL,
-                DE_BOUND
-            };
-
-            enum DataType
-            {
-                DT_BOOL,
-                DT_BOOL_ARRAY,
-                DT_CHAR,
-                DT_WCHAR,
-                DT_UCHAR,
-                DT_CHAR_ARRAY,
-                DT_WCHAR_ARRAY,
-                DT_UCHAR_ARRAY,
-                DT_DATE,
-                DT_TIME,
-                DT_DATETIME
-            };
-
-            Preparator(
-                const StatementHandle & rStmt,
-                const std::string & statement,
-                std::size_t maxFieldSize,
-                DataExtraction dataExtraction = DE_BOUND);
-            /// Creates the Preparator.
-
-            Preparator(const Preparator & other);
-            /// Copy constructs the Preparator.
-
-            ~Preparator();
-            /// Destroys the Preparator.
-
-            void prepare(std::size_t pos, const Poco::Int8 & val);
-            /// Prepares an Int8.
-
-            void prepare(std::size_t pos, const std::vector<Poco::Int8> & val);
-            /// Prepares an Int8 vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::Int8> & val);
-            /// Prepares an Int8 deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::Int8> & val);
-            /// Prepares an Int8 list.
-
-            void prepare(std::size_t pos, const Poco::UInt8 & val);
-            /// Prepares an UInt8.
-
-            void prepare(std::size_t pos, const std::vector<Poco::UInt8> & val);
-            /// Prepares an UInt8 vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::UInt8> & val);
-            /// Prepares an UInt8 deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::UInt8> & val);
-            /// Prepares an UInt8 list.
-
-            void prepare(std::size_t pos, const Poco::Int16 & val);
-            /// Prepares an Int16.
-
-            void prepare(std::size_t pos, const std::vector<Poco::Int16> & val);
-            /// Prepares an Int16 vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::Int16> & val);
-            /// Prepares an Int16 deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::Int16> & val);
-            /// Prepares an Int16 list.
-
-            void prepare(std::size_t pos, const Poco::UInt16 & val);
-            /// Prepares an UInt16.
-
-            void prepare(std::size_t pos, const std::vector<Poco::UInt16> & val);
-            /// Prepares an UInt16 vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::UInt16> & val);
-            /// Prepares an UInt16 deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::UInt16> & val);
-            /// Prepares an UInt16 list.
-
-            void prepare(std::size_t pos, const Poco::Int32 & val);
-            /// Prepares an Int32.
-
-            void prepare(std::size_t pos, const std::vector<Poco::Int32> & val);
-            /// Prepares an Int32 vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::Int32> & val);
-            /// Prepares an Int32 deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::Int32> & val);
-            /// Prepares an Int32 list.
-
-            void prepare(std::size_t pos, const Poco::UInt32 & val);
-            /// Prepares an UInt32.
-
-            void prepare(std::size_t pos, const std::vector<Poco::UInt32> & val);
-            /// Prepares an UInt32 vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::UInt32> & val);
-            /// Prepares an UInt32 deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::UInt32> & val);
-            /// Prepares an UInt32 list.
-
-            void prepare(std::size_t pos, const Poco::Int64 & val);
-            /// Prepares an Int64.
-
-            void prepare(std::size_t pos, const std::vector<Poco::Int64> & val);
-            /// Prepares an Int64 vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::Int64> & val);
-            /// Prepares an Int64 deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::Int64> & val);
-            /// Prepares an Int64 list.
-
-            void prepare(std::size_t pos, const Poco::UInt64 & val);
-            /// Prepares an UInt64.
-
-            void prepare(std::size_t pos, const std::vector<Poco::UInt64> & val);
-            /// Prepares an UInt64 vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::UInt64> & val);
-            /// Prepares an UInt64 deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::UInt64> & val);
-            /// Prepares an UInt64 list.
-
-#ifndef POCO_LONG_IS_64_BIT
-            void prepare(std::size_t pos, const long & val);
-            /// Prepares a long.
-
-            void prepare(std::size_t pos, const unsigned long & val);
-            /// Prepares an unsigned long.
-
-            void prepare(std::size_t pos, const std::vector<long> & val);
-            /// Prepares a long vector.
-
-            void prepare(std::size_t pos, const std::deque<long> & val);
-            /// Prepares a long deque.
-
-            void prepare(std::size_t pos, const std::list<long> & val);
-            /// Prepares a long list.
-#endif
-
-            void prepare(std::size_t pos, const bool & val);
-            /// Prepares a boolean.
-
-            void prepare(std::size_t pos, const std::vector<bool> & val);
-            /// Prepares a boolean vector.
-
-            void prepare(std::size_t pos, const std::deque<bool> & val);
-            /// Prepares a boolean deque.
-
-            void prepare(std::size_t pos, const std::list<bool> & val);
-            /// Prepares a boolean list.
-
-            void prepare(std::size_t pos, const float & val);
-            /// Prepares a float.
-
-            void prepare(std::size_t pos, const std::vector<float> & val);
-            /// Prepares a float vector.
-
-            void prepare(std::size_t pos, const std::deque<float> & val);
-            /// Prepares a float deque.
-
-            void prepare(std::size_t pos, const std::list<float> & val);
-            /// Prepares a float list.
-
-            void prepare(std::size_t pos, const double & val);
-            /// Prepares a double.
-
-            void prepare(std::size_t pos, const std::vector<double> & val);
-            /// Prepares a double vector.
-
-            void prepare(std::size_t pos, const std::deque<double> & val);
-            /// Prepares a double deque.
-
-            void prepare(std::size_t pos, const std::list<double> & val);
-            /// Prepares a double list.
-
-            void prepare(std::size_t pos, const char & val);
-            /// Prepares a single character.
-
-            void prepare(std::size_t pos, const std::vector<char> & val);
-            /// Prepares a single character vector.
-
-            void prepare(std::size_t pos, const std::deque<char> & val);
-            /// Prepares a single character deque.
-
-            void prepare(std::size_t pos, const std::list<char> & val);
-            /// Prepares a single character list.
-
-            void prepare(std::size_t pos, const std::string & val);
-            /// Prepares a string.
-
-            void prepare(std::size_t pos, const std::vector<std::string> & val);
-            /// Prepares a string vector.
-
-            void prepare(std::size_t pos, const std::deque<std::string> & val);
-            /// Prepares a string deque.
-
-            void prepare(std::size_t pos, const std::list<std::string> & val);
-            /// Prepares a string list.
-
-            void prepare(std::size_t pos, const UTF16String & val);
-            /// Prepares a string.
-
-            void prepare(std::size_t pos, const std::vector<UTF16String> & val);
-            /// Prepares a string vector.
-
-            void prepare(std::size_t pos, const std::deque<UTF16String> & val);
-            /// Prepares a string deque.
-
-            void prepare(std::size_t pos, const std::list<UTF16String> & val);
-            /// Prepares a string list.
-
-            void prepare(std::size_t pos, const Poco::Data::BLOB & val);
-            /// Prepares a BLOB.
-
-            void prepare(std::size_t pos, const std::vector<Poco::Data::BLOB> & val);
-            /// Prepares a BLOB vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::Data::BLOB> & val);
-            /// Prepares a BLOB deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::Data::BLOB> & val);
-            /// Prepares a BLOB list.
-
-            void prepare(std::size_t pos, const Poco::Data::CLOB & val);
-            /// Prepares a CLOB.
-
-            void prepare(std::size_t pos, const std::vector<Poco::Data::CLOB> & val);
-            /// Prepares a CLOB vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::Data::CLOB> & val);
-            /// Prepares a CLOB deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::Data::CLOB> & val);
-            /// Prepares a CLOB list.
-
-            void prepare(std::size_t pos, const Poco::Data::Date & val);
-            /// Prepares a Date.
-
-            void prepare(std::size_t pos, const std::vector<Poco::Data::Date> & val);
-            /// Prepares a Date vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::Data::Date> & val);
-            /// Prepares a Date deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::Data::Date> & val);
-            /// Prepares a Date list.
-
-            void prepare(std::size_t pos, const Poco::Data::Time & val);
-            /// Prepares a Time.
-
-            void prepare(std::size_t pos, const std::vector<Poco::Data::Time> & val);
-            /// Prepares a Time vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::Data::Time> & val);
-            /// Prepares a Time deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::Data::Time> & val);
-            /// Prepares a Time list.
-
-            void prepare(std::size_t pos, const Poco::DateTime & val);
-            /// Prepares a DateTime.
-
-            void prepare(std::size_t pos, const std::vector<Poco::DateTime> & val);
-            /// Prepares a DateTime vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::DateTime> & val);
-            /// Prepares a DateTime deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::DateTime> & val);
-            /// Prepares a DateTime list.
-
-            void prepare(std::size_t pos, const Poco::Any & val);
-            /// Prepares an Any.
-
-            void prepare(std::size_t pos, const std::vector<Poco::Any> & val);
-            /// Prepares an Any vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::Any> & val);
-            /// Prepares an Any deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::Any> & val);
-            /// Prepares an Any list.
-
-            void prepare(std::size_t pos, const Poco::DynamicAny & val);
-            /// Prepares a DynamicAny.
-
-            void prepare(std::size_t pos, const std::vector<Poco::DynamicAny> & val);
-            /// Prepares a DynamicAny vector.
-
-            void prepare(std::size_t pos, const std::deque<Poco::DynamicAny> & val);
-            /// Prepares a DynamicAny deque.
-
-            void prepare(std::size_t pos, const std::list<Poco::DynamicAny> & val);
-            /// Prepares a DynamicAny list.
-
-            std::size_t columns() const;
-            /// Returns the number of columns.
-            /// Resizes the internal storage iff the size is zero.
-
-            Poco::Any & operator[](std::size_t pos);
-            /// Returns reference to column data.
-
-            Poco::Any & at(std::size_t pos);
-            /// Returns reference to column data.
-
-            void setMaxFieldSize(std::size_t size);
-            /// Sets maximum supported field size.
-
-            std::size_t getMaxFieldSize() const;
-            // Returns maximum supported field size.
-
-            std::size_t maxDataSize(std::size_t pos) const;
-            /// Returns max supported size for column at position pos.
-            /// Returned length for variable length fields is the one
-            /// supported by this implementation, not the underlying DB.
-
-            std::size_t actualDataSize(std::size_t col, std::size_t row = POCO_DATA_INVALID_ROW) const;
-            /// Returns the returned length for the column and row specified.
-            /// This is usually equal to the column size, except for
-            /// variable length fields (BLOB and variable length strings).
-            /// For null values, the return value is -1 (SQL_NO_DATA)
-
-            std::size_t bulkSize(std::size_t col = 0) const;
-            /// Returns bulk size. Column argument is optional
-            /// since all columns must be the same size.
-
-            void setDataExtraction(DataExtraction ext);
-            /// Set data extraction mode.
-
-            DataExtraction getDataExtraction() const;
-            /// Returns data extraction mode.
-
-        private:
-            typedef std::vector<Poco::Any> ValueVec;
-            typedef std::vector<SQLLEN> LengthVec;
-            typedef std::vector<LengthVec> LengthLengthVec;
-            typedef std::map<std::size_t, DataType> IndexMap;
-
-            Preparator();
-            Preparator & operator=(const Preparator &);
-
-            template <typename C>
-            void prepareImpl(std::size_t pos, const C * pVal = 0)
-            /// Utility function to prepare Any and DynamicAny.
-            {
-                ODBCMetaColumn col(_rStmt, pos);
-
-                switch (col.type())
-                {
-                    case MetaColumn::FDT_INT8:
-                        if (pVal)
-                            return prepareFixedSize<Poco::Int8>(pos, SQL_C_STINYINT, pVal->size());
-                        else
-                            return prepareFixedSize<Poco::Int8>(pos, SQL_C_STINYINT);
-
-                    case MetaColumn::FDT_UINT8:
-                        if (pVal)
-                            return prepareFixedSize<Poco::UInt8>(pos, SQL_C_UTINYINT, pVal->size());
-                        else
-                            return prepareFixedSize<Poco::UInt8>(pos, SQL_C_UTINYINT);
-
-                    case MetaColumn::FDT_INT16:
-                        if (pVal)
-                            return prepareFixedSize<Poco::Int16>(pos, SQL_C_SSHORT, pVal->size());
-                        else
-                            return prepareFixedSize<Poco::Int16>(pos, SQL_C_SSHORT);
-
-                    case MetaColumn::FDT_UINT16:
-                        if (pVal)
-                            return prepareFixedSize<Poco::UInt16>(pos, SQL_C_USHORT, pVal->size());
-                        else
-                            return prepareFixedSize<Poco::UInt16>(pos, SQL_C_USHORT);
-
-                    case MetaColumn::FDT_INT32:
-                        if (pVal)
-                            return prepareFixedSize<Poco::Int32>(pos, SQL_C_SLONG, pVal->size());
-                        else
-                            return prepareFixedSize<Poco::Int32>(pos, SQL_C_SLONG);
-
-                    case MetaColumn::FDT_UINT32:
-                        if (pVal)
-                            return prepareFixedSize<Poco::UInt32>(pos, SQL_C_ULONG, pVal->size());
-                        else
-                            return prepareFixedSize<Poco::UInt32>(pos, SQL_C_ULONG);
-
-                    case MetaColumn::FDT_INT64:
-                        if (pVal)
-                            return prepareFixedSize<Poco::Int64>(pos, SQL_C_SBIGINT, pVal->size());
-                        else
-                            return prepareFixedSize<Poco::Int64>(pos, SQL_C_SBIGINT);
-
-                    case MetaColumn::FDT_UINT64:
-                        if (pVal)
-                            return prepareFixedSize<Poco::UInt64>(pos, SQL_C_UBIGINT, pVal->size());
-                        else
-                            return prepareFixedSize<Poco::UInt64>(pos, SQL_C_UBIGINT);
-
-                    case MetaColumn::FDT_BOOL:
-                        if (pVal)
-                            return prepareBoolArray(pos, SQL_C_BIT, pVal->size());
-                        else
-                            return prepareFixedSize<bool>(pos, SQL_C_BIT);
-
-                    case MetaColumn::FDT_FLOAT:
-                        if (pVal)
-                            return prepareFixedSize<float>(pos, SQL_C_FLOAT, pVal->size());
-                        else
-                            return prepareFixedSize<float>(pos, SQL_C_FLOAT);
-
-                    case MetaColumn::FDT_DOUBLE:
-                        if (pVal)
-                            return prepareFixedSize<double>(pos, SQL_C_DOUBLE, pVal->size());
-                        else
-                            return prepareFixedSize<double>(pos, SQL_C_DOUBLE);
-
-                    case MetaColumn::FDT_STRING:
-                        if (pVal)
-                            return prepareCharArray<char, DT_CHAR_ARRAY>(pos, SQL_C_CHAR, maxDataSize(pos), pVal->size());
-                        else
-                            return prepareVariableLen<char>(pos, SQL_C_CHAR, maxDataSize(pos), DT_CHAR);
-
-                    case MetaColumn::FDT_WSTRING: {
-                        typedef UTF16String::value_type CharType;
-                        if (pVal)
-                            return prepareCharArray<CharType, DT_WCHAR_ARRAY>(pos, SQL_C_WCHAR, maxDataSize(pos), pVal->size());
-                        else
-                            return prepareVariableLen<CharType>(pos, SQL_C_WCHAR, maxDataSize(pos), DT_WCHAR);
-                    }
-
-                    case MetaColumn::FDT_BLOB: {
-                        typedef Poco::Data::BLOB::ValueType CharType;
-                        if (pVal)
-                            return prepareCharArray<CharType, DT_UCHAR_ARRAY>(pos, SQL_C_BINARY, maxDataSize(pos), pVal->size());
-                        else
-                            return prepareVariableLen<CharType>(pos, SQL_C_BINARY, maxDataSize(pos), DT_UCHAR);
-                    }
-
-                    case MetaColumn::FDT_CLOB: {
-                        typedef Poco::Data::CLOB::ValueType CharType;
-                        if (pVal)
-                            return prepareCharArray<CharType, DT_CHAR_ARRAY>(pos, SQL_C_BINARY, maxDataSize(pos), pVal->size());
-                        else
-                            return prepareVariableLen<CharType>(pos, SQL_C_BINARY, maxDataSize(pos), DT_CHAR);
-                    }
-
-                    case MetaColumn::FDT_DATE:
-                        if (pVal)
-                            return prepareFixedSize<Date>(pos, SQL_C_TYPE_DATE, pVal->size());
-                        else
-                            return prepareFixedSize<Date>(pos, SQL_C_TYPE_DATE);
-
-                    case MetaColumn::FDT_TIME:
-                        if (pVal)
-                            return prepareFixedSize<Time>(pos, SQL_C_TYPE_TIME, pVal->size());
-                        else
-                            return prepareFixedSize<Time>(pos, SQL_C_TYPE_TIME);
-
-                    case MetaColumn::FDT_TIMESTAMP:
-                        if (pVal)
-                            return prepareFixedSize<DateTime>(pos, SQL_C_TYPE_TIMESTAMP, pVal->size());
-                        else
-                            return prepareFixedSize<DateTime>(pos, SQL_C_TYPE_TIMESTAMP);
-
-                    default:
-                        throw DataFormatException("Unsupported data type.");
-                }
-            }
-
-            void resize() const;
-            /// Resize the values and lengths vectors.
-
-            template <typename T>
-            void prepareFixedSize(std::size_t pos, SQLSMALLINT valueType)
-            /// Utility function for preparation of fixed length columns.
-            {
-                poco_assert(DE_BOUND == _dataExtraction);
-                std::size_t dataSize = sizeof(T);
-
-                poco_assert(pos < _values.size());
-                _values[pos] = Poco::Any(T());
-
-                T * pVal = AnyCast<T>(&_values[pos]);
-                if (Utility::isError(
-                        SQLBindCol(_rStmt, (SQLUSMALLINT)pos + 1, valueType, (SQLPOINTER)pVal, (SQLINTEGER)dataSize, &_lengths[pos])))
-                {
-                    throw StatementException(_rStmt, "SQLBindCol()");
-                }
-            }
-
-            template <typename T>
-            void prepareFixedSize(std::size_t pos, SQLSMALLINT valueType, std::size_t length)
-            /// Utility function for preparation of fixed length columns that are
-            /// bound to a std::vector.
-            {
-                poco_assert(DE_BOUND == _dataExtraction);
-                std::size_t dataSize = sizeof(T);
-
-                poco_assert(pos < _values.size());
-                poco_assert(length);
-                _values[pos] = Poco::Any(std::vector<T>());
-                _lengths[pos] = 0;
-                poco_assert(0 == _lenLengths[pos].size());
-                _lenLengths[pos].resize(length);
-
-                std::vector<T> & cache = RefAnyCast<std::vector<T>>(_values[pos]);
-                cache.resize(length);
-
-                if (Utility::isError(SQLBindCol(
-                        _rStmt, (SQLUSMALLINT)pos + 1, valueType, (SQLPOINTER)&cache[0], (SQLINTEGER)dataSize, &_lenLengths[pos][0])))
-                {
-                    throw StatementException(_rStmt, "SQLBindCol()");
-                }
-            }
-
-            template <typename T>
-            void prepareVariableLen(std::size_t pos, SQLSMALLINT valueType, std::size_t size, DataType dt)
-            /// Utility function for preparation of variable length columns.
-            {
-                poco_assert(DE_BOUND == _dataExtraction);
-                poco_assert(pos < _values.size());
-
-                T * pCache = new T[size];
-                std::memset(pCache, 0, size);
-
-                _values[pos] = Any(pCache);
-                _lengths[pos] = (SQLLEN)size;
-                _varLengthArrays.insert(IndexMap::value_type(pos, dt));
-
-                if (Utility::isError(SQLBindCol(
-                        _rStmt, (SQLUSMALLINT)pos + 1, valueType, (SQLPOINTER)pCache, (SQLINTEGER)size * sizeof(T), &_lengths[pos])))
-                {
-                    throw StatementException(_rStmt, "SQLBindCol()");
-                }
-            }
-
-            template <typename T, DataType DT>
-            void prepareCharArray(std::size_t pos, SQLSMALLINT valueType, std::size_t size, std::size_t length)
-            /// Utility function for preparation of bulk variable length character and LOB columns.
-            {
-                poco_assert_dbg(DE_BOUND == _dataExtraction);
-                poco_assert_dbg(pos < _values.size());
-                poco_assert_dbg(pos < _lengths.size());
-                poco_assert_dbg(pos < _lenLengths.size());
-
-                T * pArray = (T *)std::calloc(length * size, sizeof(T));
-
-                _values[pos] = Any(pArray);
-                _lengths[pos] = 0;
-                _lenLengths[pos].resize(length);
-                _varLengthArrays.insert(IndexMap::value_type(pos, DT));
-
-                if (Utility::isError(
-                        SQLBindCol(_rStmt, (SQLUSMALLINT)pos + 1, valueType, (SQLPOINTER)pArray, (SQLINTEGER)size, &_lenLengths[pos][0])))
-                {
-                    throw StatementException(_rStmt, "SQLBindCol()");
-                }
-            }
-
-            void prepareBoolArray(std::size_t pos, SQLSMALLINT valueType, std::size_t length);
-            /// Utility function for preparation of bulk bool columns.
-
-            void freeMemory() const;
-            /// Utility function. Releases memory allocated for variable length columns.
-
-            template <typename T>
-            void deleteCachedArray(std::size_t pos) const
-            {
-                T ** p = Poco::AnyCast<T *>(&_values[pos]);
-                if (p)
-                    delete[] * p;
-            }
-
-            const StatementHandle & _rStmt;
-            mutable ValueVec _values;
-            mutable LengthVec _lengths;
-            mutable LengthLengthVec _lenLengths;
-            mutable IndexMap _varLengthArrays;
-            std::size_t _maxFieldSize;
-            DataExtraction _dataExtraction;
-        };
-
-
-        //
-        // inlines
-        //
-        inline void Preparator::prepare(std::size_t pos, const Poco::Int8 &)
-        {
-            prepareFixedSize<Poco::Int8>(pos, SQL_C_STINYINT);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::Int8> & val)
-        {
-            prepareFixedSize<Poco::Int8>(pos, SQL_C_STINYINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::Int8> & val)
-        {
-            prepareFixedSize<Poco::Int8>(pos, SQL_C_STINYINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::Int8> & val)
-        {
-            prepareFixedSize<Poco::Int8>(pos, SQL_C_STINYINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::UInt8 &)
-        {
-            prepareFixedSize<Poco::UInt8>(pos, SQL_C_UTINYINT);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::UInt8> & val)
-        {
-            prepareFixedSize<Poco::UInt8>(pos, SQL_C_UTINYINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::UInt8> & val)
-        {
-            prepareFixedSize<Poco::UInt8>(pos, SQL_C_UTINYINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::UInt8> & val)
-        {
-            prepareFixedSize<Poco::UInt8>(pos, SQL_C_UTINYINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::Int16 &)
-        {
-            prepareFixedSize<Poco::Int16>(pos, SQL_C_SSHORT);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::Int16> & val)
-        {
-            prepareFixedSize<Poco::Int16>(pos, SQL_C_SSHORT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::Int16> & val)
-        {
-            prepareFixedSize<Poco::Int16>(pos, SQL_C_SSHORT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::Int16> & val)
-        {
-            prepareFixedSize<Poco::Int16>(pos, SQL_C_SSHORT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::UInt16 &)
-        {
-            prepareFixedSize<Poco::UInt16>(pos, SQL_C_USHORT);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::UInt16> & val)
-        {
-            prepareFixedSize<Poco::UInt16>(pos, SQL_C_USHORT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::UInt16> & val)
-        {
-            prepareFixedSize<Poco::UInt16>(pos, SQL_C_USHORT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::UInt16> & val)
-        {
-            prepareFixedSize<Poco::UInt16>(pos, SQL_C_USHORT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::Int32 &)
-        {
-            prepareFixedSize<Poco::Int32>(pos, SQL_C_SLONG);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::Int32> & val)
-        {
-            prepareFixedSize<Poco::Int32>(pos, SQL_C_SLONG, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::Int32> & val)
-        {
-            prepareFixedSize<Poco::Int32>(pos, SQL_C_SLONG, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::Int32> & val)
-        {
-            prepareFixedSize<Poco::Int32>(pos, SQL_C_SLONG, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::UInt32 &)
-        {
-            prepareFixedSize<Poco::UInt32>(pos, SQL_C_ULONG);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::UInt32> & val)
-        {
-            prepareFixedSize<Poco::UInt32>(pos, SQL_C_ULONG, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::UInt32> & val)
-        {
-            prepareFixedSize<Poco::UInt32>(pos, SQL_C_ULONG, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::UInt32> & val)
-        {
-            prepareFixedSize<Poco::UInt32>(pos, SQL_C_ULONG, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::Int64 &)
-        {
-            prepareFixedSize<Poco::Int64>(pos, SQL_C_SBIGINT);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::Int64> & val)
-        {
-            prepareFixedSize<Poco::Int64>(pos, SQL_C_SBIGINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::Int64> & val)
-        {
-            prepareFixedSize<Poco::Int64>(pos, SQL_C_SBIGINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::Int64> & val)
-        {
-            prepareFixedSize<Poco::Int64>(pos, SQL_C_SBIGINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::UInt64 &)
-        {
-            prepareFixedSize<Poco::UInt64>(pos, SQL_C_UBIGINT);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::UInt64> & val)
-        {
-            prepareFixedSize<Poco::UInt64>(pos, SQL_C_UBIGINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::UInt64> & val)
-        {
-            prepareFixedSize<Poco::UInt64>(pos, SQL_C_UBIGINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::UInt64> & val)
-        {
-            prepareFixedSize<Poco::UInt64>(pos, SQL_C_UBIGINT, val.size());
-        }
-
-
-#ifndef POCO_LONG_IS_64_BIT
-        inline void Preparator::prepare(std::size_t pos, const long &)
-        {
-            prepareFixedSize<long>(pos, SQL_C_SLONG);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const unsigned long &)
-        {
-            prepareFixedSize<long>(pos, SQL_C_SLONG);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<long> & val)
-        {
-            prepareFixedSize<long>(pos, SQL_C_SLONG, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<long> & val)
-        {
-            prepareFixedSize<long>(pos, SQL_C_SLONG, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<long> & val)
-        {
-            prepareFixedSize<long>(pos, SQL_C_SLONG, val.size());
-        }
-#endif
-
-
-        inline void Preparator::prepare(std::size_t pos, const bool &)
-        {
-            prepareFixedSize<bool>(pos, SQL_C_BIT);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<bool> & val)
-        {
-            prepareBoolArray(pos, SQL_C_BIT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<bool> & val)
-        {
-            prepareBoolArray(pos, SQL_C_BIT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<bool> & val)
-        {
-            prepareBoolArray(pos, SQL_C_BIT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const float &)
-        {
-            prepareFixedSize<float>(pos, SQL_C_FLOAT);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<float> & val)
-        {
-            prepareFixedSize<float>(pos, SQL_C_FLOAT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<float> & val)
-        {
-            prepareFixedSize<float>(pos, SQL_C_FLOAT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<float> & val)
-        {
-            prepareFixedSize<float>(pos, SQL_C_FLOAT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const double &)
-        {
-            prepareFixedSize<double>(pos, SQL_C_DOUBLE);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<double> & val)
-        {
-            prepareFixedSize<double>(pos, SQL_C_DOUBLE, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<double> & val)
-        {
-            prepareFixedSize<double>(pos, SQL_C_DOUBLE, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<double> & val)
-        {
-            prepareFixedSize<double>(pos, SQL_C_DOUBLE, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const char &)
-        {
-            prepareFixedSize<char>(pos, SQL_C_STINYINT);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<char> & val)
-        {
-            prepareFixedSize<char>(pos, SQL_C_STINYINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<char> & val)
-        {
-            prepareFixedSize<char>(pos, SQL_C_STINYINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<char> & val)
-        {
-            prepareFixedSize<char>(pos, SQL_C_STINYINT, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::string &)
-        {
-            prepareVariableLen<char>(pos, SQL_C_CHAR, maxDataSize(pos), DT_CHAR);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<std::string> & val)
-        {
-            prepareCharArray<char, DT_CHAR_ARRAY>(pos, SQL_C_CHAR, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<std::string> & val)
-        {
-            prepareCharArray<char, DT_CHAR_ARRAY>(pos, SQL_C_CHAR, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<std::string> & val)
-        {
-            prepareCharArray<char, DT_CHAR_ARRAY>(pos, SQL_C_CHAR, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const UTF16String &)
-        {
-            prepareVariableLen<UTF16String::value_type>(pos, SQL_C_WCHAR, maxDataSize(pos), DT_WCHAR);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<UTF16String> & val)
-        {
-            prepareCharArray<UTF16String::value_type, DT_WCHAR_ARRAY>(pos, SQL_C_WCHAR, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<UTF16String> & val)
-        {
-            prepareCharArray<UTF16String::value_type, DT_WCHAR_ARRAY>(pos, SQL_C_WCHAR, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<UTF16String> & val)
-        {
-            prepareCharArray<UTF16String::value_type, DT_WCHAR_ARRAY>(pos, SQL_C_WCHAR, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::Data::BLOB &)
-        {
-            prepareVariableLen<Poco::Data::BLOB::ValueType>(pos, SQL_C_BINARY, maxDataSize(pos), DT_UCHAR);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::Data::BLOB> & val)
-        {
-            prepareCharArray<char, DT_UCHAR_ARRAY>(pos, SQL_C_BINARY, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::Data::BLOB> & val)
-        {
-            prepareCharArray<char, DT_UCHAR_ARRAY>(pos, SQL_C_BINARY, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::Data::BLOB> & val)
-        {
-            prepareCharArray<char, DT_UCHAR_ARRAY>(pos, SQL_C_BINARY, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::Data::CLOB &)
-        {
-            prepareVariableLen<Poco::Data::CLOB::ValueType>(pos, SQL_C_BINARY, maxDataSize(pos), DT_CHAR);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::Data::CLOB> & val)
-        {
-            prepareCharArray<char, DT_CHAR_ARRAY>(pos, SQL_C_BINARY, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::Data::CLOB> & val)
-        {
-            prepareCharArray<char, DT_CHAR_ARRAY>(pos, SQL_C_BINARY, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::Data::CLOB> & val)
-        {
-            prepareCharArray<char, DT_CHAR_ARRAY>(pos, SQL_C_BINARY, maxDataSize(pos), val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::Data::Date &)
-        {
-            prepareFixedSize<SQL_DATE_STRUCT>(pos, SQL_C_TYPE_DATE);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::Data::Date> & val)
-        {
-            prepareFixedSize<SQL_DATE_STRUCT>(pos, SQL_C_TYPE_DATE, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::Data::Date> & val)
-        {
-            prepareFixedSize<SQL_DATE_STRUCT>(pos, SQL_C_TYPE_DATE, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::Data::Date> & val)
-        {
-            prepareFixedSize<SQL_DATE_STRUCT>(pos, SQL_C_TYPE_DATE, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::Data::Time &)
-        {
-            prepareFixedSize<SQL_TIME_STRUCT>(pos, SQL_C_TYPE_TIME);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::Data::Time> & val)
-        {
-            prepareFixedSize<SQL_TIME_STRUCT>(pos, SQL_C_TYPE_TIME, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::Data::Time> & val)
-        {
-            prepareFixedSize<SQL_TIME_STRUCT>(pos, SQL_C_TYPE_TIME, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::Data::Time> & val)
-        {
-            prepareFixedSize<SQL_TIME_STRUCT>(pos, SQL_C_TYPE_TIME, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::DateTime &)
-        {
-            prepareFixedSize<SQL_TIMESTAMP_STRUCT>(pos, SQL_C_TYPE_TIMESTAMP);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::DateTime> & val)
-        {
-            prepareFixedSize<SQL_TIMESTAMP_STRUCT>(pos, SQL_C_TYPE_TIMESTAMP, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::DateTime> & val)
-        {
-            prepareFixedSize<SQL_TIMESTAMP_STRUCT>(pos, SQL_C_TYPE_TIMESTAMP, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::DateTime> & val)
-        {
-            prepareFixedSize<SQL_TIMESTAMP_STRUCT>(pos, SQL_C_TYPE_TIMESTAMP, val.size());
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::Any & val)
-        {
-            prepareImpl<std::vector<Poco::Any>>(pos);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::Any> & val)
-        {
-            prepareImpl<std::vector<Poco::Any>>(pos, &val);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::Any> & val)
-        {
-            prepareImpl<std::deque<Poco::Any>>(pos, &val);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::Any> & val)
-        {
-            prepareImpl<std::list<Poco::Any>>(pos, &val);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const Poco::DynamicAny & val)
-        {
-            prepareImpl<std::vector<Poco::DynamicAny>>(pos);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::vector<Poco::DynamicAny> & val)
-        {
-            prepareImpl<std::vector<Poco::DynamicAny>>(pos, &val);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::deque<Poco::DynamicAny> & val)
-        {
-            prepareImpl<std::deque<Poco::DynamicAny>>(pos, &val);
-        }
-
-
-        inline void Preparator::prepare(std::size_t pos, const std::list<Poco::DynamicAny> & val)
-        {
-            prepareImpl<std::list<Poco::DynamicAny>>(pos, &val);
-        }
-
-
-        inline std::size_t Preparator::bulkSize(std::size_t col) const
-        {
-            poco_assert(col < _lenLengths.size());
-
-            return _lenLengths[col].size();
-        }
-
-
-        inline void Preparator::setMaxFieldSize(std::size_t size)
-        {
-            _maxFieldSize = size;
-        }
-
-
-        inline std::size_t Preparator::getMaxFieldSize() const
-        {
-            return _maxFieldSize;
-        }
-
-
-        inline void Preparator::setDataExtraction(Preparator::DataExtraction ext)
-        {
-            _dataExtraction = ext;
-        }
-
-
-        inline Preparator::DataExtraction Preparator::getDataExtraction() const
-        {
-            return _dataExtraction;
-        }
-
-
-        inline Poco::Any & Preparator::operator[](std::size_t pos)
-        {
-            return at(pos);
-        }
-
-
-        inline Poco::Any & Preparator::at(std::size_t pos)
-        {
-            return _values.at(pos);
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif // Data_ODBC_Preparator_INCLUDED
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
deleted file mode 100644
index 259f26aff..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
+++ /dev/null
@@ -1,294 +0,0 @@
-//
-// SessionImpl.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  SessionImpl
-//
-// Definition of the SessionImpl class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_SessionImpl_INCLUDED
-#define Data_ODBC_SessionImpl_INCLUDED
-
-
-#include "Poco/Data/AbstractSessionImpl.h"
-#include "Poco/Data/ODBC/Binder.h"
-#include "Poco/Data/ODBC/Connector.h"
-#include "Poco/Data/ODBC/Handle.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-#include "Poco/Data/ODBC/TypeInfo.h"
-#include "Poco/Mutex.h"
-#include "Poco/SharedPtr.h"
-#include <sqltypes.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        class ODBC_API SessionImpl : public Poco::Data::AbstractSessionImpl<SessionImpl>
-        /// Implements SessionImpl interface
-        {
-        public:
-            static const std::size_t ODBC_MAX_FIELD_SIZE = 1024u;
-
-            enum TransactionCapability
-            {
-                ODBC_TXN_CAPABILITY_UNKNOWN = -1,
-                ODBC_TXN_CAPABILITY_FALSE = 0,
-                ODBC_TXN_CAPABILITY_TRUE = 1
-            };
-
-            SessionImpl(
-                const std::string & connect,
-                std::size_t loginTimeout,
-                std::size_t maxFieldSize = ODBC_MAX_FIELD_SIZE,
-                bool autoBind = true,
-                bool autoExtract = true);
-            /// Creates the SessionImpl. Opens a connection to the database.
-            /// Throws NotConnectedException if connection was not successful.
-
-            //@ deprecated
-            SessionImpl(
-                const std::string & connect,
-                Poco::Any maxFieldSize = ODBC_MAX_FIELD_SIZE,
-                bool enforceCapability = false,
-                bool autoBind = true,
-                bool autoExtract = true);
-            /// Creates the SessionImpl. Opens a connection to the database.
-
-            ~SessionImpl();
-            /// Destroys the SessionImpl.
-
-            Poco::Data::StatementImpl * createStatementImpl();
-            /// Returns an ODBC StatementImpl
-
-            void open(const std::string & connect = "");
-            /// Opens a connection to the Database
-
-            void close();
-            /// Closes the connection
-
-            bool isConnected();
-            /// Returns true if session is connected
-
-            void setConnectionTimeout(std::size_t timeout);
-            /// Sets the session connection timeout value.
-
-            std::size_t getConnectionTimeout();
-            /// Returns the session connection timeout value.
-
-            void begin();
-            /// Starts a transaction
-
-            void commit();
-            /// Commits and ends a transaction
-
-            void rollback();
-            /// Aborts a transaction
-
-            bool isTransaction();
-            /// Returns true iff a transaction is in progress.
-
-            const std::string & connectorName() const;
-            /// Returns the name of the connector.
-
-            bool canTransact();
-            /// Returns true if connection is transaction-capable.
-
-            void setTransactionIsolation(Poco::UInt32 ti);
-            /// Sets the transaction isolation level.
-
-            Poco::UInt32 getTransactionIsolation();
-            /// Returns the transaction isolation level.
-
-            bool hasTransactionIsolation(Poco::UInt32);
-            /// Returns true iff the transaction isolation level corresponding
-            /// to the supplied bitmask is supported.
-
-            bool isTransactionIsolation(Poco::UInt32);
-            /// Returns true iff the transaction isolation level corresponds
-            /// to the supplied bitmask.
-
-            void autoCommit(const std::string &, bool val);
-            /// Sets autocommit property for the session.
-
-            bool isAutoCommit(const std::string & name = "");
-            /// Returns autocommit property value.
-
-            void autoBind(const std::string &, bool val);
-            /// Sets automatic binding for the session.
-
-            bool isAutoBind(const std::string & name = "");
-            /// Returns true if binding is automatic for this session.
-
-            void autoExtract(const std::string &, bool val);
-            /// Sets automatic extraction for the session.
-
-            bool isAutoExtract(const std::string & name = "");
-            /// Returns true if extraction is automatic for this session.
-
-            void setMaxFieldSize(const std::string & rName, const Poco::Any & rValue);
-            /// Sets the max field size (the default used when column size is unknown).
-
-            Poco::Any getMaxFieldSize(const std::string & rName = "");
-            /// Returns the max field size (the default used when column size is unknown).
-
-            int maxStatementLength();
-            /// Returns maximum length of SQL statement allowed by driver.
-
-            void setQueryTimeout(const std::string &, const Poco::Any & value);
-            /// Sets the timeout (in seconds) for queries.
-            /// Value must be of type int.
-
-            Poco::Any getQueryTimeout(const std::string &);
-            /// Returns the timeout (in seconds) for queries,
-            /// or -1 if no timeout has been set.
-
-            int queryTimeout() const;
-            /// Returns the timeout (in seconds) for queries,
-            /// or -1 if no timeout has been set.
-
-            const ConnectionHandle & dbc() const;
-            /// Returns the connection handle.
-
-            Poco::Any dataTypeInfo(const std::string & rName = "");
-            /// Returns the data types information.
-
-        private:
-            void setDataTypeInfo(const std::string & rName, const Poco::Any & rValue);
-            /// No-op. Throws InvalidAccessException.
-
-            static const int FUNCTIONS = SQL_API_ODBC3_ALL_FUNCTIONS_SIZE;
-
-            void checkError(SQLRETURN rc, const std::string & msg = "");
-
-            Poco::UInt32 getDefaultTransactionIsolation();
-
-            Poco::UInt32 transactionIsolation(SQLULEN isolation);
-
-            std::string _connector;
-            const ConnectionHandle _db;
-            Poco::Any _maxFieldSize;
-            bool _autoBind;
-            bool _autoExtract;
-            TypeInfo _dataTypes;
-            char _canTransact;
-            bool _inTransaction;
-            int _queryTimeout;
-            Poco::FastMutex _mutex;
-        };
-
-
-        ///
-        /// inlines
-        ///
-        inline void SessionImpl::checkError(SQLRETURN rc, const std::string & msg)
-        {
-            if (Utility::isError(rc))
-                throw ConnectionException(_db, msg);
-        }
-
-
-        inline const ConnectionHandle & SessionImpl::dbc() const
-        {
-            return _db;
-        }
-
-
-        inline void SessionImpl::setMaxFieldSize(const std::string & rName, const Poco::Any & rValue)
-        {
-            _maxFieldSize = rValue;
-        }
-
-
-        inline Poco::Any SessionImpl::getMaxFieldSize(const std::string & rName)
-        {
-            return _maxFieldSize;
-        }
-
-
-        inline void SessionImpl::setDataTypeInfo(const std::string & rName, const Poco::Any & rValue)
-        {
-            throw InvalidAccessException();
-        }
-
-
-        inline Poco::Any SessionImpl::dataTypeInfo(const std::string & rName)
-        {
-            return &_dataTypes;
-        }
-
-
-        inline void SessionImpl::autoBind(const std::string &, bool val)
-        {
-            _autoBind = val;
-        }
-
-
-        inline bool SessionImpl::isAutoBind(const std::string & name)
-        {
-            return _autoBind;
-        }
-
-
-        inline void SessionImpl::autoExtract(const std::string &, bool val)
-        {
-            _autoExtract = val;
-        }
-
-
-        inline bool SessionImpl::isAutoExtract(const std::string & name)
-        {
-            return _autoExtract;
-        }
-
-
-        inline const std::string & SessionImpl::connectorName() const
-        {
-            return _connector;
-        }
-
-
-        inline bool SessionImpl::isTransactionIsolation(Poco::UInt32 ti)
-        {
-            return 0 != (ti & getTransactionIsolation());
-        }
-
-
-        inline void SessionImpl::setQueryTimeout(const std::string &, const Poco::Any & value)
-        {
-            _queryTimeout = Poco::AnyCast<int>(value);
-        }
-
-
-        inline Poco::Any SessionImpl::getQueryTimeout(const std::string &)
-        {
-            return _queryTimeout;
-        }
-
-
-        inline int SessionImpl::queryTimeout() const
-        {
-            return _queryTimeout;
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif // Data_ODBC_SessionImpl_INCLUDED
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
deleted file mode 100644
index e26ada658..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// TypeInfo.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  TypeInfo
-//
-// Definition of TypeInfo.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_DataTypes_INCLUDED
-#define Data_ODBC_DataTypes_INCLUDED
-
-
-#include <map>
-#include <vector>
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/DynamicAny.h"
-#include "Poco/NamedTuple.h"
-#include <sqlext.h>
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        class ODBC_API TypeInfo
-        /// Datatypes mapping utility class.
-        ///
-        /// This class provides mapping between C and SQL datatypes as well
-        /// as datatypes supported by the underlying database. In order for database
-        /// types to be available, a valid connection handle must be supplied at either
-        /// object construction time, or at a later point in time, through call to
-        /// fillTypeInfo member function.
-        ///
-        /// Class also provides a convenient debugging function that prints
-        /// tabulated data to an output stream.
-        {
-        public:
-            typedef std::map<int, int> DataTypeMap;
-            typedef DataTypeMap::value_type ValueType;
-            typedef Poco::NamedTuple<
-                std::string,
-                SQLSMALLINT,
-                SQLINTEGER,
-                std::string,
-                std::string,
-                std::string,
-                SQLSMALLINT,
-                SQLSMALLINT,
-                SQLSMALLINT,
-                SQLSMALLINT,
-                SQLSMALLINT,
-                SQLSMALLINT,
-                std::string,
-                SQLSMALLINT,
-                SQLSMALLINT,
-                SQLSMALLINT,
-                SQLSMALLINT,
-                SQLINTEGER,
-                SQLSMALLINT>
-                TypeInfoTup;
-            typedef std::vector<TypeInfoTup> TypeInfoVec;
-
-            explicit TypeInfo(SQLHDBC * pHDBC = 0);
-            /// Creates the TypeInfo.
-
-            ~TypeInfo();
-            /// Destroys the TypeInfo.
-
-            int cDataType(int sqlDataType) const;
-            /// Returns C data type corresponding to supplied SQL data type.
-
-            int sqlDataType(int cDataType) const;
-            /// Returns SQL data type corresponding to supplied C data type.
-
-            void fillTypeInfo(SQLHDBC pHDBC);
-            /// Fills the data type info structure for the database.
-
-            DynamicAny getInfo(SQLSMALLINT type, const std::string & param) const;
-            /// Returns information about specified data type as specified by parameter 'type'.
-            /// The requested information is specified by parameter 'param'.
-            /// Will fail with a Poco::NotFoundException thrown if the param is not found
-
-            bool tryGetInfo(SQLSMALLINT type, const std::string & param, DynamicAny & result) const;
-            /// Returns information about specified data type as specified by parameter 'type' in param result.
-            /// The requested information is specified by parameter 'param'.
-            /// Will return false if the param is not found. The value of result will be not changed in this case.
-
-
-            void print(std::ostream & ostr);
-            /// Prints all the types (as reported by the underlying database)
-            /// to the supplied output stream.
-
-        private:
-            void fillCTypes();
-            void fillSQLTypes();
-
-            DataTypeMap _cDataTypes;
-            DataTypeMap _sqlDataTypes;
-            TypeInfoVec _typeInfo;
-            SQLHDBC * _pHDBC;
-        };
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Unicode.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Unicode.h
deleted file mode 100644
index 170498841..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Unicode.h
+++ /dev/null
@@ -1,791 +0,0 @@
-//
-// Unicode.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Unicode
-//
-// Definition of Unicode.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Unicode_INCLUDED
-#define Data_ODBC_Unicode_INCLUDED
-
-
-#include <cstring>
-#include "Poco/Buffer.h"
-#include "Poco/Exception.h"
-#include "Poco/UnicodeConverter.h"
-#ifndef SQL_NOUNICODEMAP
-#    define SQL_NOUNICODEMAP
-#endif
-#include <sqlext.h>
-#include <sqltypes.h>
-#include <sqlucode.h>
-
-
-#if   defined(POCO_OS_FAMILY_UNIX) && defined(UNICODE)
-#    define POCO_ODBC_UNICODE
-#    ifdef POCO_UNIXODBC
-#        define POCO_ODBC_UNICODE_UNIXODBC
-#    elif defined(POCO_IODBC)
-#        error "iODBC Unicode not supported"
-#    endif
-#endif
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-#if defined(POCO_PTR_IS_64_BIT) \
-    || defined(POCO_OS_FAMILY_UNIX) // mkrivos - POCO_OS_FAMILY_UNIX doesn't compile with SQLPOINTER & SQLColAttribute()
-        typedef SQLLEN * NumAttrPtrType;
-#else
-        typedef SQLPOINTER NumAttrPtrType;
-#endif
-
-
-        SQLRETURN ODBC_API SQLColAttribute(
-            SQLHSTMT hstmt,
-            SQLUSMALLINT iCol,
-            SQLUSMALLINT iField,
-            SQLPOINTER pCharAttr,
-            SQLSMALLINT cbCharAttrMax,
-            SQLSMALLINT * pcbCharAttr,
-            NumAttrPtrType pNumAttr);
-
-
-        SQLRETURN ODBC_API SQLColAttributes(
-            SQLHSTMT hstmt,
-            SQLUSMALLINT icol,
-            SQLUSMALLINT fDescType,
-            SQLPOINTER rgbDesc,
-            SQLSMALLINT cbDescMax,
-            SQLSMALLINT * pcbDesc,
-            SQLLEN * pfDesc);
-
-        SQLRETURN ODBC_API SQLConnect(
-            SQLHDBC hdbc,
-            SQLCHAR * szDSN,
-            SQLSMALLINT cbDSN,
-            SQLCHAR * szUID,
-            SQLSMALLINT cbUID,
-            SQLCHAR * szAuthStr,
-            SQLSMALLINT cbAuthStr);
-
-        SQLRETURN ODBC_API SQLDescribeCol(
-            SQLHSTMT hstmt,
-            SQLUSMALLINT icol,
-            SQLCHAR * szColName,
-            SQLSMALLINT cbColNameMax,
-            SQLSMALLINT * pcbColName,
-            SQLSMALLINT * pfSqlType,
-            SQLULEN * pcbColDef,
-            SQLSMALLINT * pibScale,
-            SQLSMALLINT * pfNullable);
-
-        SQLRETURN ODBC_API SQLError(
-            SQLHENV henv,
-            SQLHDBC hdbc,
-            SQLHSTMT hstmt,
-            SQLCHAR * szSqlState,
-            SQLINTEGER * pfNativeError,
-            SQLCHAR * szErrorMsg,
-            SQLSMALLINT cbErrorMsgMax,
-            SQLSMALLINT * pcbErrorMsg);
-
-        SQLRETURN ODBC_API SQLExecDirect(SQLHSTMT hstmt, SQLCHAR * szSqlStr, SQLINTEGER cbSqlStr);
-
-        SQLRETURN ODBC_API
-        SQLGetConnectAttr(SQLHDBC hdbc, SQLINTEGER fAttribute, SQLPOINTER rgbValue, SQLINTEGER cbValueMax, SQLINTEGER * pcbValue);
-
-        SQLRETURN ODBC_API SQLGetCursorName(SQLHSTMT hstmt, SQLCHAR * szCursor, SQLSMALLINT cbCursorMax, SQLSMALLINT * pcbCursor);
-
-        SQLRETURN ODBC_API SQLSetDescField(
-            SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, SQLPOINTER Value, SQLINTEGER BufferLength);
-
-        SQLRETURN ODBC_API SQLGetDescField(
-            SQLHDESC hdesc, SQLSMALLINT iRecord, SQLSMALLINT iField, SQLPOINTER rgbValue, SQLINTEGER cbValueMax, SQLINTEGER * pcbValue);
-
-        SQLRETURN ODBC_API SQLGetDescRec(
-            SQLHDESC hdesc,
-            SQLSMALLINT iRecord,
-            SQLCHAR * szName,
-            SQLSMALLINT cbNameMax,
-            SQLSMALLINT * pcbName,
-            SQLSMALLINT * pfType,
-            SQLSMALLINT * pfSubType,
-            SQLLEN * pLength,
-            SQLSMALLINT * pPrecision,
-            SQLSMALLINT * pScale,
-            SQLSMALLINT * pNullable);
-
-        SQLRETURN ODBC_API SQLGetDiagField(
-            SQLSMALLINT fHandleType,
-            SQLHANDLE handle,
-            SQLSMALLINT iRecord,
-            SQLSMALLINT fDiagField,
-            SQLPOINTER rgbDiagInfo,
-            SQLSMALLINT cbDiagInfoMax,
-            SQLSMALLINT * pcbDiagInfo);
-
-        SQLRETURN ODBC_API SQLGetDiagRec(
-            SQLSMALLINT fHandleType,
-            SQLHANDLE handle,
-            SQLSMALLINT iRecord,
-            SQLCHAR * szSqlState,
-            SQLINTEGER * pfNativeError,
-            SQLCHAR * szErrorMsg,
-            SQLSMALLINT cbErrorMsgMax,
-            SQLSMALLINT * pcbErrorMsg);
-
-        SQLRETURN ODBC_API SQLPrepare(SQLHSTMT hstmt, SQLCHAR * szSqlStr, SQLINTEGER cbSqlStr);
-
-        SQLRETURN ODBC_API SQLSetConnectAttr(SQLHDBC hdbc, SQLINTEGER fAttribute, SQLPOINTER rgbValue, SQLINTEGER cbValue);
-
-        SQLRETURN ODBC_API SQLSetCursorName(SQLHSTMT hstmt, SQLCHAR * szCursor, SQLSMALLINT cbCursor);
-
-        SQLRETURN ODBC_API SQLSetStmtAttr(SQLHSTMT hstmt, SQLINTEGER fAttribute, SQLPOINTER rgbValue, SQLINTEGER cbValueMax);
-
-        SQLRETURN ODBC_API
-        SQLGetStmtAttr(SQLHSTMT hstmt, SQLINTEGER fAttribute, SQLPOINTER rgbValue, SQLINTEGER cbValueMax, SQLINTEGER * pcbValue);
-
-        SQLRETURN ODBC_API SQLColumns(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName,
-            SQLCHAR * szColumnName,
-            SQLSMALLINT cbColumnName);
-
-        SQLRETURN ODBC_API SQLGetConnectOption(SQLHDBC hdbc, SQLUSMALLINT fOption, SQLPOINTER pvParam);
-
-        SQLRETURN ODBC_API
-        SQLGetInfo(SQLHDBC hdbc, SQLUSMALLINT fInfoType, SQLPOINTER rgbInfoValue, SQLSMALLINT cbInfoValueMax, SQLSMALLINT * pcbInfoValue);
-
-        SQLRETURN ODBC_API SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT DataType);
-
-        SQLRETURN ODBC_API SQLSetConnectOption(SQLHDBC hdbc, SQLUSMALLINT fOption, SQLULEN vParam);
-
-        SQLRETURN ODBC_API SQLSpecialColumns(
-            SQLHSTMT hstmt,
-            SQLUSMALLINT fColType,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName,
-            SQLUSMALLINT fScope,
-            SQLUSMALLINT fNullable);
-
-        SQLRETURN ODBC_API SQLStatistics(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName,
-            SQLUSMALLINT fUnique,
-            SQLUSMALLINT fAccuracy);
-
-        SQLRETURN ODBC_API SQLTables(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName,
-            SQLCHAR * szTableType,
-            SQLSMALLINT cbTableType);
-
-        SQLRETURN ODBC_API SQLDataSources(
-            SQLHENV henv,
-            SQLUSMALLINT fDirection,
-            SQLCHAR * szDSN,
-            SQLSMALLINT cbDSNMax,
-            SQLSMALLINT * pcbDSN,
-            SQLCHAR * szDescription,
-            SQLSMALLINT cbDescriptionMax,
-            SQLSMALLINT * pcbDescription);
-
-        SQLRETURN ODBC_API SQLDriverConnect(
-            SQLHDBC hdbc,
-            SQLHWND hwnd,
-            SQLCHAR * szConnStrIn,
-            SQLSMALLINT cbConnStrIn,
-            SQLCHAR * szConnStrOut,
-            SQLSMALLINT cbConnStrOutMax,
-            SQLSMALLINT * pcbConnStrOut,
-            SQLUSMALLINT fDriverCompletion);
-
-        SQLRETURN ODBC_API SQLBrowseConnect(
-            SQLHDBC hdbc,
-            SQLCHAR * szConnStrIn,
-            SQLSMALLINT cbConnStrIn,
-            SQLCHAR * szConnStrOut,
-            SQLSMALLINT cbConnStrOutMax,
-            SQLSMALLINT * pcbConnStrOut);
-
-        SQLRETURN ODBC_API SQLColumnPrivileges(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName,
-            SQLCHAR * szColumnName,
-            SQLSMALLINT cbColumnName);
-
-        SQLRETURN ODBC_API SQLForeignKeys(
-            SQLHSTMT hstmt,
-            SQLCHAR * szPkCatalogName,
-            SQLSMALLINT cbPkCatalogName,
-            SQLCHAR * szPkSchemaName,
-            SQLSMALLINT cbPkSchemaName,
-            SQLCHAR * szPkTableName,
-            SQLSMALLINT cbPkTableName,
-            SQLCHAR * szFkCatalogName,
-            SQLSMALLINT cbFkCatalogName,
-            SQLCHAR * szFkSchemaName,
-            SQLSMALLINT cbFkSchemaName,
-            SQLCHAR * szFkTableName,
-            SQLSMALLINT cbFkTableName);
-
-        SQLRETURN ODBC_API SQLNativeSql(
-            SQLHDBC hdbc, SQLCHAR * szSqlStrIn, SQLINTEGER cbSqlStrIn, SQLCHAR * szSqlStr, SQLINTEGER cbSqlStrMax, SQLINTEGER * pcbSqlStr);
-
-        SQLRETURN ODBC_API SQLPrimaryKeys(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName);
-
-        SQLRETURN ODBC_API SQLProcedureColumns(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szProcName,
-            SQLSMALLINT cbProcName,
-            SQLCHAR * szColumnName,
-            SQLSMALLINT cbColumnName);
-
-        SQLRETURN ODBC_API SQLProcedures(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szProcName,
-            SQLSMALLINT cbProcName);
-
-        SQLRETURN ODBC_API SQLTablePrivileges(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName);
-
-        SQLRETURN ODBC_API SQLDrivers(
-            SQLHENV henv,
-            SQLUSMALLINT fDirection,
-            SQLCHAR * szDriverDesc,
-            SQLSMALLINT cbDriverDescMax,
-            SQLSMALLINT * pcbDriverDesc,
-            SQLCHAR * szDriverAttributes,
-            SQLSMALLINT cbDrvrAttrMax,
-            SQLSMALLINT * pcbDrvrAttr);
-
-
-        ///
-        /// inlines
-        ///
-
-        inline bool isString(SQLPOINTER pValue, SQLINTEGER length)
-        {
-            return (SQL_NTS == length || length > 0) && pValue;
-        }
-
-
-        inline SQLINTEGER stringLength(SQLPOINTER pValue, SQLINTEGER length)
-        {
-            if (SQL_NTS != length)
-                return length;
-
-            return (SQLINTEGER)std::strlen((const char *)pValue);
-        }
-
-
-#if !defined(POCO_ODBC_UNICODE)
-
-
-        ///
-        /// inlines
-        ///
-
-        inline SQLRETURN SQLColAttribute(
-            SQLHSTMT hstmt,
-            SQLUSMALLINT iCol,
-            SQLUSMALLINT iField,
-            SQLPOINTER pCharAttr,
-            SQLSMALLINT cbCharAttrMax,
-            SQLSMALLINT * pcbCharAttr,
-            NumAttrPtrType pNumAttr)
-        {
-            return ::SQLColAttributeA(hstmt, iCol, iField, pCharAttr, cbCharAttrMax, pcbCharAttr, pNumAttr);
-        }
-
-
-        inline SQLRETURN SQLColAttributes(
-            SQLHSTMT hstmt,
-            SQLUSMALLINT icol,
-            SQLUSMALLINT fDescType,
-            SQLPOINTER rgbDesc,
-            SQLSMALLINT cbDescMax,
-            SQLSMALLINT * pcbDesc,
-            SQLLEN * pfDesc)
-        {
-            return ::SQLColAttributesA(hstmt, icol, fDescType, rgbDesc, cbDescMax, pcbDesc, pfDesc);
-        }
-
-
-        inline SQLRETURN SQLConnect(
-            SQLHDBC hdbc,
-            SQLCHAR * szDSN,
-            SQLSMALLINT cbDSN,
-            SQLCHAR * szUID,
-            SQLSMALLINT cbUID,
-            SQLCHAR * szAuthStr,
-            SQLSMALLINT cbAuthStr)
-        {
-            return ::SQLConnectA(hdbc, szDSN, cbDSN, szUID, cbUID, szAuthStr, cbAuthStr);
-        }
-
-
-        inline SQLRETURN SQLDescribeCol(
-            SQLHSTMT hstmt,
-            SQLUSMALLINT icol,
-            SQLCHAR * szColName,
-            SQLSMALLINT cbColNameMax,
-            SQLSMALLINT * pcbColName,
-            SQLSMALLINT * pfSqlType,
-            SQLULEN * pcbColDef,
-            SQLSMALLINT * pibScale,
-            SQLSMALLINT * pfNullable)
-        {
-            return ::SQLDescribeColA(hstmt, icol, szColName, cbColNameMax, pcbColName, pfSqlType, pcbColDef, pibScale, pfNullable);
-        }
-
-
-        inline SQLRETURN SQLError(
-            SQLHENV henv,
-            SQLHDBC hdbc,
-            SQLHSTMT hstmt,
-            SQLCHAR * szSqlState,
-            SQLINTEGER * pfNativeError,
-            SQLCHAR * szErrorMsg,
-            SQLSMALLINT cbErrorMsgMax,
-            SQLSMALLINT * pcbErrorMsg)
-        {
-            throw Poco::NotImplementedException("SQLError is obsolete. "
-                                                "Use SQLGetDiagRec instead.");
-        }
-
-
-        inline SQLRETURN SQLExecDirect(SQLHSTMT hstmt, SQLCHAR * szSqlStr, SQLINTEGER cbSqlStr)
-        {
-            return ::SQLExecDirectA(hstmt, szSqlStr, cbSqlStr);
-        }
-
-
-        inline SQLRETURN
-        SQLGetConnectAttr(SQLHDBC hdbc, SQLINTEGER fAttribute, SQLPOINTER rgbValue, SQLINTEGER cbValueMax, SQLINTEGER * pcbValue)
-        {
-            return ::SQLGetConnectAttrA(hdbc, fAttribute, rgbValue, cbValueMax, pcbValue);
-        }
-
-
-        inline SQLRETURN SQLGetCursorName(SQLHSTMT hstmt, SQLCHAR * szCursor, SQLSMALLINT cbCursorMax, SQLSMALLINT * pcbCursor)
-        {
-            throw Poco::NotImplementedException("Not implemented");
-        }
-
-
-        inline SQLRETURN SQLSetDescField(
-            SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, SQLPOINTER Value, SQLINTEGER BufferLength)
-        {
-            return ::SQLSetDescField(DescriptorHandle, RecNumber, FieldIdentifier, Value, BufferLength);
-        }
-
-
-        inline SQLRETURN SQLGetDescField(
-            SQLHDESC hdesc, SQLSMALLINT iRecord, SQLSMALLINT iField, SQLPOINTER rgbValue, SQLINTEGER cbValueMax, SQLINTEGER * pcbValue)
-        {
-            return ::SQLGetDescFieldA(hdesc, iRecord, iField, rgbValue, cbValueMax, pcbValue);
-        }
-
-
-        inline SQLRETURN SQLGetDescRec(
-            SQLHDESC hdesc,
-            SQLSMALLINT iRecord,
-            SQLCHAR * szName,
-            SQLSMALLINT cbNameMax,
-            SQLSMALLINT * pcbName,
-            SQLSMALLINT * pfType,
-            SQLSMALLINT * pfSubType,
-            SQLLEN * pLength,
-            SQLSMALLINT * pPrecision,
-            SQLSMALLINT * pScale,
-            SQLSMALLINT * pNullable)
-        {
-            return ::SQLGetDescRecA(hdesc, iRecord, szName, cbNameMax, pcbName, pfType, pfSubType, pLength, pPrecision, pScale, pNullable);
-        }
-
-
-        inline SQLRETURN SQLGetDiagField(
-            SQLSMALLINT fHandleType,
-            SQLHANDLE handle,
-            SQLSMALLINT iRecord,
-            SQLSMALLINT fDiagField,
-            SQLPOINTER rgbDiagInfo,
-            SQLSMALLINT cbDiagInfoMax,
-            SQLSMALLINT * pcbDiagInfo)
-        {
-            return ::SQLGetDiagFieldA(fHandleType, handle, iRecord, fDiagField, rgbDiagInfo, cbDiagInfoMax, pcbDiagInfo);
-        }
-
-
-        inline SQLRETURN SQLGetDiagRec(
-            SQLSMALLINT fHandleType,
-            SQLHANDLE handle,
-            SQLSMALLINT iRecord,
-            SQLCHAR * szSqlState,
-            SQLINTEGER * pfNativeError,
-            SQLCHAR * szErrorMsg,
-            SQLSMALLINT cbErrorMsgMax,
-            SQLSMALLINT * pcbErrorMsg)
-        {
-            return ::SQLGetDiagRecA(fHandleType, handle, iRecord, szSqlState, pfNativeError, szErrorMsg, cbErrorMsgMax, pcbErrorMsg);
-        }
-
-
-        inline SQLRETURN SQLPrepare(SQLHSTMT hstmt, SQLCHAR * szSqlStr, SQLINTEGER cbSqlStr)
-        {
-            return ::SQLPrepareA(hstmt, szSqlStr, cbSqlStr);
-        }
-
-
-        inline SQLRETURN SQLSetConnectAttr(SQLHDBC hdbc, SQLINTEGER fAttribute, SQLPOINTER rgbValue, SQLINTEGER cbValue)
-        {
-            return ::SQLSetConnectAttrA(hdbc, fAttribute, rgbValue, cbValue);
-        }
-
-
-        inline SQLRETURN SQLSetCursorName(SQLHSTMT hstmt, SQLCHAR * szCursor, SQLSMALLINT cbCursor)
-        {
-            throw Poco::NotImplementedException("Not implemented");
-        }
-
-
-        inline SQLRETURN SQLSetStmtAttr(SQLHSTMT hstmt, SQLINTEGER fAttribute, SQLPOINTER rgbValue, SQLINTEGER cbValueMax)
-        {
-            return ::SQLSetStmtAttr(hstmt, fAttribute, rgbValue, cbValueMax);
-        }
-
-
-        inline SQLRETURN
-        SQLGetStmtAttr(SQLHSTMT hstmt, SQLINTEGER fAttribute, SQLPOINTER rgbValue, SQLINTEGER cbValueMax, SQLINTEGER * pcbValue)
-        {
-            return ::SQLGetStmtAttrA(hstmt, fAttribute, rgbValue, cbValueMax, pcbValue);
-        }
-
-
-        inline SQLRETURN SQLColumns(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName,
-            SQLCHAR * szColumnName,
-            SQLSMALLINT cbColumnName)
-        {
-            return ::SQLColumnsA(
-                hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, cbTableName, szColumnName, cbColumnName);
-        }
-
-
-        inline SQLRETURN SQLGetConnectOption(SQLHDBC hdbc, SQLUSMALLINT fOption, SQLPOINTER pvParam)
-        {
-            return ::SQLGetConnectOptionA(hdbc, fOption, pvParam);
-        }
-
-
-        inline SQLRETURN
-        SQLGetInfo(SQLHDBC hdbc, SQLUSMALLINT fInfoType, SQLPOINTER rgbInfoValue, SQLSMALLINT cbInfoValueMax, SQLSMALLINT * pcbInfoValue)
-        {
-            return ::SQLGetInfoA(hdbc, fInfoType, rgbInfoValue, cbInfoValueMax, pcbInfoValue);
-        }
-
-
-        inline SQLRETURN SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
-        {
-            return ::SQLGetTypeInfoA(StatementHandle, DataType);
-        }
-
-
-        inline SQLRETURN SQLSetConnectOption(SQLHDBC hdbc, SQLUSMALLINT fOption, SQLULEN vParam)
-        {
-            return ::SQLSetConnectOptionA(hdbc, fOption, vParam);
-        }
-
-
-        inline SQLRETURN SQLSpecialColumns(
-            SQLHSTMT hstmt,
-            SQLUSMALLINT fColType,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName,
-            SQLUSMALLINT fScope,
-            SQLUSMALLINT fNullable)
-        {
-            return ::SQLSpecialColumnsA(
-                hstmt, fColType, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, cbTableName, fScope, fNullable);
-        }
-
-
-        inline SQLRETURN SQLStatistics(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName,
-            SQLUSMALLINT fUnique,
-            SQLUSMALLINT fAccuracy)
-        {
-            return ::SQLStatisticsA(
-                hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, cbTableName, fUnique, fAccuracy);
-        }
-
-
-        inline SQLRETURN SQLTables(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName,
-            SQLCHAR * szTableType,
-            SQLSMALLINT cbTableType)
-        {
-            return ::SQLTablesA(
-                hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, cbTableName, szTableType, cbTableType);
-        }
-
-
-        inline SQLRETURN SQLDataSources(
-            SQLHENV henv,
-            SQLUSMALLINT fDirection,
-            SQLCHAR * szDSN,
-            SQLSMALLINT cbDSNMax,
-            SQLSMALLINT * pcbDSN,
-            SQLCHAR * szDescription,
-            SQLSMALLINT cbDescriptionMax,
-            SQLSMALLINT * pcbDescription)
-        {
-            return ::SQLDataSourcesA(henv, fDirection, szDSN, cbDSNMax, pcbDSN, szDescription, cbDescriptionMax, pcbDescription);
-        }
-
-
-        inline SQLRETURN SQLDriverConnect(
-            SQLHDBC hdbc,
-            SQLHWND hwnd,
-            SQLCHAR * szConnStrIn,
-            SQLSMALLINT cbConnStrIn,
-            SQLCHAR * szConnStrOut,
-            SQLSMALLINT cbConnStrOutMax,
-            SQLSMALLINT * pcbConnStrOut,
-            SQLUSMALLINT fDriverCompletion)
-        {
-            return ::SQLDriverConnectA(
-                hdbc, hwnd, szConnStrIn, cbConnStrIn, szConnStrOut, cbConnStrOutMax, pcbConnStrOut, fDriverCompletion);
-        }
-
-
-        inline SQLRETURN SQLBrowseConnect(
-            SQLHDBC hdbc,
-            SQLCHAR * szConnStrIn,
-            SQLSMALLINT cbConnStrIn,
-            SQLCHAR * szConnStrOut,
-            SQLSMALLINT cbConnStrOutMax,
-            SQLSMALLINT * pcbConnStrOut)
-        {
-            return ::SQLBrowseConnectA(hdbc, szConnStrIn, cbConnStrIn, szConnStrOut, cbConnStrOutMax, pcbConnStrOut);
-        }
-
-
-        inline SQLRETURN SQLColumnPrivileges(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName,
-            SQLCHAR * szColumnName,
-            SQLSMALLINT cbColumnName)
-        {
-            return ::SQLColumnPrivilegesA(
-                hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, cbTableName, szColumnName, cbColumnName);
-        }
-
-
-        inline SQLRETURN SQLForeignKeys(
-            SQLHSTMT hstmt,
-            SQLCHAR * szPkCatalogName,
-            SQLSMALLINT cbPkCatalogName,
-            SQLCHAR * szPkSchemaName,
-            SQLSMALLINT cbPkSchemaName,
-            SQLCHAR * szPkTableName,
-            SQLSMALLINT cbPkTableName,
-            SQLCHAR * szFkCatalogName,
-            SQLSMALLINT cbFkCatalogName,
-            SQLCHAR * szFkSchemaName,
-            SQLSMALLINT cbFkSchemaName,
-            SQLCHAR * szFkTableName,
-            SQLSMALLINT cbFkTableName)
-        {
-            return ::SQLForeignKeysA(
-                hstmt,
-                szPkCatalogName,
-                cbPkCatalogName,
-                szPkSchemaName,
-                cbPkSchemaName,
-                szPkTableName,
-                cbPkTableName,
-                szFkCatalogName,
-                cbFkCatalogName,
-                szFkSchemaName,
-                cbFkSchemaName,
-                szFkTableName,
-                cbFkTableName);
-        }
-
-
-        inline SQLRETURN SQLNativeSql(
-            SQLHDBC hdbc, SQLCHAR * szSqlStrIn, SQLINTEGER cbSqlStrIn, SQLCHAR * szSqlStr, SQLINTEGER cbSqlStrMax, SQLINTEGER * pcbSqlStr)
-        {
-            return ::SQLNativeSqlA(hdbc, szSqlStrIn, cbSqlStrIn, szSqlStr, cbSqlStrMax, pcbSqlStr);
-        }
-
-
-        inline SQLRETURN SQLPrimaryKeys(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName)
-        {
-            return ::SQLPrimaryKeysA(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, cbTableName);
-        }
-
-
-        inline SQLRETURN SQLProcedureColumns(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szProcName,
-            SQLSMALLINT cbProcName,
-            SQLCHAR * szColumnName,
-            SQLSMALLINT cbColumnName)
-        {
-            return ::SQLProcedureColumnsA(
-                hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szProcName, cbProcName, szColumnName, cbColumnName);
-        }
-
-
-        inline SQLRETURN SQLProcedures(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szProcName,
-            SQLSMALLINT cbProcName)
-        {
-            return ::SQLProceduresA(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szProcName, cbProcName);
-        }
-
-
-        inline SQLRETURN SQLTablePrivileges(
-            SQLHSTMT hstmt,
-            SQLCHAR * szCatalogName,
-            SQLSMALLINT cbCatalogName,
-            SQLCHAR * szSchemaName,
-            SQLSMALLINT cbSchemaName,
-            SQLCHAR * szTableName,
-            SQLSMALLINT cbTableName)
-        {
-            return ::SQLTablePrivilegesA(hstmt, szCatalogName, cbCatalogName, szSchemaName, cbSchemaName, szTableName, cbTableName);
-        }
-
-
-        inline SQLRETURN SQLDrivers(
-            SQLHENV henv,
-            SQLUSMALLINT fDirection,
-            SQLCHAR * szDriverDesc,
-            SQLSMALLINT cbDriverDescMax,
-            SQLSMALLINT * pcbDriverDesc,
-            SQLCHAR * szDriverAttributes,
-            SQLSMALLINT cbDrvrAttrMax,
-            SQLSMALLINT * pcbDrvrAttr)
-        {
-            return ::SQLDriversA(
-                henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, szDriverAttributes, cbDrvrAttrMax, pcbDrvrAttr);
-        }
-
-
-#endif // POCO_ODBC_UNICODE
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif // ODBC_Unicode_INCLUDED
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h
deleted file mode 100644
index f4efbf82b..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// Unicode.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Unicode
-//
-// Definition of Unicode_UNIX.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Unicode_UNIX_INCLUDED
-#define Data_ODBC_Unicode_UNIX_INCLUDED
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        void makeUTF16(SQLCHAR * pSQLChar, SQLINTEGER length, std::string & target);
-        /// Utility function for conversion from UTF-8 to UTF-16
-
-
-        inline void makeUTF16(SQLCHAR * pSQLChar, SQLSMALLINT length, std::string & target)
-        /// Utility function for conversion from UTF-8 to UTF-16.
-        {
-            makeUTF16(pSQLChar, (SQLINTEGER)length, target);
-        }
-
-
-        void makeUTF8(Poco::Buffer<SQLWCHAR> & buffer, SQLINTEGER length, SQLPOINTER pTarget, SQLINTEGER targetLength);
-        /// Utility function for conversion from UTF-16 to UTF-8.
-
-
-        inline void makeUTF8(Poco::Buffer<SQLWCHAR> & buffer, int length, SQLPOINTER pTarget, SQLSMALLINT targetLength)
-        /// Utility function for conversion from UTF-16 to UTF-8.
-        {
-            makeUTF8(buffer, length, pTarget, (SQLINTEGER)targetLength);
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif // Data_ODBC_Unicode_UNIX_INCLUDED
diff --git a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Utility.h b/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Utility.h
deleted file mode 100644
index 14727005b..000000000
--- a/contrib/poco/Data/ODBC/include/Poco/Data/ODBC/Utility.h
+++ /dev/null
@@ -1,224 +0,0 @@
-//
-// Utility.h
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Utility
-//
-// Definition of Utility.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ODBC_Utility_INCLUDED
-#define Data_ODBC_Utility_INCLUDED
-
-
-#include <map>
-#include <sstream>
-#include <sqltypes.h>
-#include "Poco/Data/Date.h"
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/TypeInfo.h"
-#include "Poco/Data/Time.h"
-#include "Poco/DateTime.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-    namespace ODBC
-    {
-
-
-        class ODBC_API Utility
-        /// Various utility functions
-        {
-        public:
-            typedef std::map<std::string, std::string> DSNMap;
-            typedef DSNMap DriverMap;
-
-            static bool isError(SQLRETURN rc);
-            /// Returns true if return code is error
-
-            static DriverMap & drivers(DriverMap & driverMap);
-            /// Returns driver-attributes map of available ODBC drivers.
-
-            static DSNMap & dataSources(DSNMap & dsnMap);
-            /// Returns DSN-description map of available ODBC data sources.
-
-            template <typename MapType, typename KeyArgType, typename ValueArgType>
-            static typename MapType::iterator mapInsert(MapType & m, const KeyArgType & k, const ValueArgType & v)
-            /// Utility map "insert or replace" function (from S. Meyers: Effective STL, Item 24)
-            {
-                typename MapType::iterator lb = m.lower_bound(k);
-                if (lb != m.end() && !(m.key_comp()(k, lb->first)))
-                {
-                    lb->second = v;
-                    return lb;
-                }
-                else
-                {
-                    typedef typename MapType::value_type MVT;
-                    return m.insert(lb, MVT(k, v));
-                }
-            }
-
-            static int cDataType(int sqlDataType);
-            /// Returns C data type corresponding to supplied SQL data type.
-
-            static int sqlDataType(int cDataType);
-            /// Returns SQL data type corresponding to supplied C data type.
-
-            static void dateSync(Date & dt, const SQL_DATE_STRUCT & ts);
-            /// Transfers data from ODBC SQL_DATE_STRUCT to Poco::DateTime.
-
-            template <typename T, typename F>
-            static void dateSync(T & d, const F & ds)
-            /// Transfers data from ODBC SQL_DATE_STRUCT container to Poco::DateTime container.
-            {
-                std::size_t size = ds.size();
-                if (d.size() != size)
-                    d.resize(size);
-                typename T::iterator dIt = d.begin();
-                typename F::const_iterator it = ds.begin();
-                typename F::const_iterator end = ds.end();
-                for (; it != end; ++it, ++dIt)
-                    dateSync(*dIt, *it);
-            }
-
-            static void timeSync(Time & dt, const SQL_TIME_STRUCT & ts);
-            /// Transfers data from ODBC SQL_TIME_STRUCT to Poco::DateTime.
-
-            template <typename T, typename F>
-            static void timeSync(T & t, const F & ts)
-            /// Transfers data from ODBC SQL_TIME_STRUCT container to Poco::DateTime container.
-            {
-                std::size_t size = ts.size();
-                if (t.size() != size)
-                    t.resize(size);
-                typename T::iterator dIt = t.begin();
-                typename F::const_iterator it = ts.begin();
-                typename F::const_iterator end = ts.end();
-                for (; it != end; ++it, ++dIt)
-                    timeSync(*dIt, *it);
-            }
-
-            static void dateTimeSync(Poco::DateTime & dt, const SQL_TIMESTAMP_STRUCT & ts);
-            /// Transfers data from ODBC SQL_TIMESTAMP_STRUCT to Poco::DateTime.
-
-            template <typename T, typename F>
-            static void dateTimeSync(T & dt, const F & ts)
-            /// Transfers data from ODBC SQL_TIMESTAMP_STRUCT container to Poco::DateTime container.
-            {
-                std::size_t size = ts.size();
-                if (dt.size() != size)
-                    dt.resize(size);
-                typename T::iterator dIt = dt.begin();
-                typename F::const_iterator it = ts.begin();
-                typename F::const_iterator end = ts.end();
-                for (; it != end; ++it, ++dIt)
-                    dateTimeSync(*dIt, *it);
-            }
-
-            static void dateSync(SQL_DATE_STRUCT & ts, const Date & dt);
-            /// Transfers data from Poco::Data::Date to ODBC SQL_DATE_STRUCT.
-
-            template <typename C>
-            static void dateSync(std::vector<SQL_DATE_STRUCT> & ds, const C & d)
-            /// Transfers data from Poco::Data::Date vector to ODBC SQL_DATE_STRUCT container.
-            {
-                std::size_t size = d.size();
-                if (ds.size() != size)
-                    ds.resize(size);
-                std::vector<SQL_DATE_STRUCT>::iterator dIt = ds.begin();
-                typename C::const_iterator it = d.begin();
-                typename C::const_iterator end = d.end();
-                for (; it != end; ++it, ++dIt)
-                    dateSync(*dIt, *it);
-            }
-
-            static void timeSync(SQL_TIME_STRUCT & ts, const Time & dt);
-            /// Transfers data from Poco::Data::Time to ODBC SQL_TIME_STRUCT.
-
-            template <typename C>
-            static void timeSync(std::vector<SQL_TIME_STRUCT> & ts, const C & t)
-            /// Transfers data from Poco::Data::Time container to ODBC SQL_TIME_STRUCT vector.
-            {
-                std::size_t size = t.size();
-                if (ts.size() != size)
-                    ts.resize(size);
-                std::vector<SQL_TIME_STRUCT>::iterator tIt = ts.begin();
-                typename C::const_iterator it = t.begin();
-                typename C::const_iterator end = t.end();
-                for (; it != end; ++it, ++tIt)
-                    timeSync(*tIt, *it);
-            }
-
-            static void dateTimeSync(SQL_TIMESTAMP_STRUCT & ts, const Poco::DateTime & dt);
-            /// Transfers data from Poco::DateTime to ODBC SQL_TIMESTAMP_STRUCT.
-
-            template <typename C>
-            static void dateTimeSync(std::vector<SQL_TIMESTAMP_STRUCT> & ts, const C & dt)
-            /// Transfers data from Poco::DateTime to ODBC SQL_TIMESTAMP_STRUCT.
-            {
-                std::size_t size = dt.size();
-                if (ts.size() != size)
-                    ts.resize(size);
-                std::vector<SQL_TIMESTAMP_STRUCT>::iterator tIt = ts.begin();
-                typename C::const_iterator it = dt.begin();
-                typename C::const_iterator end = dt.end();
-                for (; it != end; ++it, ++tIt)
-                    dateTimeSync(*tIt, *it);
-            }
-
-        private:
-            static const TypeInfo _dataTypes;
-            /// C <==> SQL data type mapping
-        };
-
-
-        ///
-        /// inlines
-        ///
-        inline bool Utility::isError(SQLRETURN rc)
-        {
-            return (0 != (rc & (~1)));
-        }
-
-
-        inline int Utility::cDataType(int sqlDataType)
-        {
-            return _dataTypes.cDataType(sqlDataType);
-        }
-
-
-        inline int Utility::sqlDataType(int cDataType)
-        {
-            return _dataTypes.sqlDataType(cDataType);
-        }
-
-
-        inline void Utility::dateSync(Date & d, const SQL_DATE_STRUCT & ts)
-        {
-            d.assign(ts.year, ts.month, ts.day);
-        }
-
-
-        inline void Utility::timeSync(Time & t, const SQL_TIME_STRUCT & ts)
-        {
-            t.assign(ts.hour, ts.minute, ts.second);
-        }
-
-
-    }
-}
-} // namespace Poco::Data::ODBC
-
-
-#endif
diff --git a/contrib/poco/Data/ODBC/src/Binder.cpp b/contrib/poco/Data/ODBC/src/Binder.cpp
deleted file mode 100644
index 7e99f71dc..000000000
--- a/contrib/poco/Data/ODBC/src/Binder.cpp
+++ /dev/null
@@ -1,529 +0,0 @@
-//
-// Binder.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Binder
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/Binder.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Data/ODBC/Connector.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-#include "Poco/DateTime.h"
-#include "Poco/Exception.h"
-#include <sql.h>
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-Binder::Binder(const StatementHandle& rStmt,
-	std::size_t maxFieldSize,
-	Binder::ParameterBinding dataBinding,
-	TypeInfo* pDataTypes):
-	_rStmt(rStmt),
-	_paramBinding(dataBinding),
-	_pTypeInfo(pDataTypes),
-	_paramSetSize(0),
-	_maxFieldSize(maxFieldSize)
-{
-}
-
-
-Binder::~Binder()
-{
-	freeMemory();
-}
-
-
-void Binder::freeMemory()
-{
-	LengthPtrVec::iterator itLen = _lengthIndicator.begin();
-	LengthPtrVec::iterator itLenEnd = _lengthIndicator.end();
-	for(; itLen != itLenEnd; ++itLen) delete *itLen;
-
-	LengthVecVec::iterator itVecLen = _vecLengthIndicator.begin();
-	LengthVecVec::iterator itVecLenEnd = _vecLengthIndicator.end();
-	for (; itVecLen != itVecLenEnd; ++itVecLen) delete *itVecLen;
-
-	TimeMap::iterator itT = _times.begin();
-	TimeMap::iterator itTEnd = _times.end();
-	for(; itT != itTEnd; ++itT) delete itT->first;
-
-	DateMap::iterator itD = _dates.begin();
-	DateMap::iterator itDEnd = _dates.end();
-	for(; itD != itDEnd; ++itD) delete itD->first;
-
-	TimestampMap::iterator itTS = _timestamps.begin();
-	TimestampMap::iterator itTSEnd = _timestamps.end();
-	for(; itTS != itTSEnd; ++itTS) delete itTS->first;
-
-	StringMap::iterator itStr = _strings.begin();
-	StringMap::iterator itStrEnd = _strings.end();
-	for(; itStr != itStrEnd; ++itStr) std::free(itStr->first);
-
-	CharPtrVec::iterator itChr = _charPtrs.begin();
-	CharPtrVec::iterator endChr = _charPtrs.end();
-	for (; itChr != endChr; ++itChr) std::free(*itChr);
-
-	UTF16CharPtrVec::iterator itUTF16Chr = _utf16CharPtrs.begin();
-	UTF16CharPtrVec::iterator endUTF16Chr = _utf16CharPtrs.end();
-	for (; itUTF16Chr != endUTF16Chr; ++itUTF16Chr) std::free(*itUTF16Chr);
-
-	BoolPtrVec::iterator itBool = _boolPtrs.begin();
-	BoolPtrVec::iterator endBool = _boolPtrs.end();
-	for (; itBool != endBool; ++itBool) delete [] *itBool;
-
-	DateVecVec::iterator itDateVec = _dateVecVec.begin();
-	DateVecVec::iterator itDateVecEnd = _dateVecVec.end();
-	for (; itDateVec != itDateVecEnd; ++itDateVec) delete *itDateVec;
-
-	TimeVecVec::iterator itTimeVec = _timeVecVec.begin();
-	TimeVecVec::iterator itTimeVecEnd = _timeVecVec.end();
-	for (; itTimeVec != itTimeVecEnd; ++itTimeVec) delete *itTimeVec;
-
-	DateTimeVecVec::iterator itDateTimeVec = _dateTimeVecVec.begin();
-	DateTimeVecVec::iterator itDateTimeVecEnd = _dateTimeVecVec.end();
-	for (; itDateTimeVec != itDateTimeVecEnd; ++itDateTimeVec) delete *itDateTimeVec;
-}
-
-
-void Binder::bind(std::size_t pos, const std::string& val, Direction dir)
-{
-	SQLPOINTER pVal = 0;
-	SQLINTEGER size = (SQLINTEGER) val.size();
-	SQLINTEGER colSize = 0;
-	SQLSMALLINT decDigits = 0;
-	getColSizeAndPrecision(pos, SQL_C_CHAR, colSize, decDigits, val.size());
-
-	if (isOutBound(dir))
-	{
-		getColumnOrParameterSize(pos, size);
-		char* pChar = (char*) std::calloc(size, sizeof(char));
-		pVal = (SQLPOINTER) pChar;
-		_outParams.insert(ParamMap::value_type(pVal, size));
-		_strings.insert(StringMap::value_type(pChar, const_cast<std::string*>(&val)));
-	}
-	else if (isInBound(dir))
-	{
-		pVal = (SQLPOINTER) val.c_str();
-		_inParams.insert(ParamMap::value_type(pVal, size));
-	}
-	else
-		throw InvalidArgumentException("Parameter must be [in] OR [out] bound.");
-
-	SQLLEN* pLenIn = new SQLLEN(SQL_NTS);
-
-	if (PB_AT_EXEC == _paramBinding)
-		*pLenIn = SQL_LEN_DATA_AT_EXEC(size);
-
-	_lengthIndicator.push_back(pLenIn);
-
-	if (Utility::isError(SQLBindParameter(_rStmt, 
-		(SQLUSMALLINT) pos + 1, 
-		toODBCDirection(dir), 
-		SQL_C_CHAR, 
-		Connector::stringBoundToLongVarChar() ? SQL_LONGVARCHAR : SQL_VARCHAR, 
-		(SQLUINTEGER) colSize,
-		0,
-		pVal, 
-		(SQLINTEGER) size, 
-		_lengthIndicator.back())))
-	{
-		throw StatementException(_rStmt, "SQLBindParameter(std::string)");
-	}
-}
-
-
-void Binder::bind(std::size_t pos, const UTF16String& val, Direction dir)
-{
-	typedef UTF16String::value_type CharT;
-
-	SQLPOINTER pVal = 0;
-	SQLINTEGER size = (SQLINTEGER)(val.size() * sizeof(CharT));
-	SQLINTEGER colSize = 0;
-	SQLSMALLINT decDigits = 0;
-	getColSizeAndPrecision(pos, SQL_C_WCHAR, colSize, decDigits);
-
-	if (isOutBound(dir))
-	{
-		getColumnOrParameterSize(pos, size);
-		CharT* pChar = (CharT*)std::calloc(size, 1);
-		pVal = (SQLPOINTER)pChar;
-		_outParams.insert(ParamMap::value_type(pVal, size));
-		_utf16Strings.insert(UTF16StringMap::value_type(pChar, const_cast<UTF16String*>(&val)));
-	}
-	else if (isInBound(dir))
-	{
-		pVal = (SQLPOINTER)val.c_str();
-		_inParams.insert(ParamMap::value_type(pVal, size));
-	}
-	else
-		throw InvalidArgumentException("Parameter must be [in] OR [out] bound.");
-
-	SQLLEN* pLenIn = new SQLLEN(SQL_NTS);
-
-	if (PB_AT_EXEC == _paramBinding)
-	{
-		*pLenIn = SQL_LEN_DATA_AT_EXEC(size);
-	}
-
-	_lengthIndicator.push_back(pLenIn);
-
-	if (Utility::isError(SQLBindParameter(_rStmt,
-		(SQLUSMALLINT)pos + 1,
-		toODBCDirection(dir),
-		SQL_C_WCHAR,
-		SQL_WLONGVARCHAR,
-		(SQLUINTEGER)colSize,
-		0,
-		pVal,
-		(SQLINTEGER)size,
-		_lengthIndicator.back())))
-	{
-		throw StatementException(_rStmt, "SQLBindParameter(std::string)");
-	}
-}
-
-
-void Binder::bind(std::size_t pos, const Date& val, Direction dir)
-{
-	SQLINTEGER size = (SQLINTEGER) sizeof(SQL_DATE_STRUCT);
-	SQLLEN* pLenIn = new SQLLEN;
-	*pLenIn  = size;
-
-	_lengthIndicator.push_back(pLenIn);
-
-	SQL_DATE_STRUCT* pDS = new SQL_DATE_STRUCT;
-	Utility::dateSync(*pDS, val);
-	
-	_dates.insert(DateMap::value_type(pDS, const_cast<Date*>(&val)));
-
-	SQLINTEGER colSize = 0;
-	SQLSMALLINT decDigits = 0;
-	getColSizeAndPrecision(pos, SQL_TYPE_DATE, colSize, decDigits);
-
-	if (Utility::isError(SQLBindParameter(_rStmt, 
-		(SQLUSMALLINT) pos + 1, 
-		toODBCDirection(dir), 
-		SQL_C_TYPE_DATE, 
-		SQL_TYPE_DATE, 
-		colSize,
-		decDigits,
-		(SQLPOINTER) pDS, 
-		0, 
-		_lengthIndicator.back())))
-	{
-		throw StatementException(_rStmt, "SQLBindParameter(Date)");
-	}
-}
-
-
-void Binder::bind(std::size_t pos, const Time& val, Direction dir)
-{
-	SQLINTEGER size = (SQLINTEGER) sizeof(SQL_TIME_STRUCT);
-	SQLLEN* pLenIn = new SQLLEN;
-	*pLenIn  = size;
-
-	_lengthIndicator.push_back(pLenIn);
-
-	SQL_TIME_STRUCT* pTS = new SQL_TIME_STRUCT;
-	Utility::timeSync(*pTS, val);
-	
-	_times.insert(TimeMap::value_type(pTS, const_cast<Time*>(&val)));
-
-	SQLINTEGER colSize = 0;
-	SQLSMALLINT decDigits = 0;
-	getColSizeAndPrecision(pos, SQL_TYPE_TIME, colSize, decDigits);
-
-	if (Utility::isError(SQLBindParameter(_rStmt, 
-		(SQLUSMALLINT) pos + 1, 
-		toODBCDirection(dir), 
-		SQL_C_TYPE_TIME, 
-		SQL_TYPE_TIME, 
-		colSize,
-		decDigits,
-		(SQLPOINTER) pTS, 
-		0, 
-		_lengthIndicator.back())))
-	{
-		throw StatementException(_rStmt, "SQLBindParameter(Time)");
-	}
-}
-
-
-void Binder::bind(std::size_t pos, const Poco::DateTime& val, Direction dir)
-{
-	SQLINTEGER size = (SQLINTEGER) sizeof(SQL_TIMESTAMP_STRUCT);
-	SQLLEN* pLenIn = new SQLLEN;
-	*pLenIn  = size;
-
-	_lengthIndicator.push_back(pLenIn);
-
-	SQL_TIMESTAMP_STRUCT* pTS = new SQL_TIMESTAMP_STRUCT;
-	Utility::dateTimeSync(*pTS, val);
-
-	_timestamps.insert(TimestampMap::value_type(pTS, const_cast<DateTime*>(&val)));
-
-	SQLINTEGER colSize = 0;
-	SQLSMALLINT decDigits = 0;
-	getColSizeAndPrecision(pos, SQL_TYPE_TIMESTAMP, colSize, decDigits);
-
-	if (Utility::isError(SQLBindParameter(_rStmt, 
-		(SQLUSMALLINT) pos + 1, 
-		toODBCDirection(dir), 
-		SQL_C_TYPE_TIMESTAMP, 
-		SQL_TYPE_TIMESTAMP, 
-		colSize,
-		decDigits,
-		(SQLPOINTER) pTS, 
-		0, 
-		_lengthIndicator.back())))
-	{
-		throw StatementException(_rStmt, "SQLBindParameter(DateTime)");
-	}
-}
-
-
-void Binder::bind(std::size_t pos, const NullData& val, Direction dir)
-{
-	if (isOutBound(dir) || !isInBound(dir))
-		throw NotImplementedException("NULL parameter type can only be inbound.");
-
-	_inParams.insert(ParamMap::value_type(SQLPOINTER(0), SQLINTEGER(0)));
-
-	SQLLEN* pLenIn = new SQLLEN;
-	*pLenIn  = SQL_NULL_DATA;
-
-	_lengthIndicator.push_back(pLenIn);
-
-	SQLINTEGER colSize = 0;
-	SQLSMALLINT decDigits = 0;
-	getColSizeAndPrecision(pos, SQL_C_STINYINT, colSize, decDigits);
-
-	if (Utility::isError(SQLBindParameter(_rStmt, 
-		(SQLUSMALLINT) pos + 1, 
-		SQL_PARAM_INPUT, 
-		SQL_C_STINYINT, 
-		Utility::sqlDataType(SQL_C_STINYINT), 
-		colSize,
-		decDigits,
-		0, 
-		0, 
-		_lengthIndicator.back())))
-	{
-		throw StatementException(_rStmt, "SQLBindParameter()");
-	}
-}
-
-
-std::size_t Binder::parameterSize(SQLPOINTER pAddr) const
-{
-	ParamMap::const_iterator it = _inParams.find(pAddr);
-	if (it != _inParams.end()) return it->second;
-
-	it = _outParams.find(pAddr);
-	if (it != _outParams.end()) return it->second;
-	
-	throw NotFoundException("Requested data size not found.");
-}
-
-
-void Binder::bind(std::size_t pos, const char* const &pVal, Direction dir)
-{
-	throw NotImplementedException("char* binding not implemented, Use std::string instead.");
-}
-
-
-SQLSMALLINT Binder::toODBCDirection(Direction dir) const
-{
-	bool in = isInBound(dir);
-	bool out = isOutBound(dir);
-	SQLSMALLINT ioType = SQL_PARAM_TYPE_UNKNOWN;
-	if (in && out) ioType = SQL_PARAM_INPUT_OUTPUT; 
-	else if(in)    ioType = SQL_PARAM_INPUT;
-	else if(out)   ioType = SQL_PARAM_OUTPUT;
-	else throw Poco::IllegalStateException("Binder not bound (must be [in] OR [out]).");
-
-	return ioType;
-}
-
-
-void Binder::synchronize()
-{
-	if (_dates.size())
-	{
-		DateMap::iterator it = _dates.begin();
-		DateMap::iterator end = _dates.end();
-		for(; it != end; ++it) 
-			Utility::dateSync(*it->second, *it->first);
-	}
-
-	if (_times.size())
-	{
-		TimeMap::iterator it = _times.begin();
-		TimeMap::iterator end = _times.end();
-		for(; it != end; ++it) 
-			Utility::timeSync(*it->second, *it->first);
-	}
-
-	if (_timestamps.size())
-	{
-		TimestampMap::iterator it = _timestamps.begin();
-		TimestampMap::iterator end = _timestamps.end();
-		for(; it != end; ++it) 
-			Utility::dateTimeSync(*it->second, *it->first);
-	}
-
-	if (_strings.size())
-	{
-		StringMap::iterator it = _strings.begin();
-		StringMap::iterator end = _strings.end();
-		for(; it != end; ++it)
-			it->second->assign(it->first, std::strlen(it->first));
-	}
-}
-
-
-void Binder::reset()
-{
-	freeMemory();
-	LengthPtrVec().swap(_lengthIndicator);
-	_inParams.clear();
-	_outParams.clear();
-	_dates.clear();
-	_times.clear();
-	_timestamps.clear();
-	_strings.clear();
-	_dateVecVec.clear();
-	_timeVecVec.clear();
-	_dateTimeVecVec.clear();
-	_charPtrs.clear();
-	_boolPtrs.clear();
-	_containers.clear();
-	_paramSetSize = 0;
-}
-
-
-void Binder::getColSizeAndPrecision(std::size_t pos, 
-	SQLSMALLINT cDataType, 
-	SQLINTEGER& colSize, 
-	SQLSMALLINT& decDigits,
-	std::size_t actualSize)
-{
-	// Not all drivers are equally willing to cooperate in this matter.
-	// Hence the funky flow control.
-	DynamicAny tmp;
-	bool found(false);
-	if (_pTypeInfo)
-	{
-		found = _pTypeInfo->tryGetInfo(cDataType, "COLUMN_SIZE", tmp);
-		if (found) colSize = tmp;
-		if (actualSize > colSize)
-		{
-			throw LengthExceededException(Poco::format("Error binding column %z size=%z, max size=%ld)",
-					pos, actualSize, static_cast<long>(colSize)));
-		}
-		found = _pTypeInfo->tryGetInfo(cDataType, "MINIMUM_SCALE", tmp);
-		if (found)
-		{
-			decDigits = tmp;
-			return;
-		}
-	}
-
-	try
-	{
-		Parameter p(_rStmt, pos);
-		colSize = (SQLINTEGER) p.columnSize();
-		decDigits = (SQLSMALLINT) p.decimalDigits();
-		return;
-	} 
-	catch (StatementException&)
-	{ 
-	}
-
-	try
-	{
-		ODBCMetaColumn c(_rStmt, pos);
-		colSize = (SQLINTEGER) c.length();
-		decDigits = (SQLSMALLINT) c.precision();
-		return;
-	} 
-	catch (StatementException&) 
-	{ 
-	}
-
-	// last check, just in case
-	if ((0 != colSize) && (actualSize > colSize))
-	{
-		throw LengthExceededException(Poco::format("Error binding column %z size=%z, max size=%ld)",
-				pos, actualSize, static_cast<long>(colSize)));
-	}
-
-	// no success, set to zero and hope for the best
-	// (most drivers do not require these most of the times anyway)
-	colSize = 0;
-	decDigits = 0;
-	return;
-}
-
-
-void Binder::getColumnOrParameterSize(std::size_t pos, SQLINTEGER& size)
-{
-	std::size_t colSize = 0;
-	std::size_t paramSize = 0;
-
-	try
-	{
-		ODBCMetaColumn col(_rStmt, pos);
-		colSize = col.length();
-	}
-	catch (StatementException&) { }
-
-	try
-	{
-		Parameter p(_rStmt, pos);
-		paramSize = p.columnSize();
-	}
-	catch (StatementException&)
-	{
-		size = DEFAULT_PARAM_SIZE;
-//On Linux, PostgreSQL driver segfaults on SQLGetDescField, so this is disabled for now
-	}
-
-	if (colSize > 0 && paramSize > 0)
-		size = colSize < paramSize ? static_cast<SQLINTEGER>(colSize) : static_cast<SQLINTEGER>(paramSize);
-	else if (colSize > 0)
-		size = static_cast<SQLINTEGER>(colSize);
-	else if (paramSize > 0)
-		size = static_cast<SQLINTEGER>(paramSize);
-
-	if (size > _maxFieldSize) size = static_cast<SQLINTEGER>(_maxFieldSize);
-}
-
-
-void Binder::setParamSetSize(std::size_t length)
-{
-	if (0 == _paramSetSize)
-	{
-		if (Utility::isError(Poco::Data::ODBC::SQLSetStmtAttr(_rStmt, SQL_ATTR_PARAM_BIND_TYPE, SQL_PARAM_BIND_BY_COLUMN, SQL_IS_UINTEGER)) ||  
-			Utility::isError(Poco::Data::ODBC::SQLSetStmtAttr(_rStmt, SQL_ATTR_PARAMSET_SIZE, (SQLPOINTER) length, SQL_IS_UINTEGER)))
-				throw StatementException(_rStmt, "SQLSetStmtAttr()");
-
-		_paramSetSize = static_cast<SQLINTEGER>(length);
-	}
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/ConnectionHandle.cpp b/contrib/poco/Data/ODBC/src/ConnectionHandle.cpp
deleted file mode 100644
index 065031bb4..000000000
--- a/contrib/poco/Data/ODBC/src/ConnectionHandle.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// ConnectionHandle.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  ConnectionHandle
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/ConnectionHandle.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-ConnectionHandle::ConnectionHandle(EnvironmentHandle* pEnvironment): 
-	_pEnvironment(pEnvironment ? pEnvironment : new EnvironmentHandle),
-	_hdbc(SQL_NULL_HDBC), 
-	_ownsEnvironment(pEnvironment ? false : true)
-{
-	if (Utility::isError(SQLAllocHandle(SQL_HANDLE_DBC, 
-		_pEnvironment->handle(), 
-		&_hdbc))) 
-	{
-		throw ODBCException("Could not allocate connection handle.");
-	}
-}
-
-
-ConnectionHandle::~ConnectionHandle()
-{
-	try
-	{
-		SQLDisconnect(_hdbc);
-		SQLRETURN rc = SQLFreeHandle(SQL_HANDLE_DBC, _hdbc);
-
-		if (_ownsEnvironment) delete _pEnvironment;
-
-		poco_assert (!Utility::isError(rc));
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/Connector.cpp b/contrib/poco/Data/ODBC/src/Connector.cpp
deleted file mode 100644
index 9fb71822b..000000000
--- a/contrib/poco/Data/ODBC/src/Connector.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Connector.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Connector
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/Connector.h"
-#include "Poco/Data/ODBC/SessionImpl.h"
-#include "Poco/Data/SessionFactory.h"
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-const std::string Connector::KEY("ODBC");
-bool Connector::_bindStringToLongVarChar(true);
-
-
-Connector::Connector()
-{
-}
-
-
-Connector::~Connector()
-{
-}
-
-
-Poco::AutoPtr<Poco::Data::SessionImpl> Connector::createSession(const std::string& connectionString,
-	std::size_t timeout)
-{
-	return Poco::AutoPtr<Poco::Data::SessionImpl>(new SessionImpl(connectionString, timeout));
-}
-
-
-void Connector::registerConnector()
-{
-	Poco::Data::SessionFactory::instance().add(new Connector());
-}
-
-
-void Connector::unregisterConnector()
-{
-	Poco::Data::SessionFactory::instance().remove(KEY);
-}
-
-
-void Connector::bindStringToLongVarChar(bool flag)
-{
-	_bindStringToLongVarChar = flag;
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/EnvironmentHandle.cpp b/contrib/poco/Data/ODBC/src/EnvironmentHandle.cpp
deleted file mode 100644
index 61ce83f3d..000000000
--- a/contrib/poco/Data/ODBC/src/EnvironmentHandle.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// EnvironmentHandle.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  EnvironmentHandle
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/EnvironmentHandle.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-EnvironmentHandle::EnvironmentHandle(): _henv(SQL_NULL_HENV)
-{
-	if (Utility::isError(SQLAllocHandle(SQL_HANDLE_ENV, 
-			SQL_NULL_HANDLE, 
-			&_henv)) ||
-		Utility::isError(SQLSetEnvAttr(_henv, 
-			SQL_ATTR_ODBC_VERSION, 
-			(SQLPOINTER) SQL_OV_ODBC3, 
-			0)))
-	{
-		throw ODBCException("Could not initialize environment.");
-	}
-}
-
-
-EnvironmentHandle::~EnvironmentHandle()
-{
-	try
-	{
-		SQLRETURN rc = SQLFreeHandle(SQL_HANDLE_ENV, _henv);
-		poco_assert (!Utility::isError(rc));
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/Extractor.cpp b/contrib/poco/Data/ODBC/src/Extractor.cpp
deleted file mode 100644
index ba3c2634a..000000000
--- a/contrib/poco/Data/ODBC/src/Extractor.cpp
+++ /dev/null
@@ -1,1312 +0,0 @@
-//
-// Extractor.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Extractor
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/Extractor.h"
-#include "Poco/Data/ODBC/ODBCMetaColumn.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/Buffer.h"
-#include "Poco/Exception.h"
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-const std::string Extractor::FLD_SIZE_EXCEEDED_FMT = "Specified data size (%z bytes) "
-	"exceeds maximum value (%z).\n"
-	"Use Session.setProperty(\"maxFieldSize\", value) "
-	"to increase the maximum allowed data size\n";
-
-
-Extractor::Extractor(const StatementHandle& rStmt, 
-	Preparator::Ptr pPreparator): 
-	_rStmt(rStmt), 
-	_pPreparator(pPreparator),
-	_dataExtraction(pPreparator->getDataExtraction())
-{
-}
-
-
-Extractor::~Extractor()
-{
-}
-
-
-template<>
-bool Extractor::extractBoundImpl<std::string>(std::size_t pos, std::string& val)
-{
-	if (isNull(pos)) return false;
-
-	std::size_t dataSize = _pPreparator->actualDataSize(pos);
-	char* sp = AnyCast<char*>(_pPreparator->at(pos));
-	std::size_t len = std::strlen(sp);
-	if (len < dataSize) dataSize = len;
-	checkDataSize(dataSize);
-	val.assign(sp, dataSize);
-
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImpl<UTF16String>(std::size_t pos, UTF16String& val)
-{
-	typedef UTF16String::value_type CharT;
-	if (isNull(pos)) return false;
-	std::size_t dataSize = _pPreparator->actualDataSize(pos);
-	CharT* sp = AnyCast<CharT*>(_pPreparator->at(pos));
-	std::size_t len = Poco::UnicodeConverter::UTFStrlen(sp);
-	if (len < dataSize) dataSize = len;
-	checkDataSize(dataSize);
-	val.assign(sp, dataSize);
-
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImpl<Poco::Data::Date>(std::size_t pos, Poco::Data::Date& val)
-{
-	if (isNull(pos)) return false;
-	SQL_DATE_STRUCT& ds = *AnyCast<SQL_DATE_STRUCT>(&(_pPreparator->at(pos)));
-	Utility::dateSync(val, ds);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::vector<Poco::Data::Date> >(std::size_t pos, 
-	std::vector<Poco::Data::Date>& val)
-{
-	std::vector<SQL_DATE_STRUCT>& ds = RefAnyCast<std::vector<SQL_DATE_STRUCT> >(_pPreparator->at(pos));
-	Utility::dateSync(val, ds);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::deque<Poco::Data::Date> >(std::size_t pos, 
-	std::deque<Poco::Data::Date>& val)
-{
-	std::vector<SQL_DATE_STRUCT>& ds = RefAnyCast<std::vector<SQL_DATE_STRUCT> >(_pPreparator->at(pos));
-	Utility::dateSync(val, ds);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::list<Poco::Data::Date> >(std::size_t pos, 
-	std::list<Poco::Data::Date>& val)
-{
-	std::vector<SQL_DATE_STRUCT>& ds = RefAnyCast<std::vector<SQL_DATE_STRUCT> >(_pPreparator->at(pos));
-	Utility::dateSync(val, ds);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImpl<Poco::Data::Time>(std::size_t pos, Poco::Data::Time& val)
-{
-	if (isNull(pos)) return false;
-
-	std::size_t dataSize = _pPreparator->actualDataSize(pos);
-	checkDataSize(dataSize);
-	SQL_TIME_STRUCT& ts = *AnyCast<SQL_TIME_STRUCT>(&_pPreparator->at(pos));
-	Utility::timeSync(val, ts);
-
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::vector<Poco::Data::Time> >(std::size_t pos, 
-	std::vector<Poco::Data::Time>& val)
-{
-	std::vector<SQL_TIME_STRUCT>& ds = RefAnyCast<std::vector<SQL_TIME_STRUCT> >(_pPreparator->at(pos));
-	Utility::timeSync(val, ds);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::deque<Poco::Data::Time> >(std::size_t pos, 
-	std::deque<Poco::Data::Time>& val)
-{
-	std::vector<SQL_TIME_STRUCT>& ds = RefAnyCast<std::vector<SQL_TIME_STRUCT> >(_pPreparator->at(pos));
-	Utility::timeSync(val, ds);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::list<Poco::Data::Time> >(std::size_t pos, 
-	std::list<Poco::Data::Time>& val)
-{
-	std::vector<SQL_TIME_STRUCT>& ds = RefAnyCast<std::vector<SQL_TIME_STRUCT> >(_pPreparator->at(pos));
-	Utility::timeSync(val, ds);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImpl<Poco::DateTime>(std::size_t pos, Poco::DateTime& val)
-{
-	if (isNull(pos)) return false;
-
-	std::size_t dataSize = _pPreparator->actualDataSize(pos);
-	checkDataSize(dataSize);
-	SQL_TIMESTAMP_STRUCT& tss = *AnyCast<SQL_TIMESTAMP_STRUCT>(&_pPreparator->at(pos));
-	Utility::dateTimeSync(val, tss);
-
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::vector<Poco::DateTime> >(std::size_t pos, 
-	std::vector<Poco::DateTime>& val)
-{
-	std::vector<SQL_TIMESTAMP_STRUCT>& ds = RefAnyCast<std::vector<SQL_TIMESTAMP_STRUCT> >(_pPreparator->at(pos));
-	Utility::dateTimeSync(val, ds);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::deque<Poco::DateTime> >(std::size_t pos, 
-	std::deque<Poco::DateTime>& val)
-{
-	std::vector<SQL_TIMESTAMP_STRUCT>& ds = RefAnyCast<std::vector<SQL_TIMESTAMP_STRUCT> >(_pPreparator->at(pos));
-	Utility::dateTimeSync(val, ds);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::list<Poco::DateTime> >(std::size_t pos, 
-	std::list<Poco::DateTime>& val)
-{
-	std::vector<SQL_TIMESTAMP_STRUCT>& ds = RefAnyCast<std::vector<SQL_TIMESTAMP_STRUCT> >(_pPreparator->at(pos));
-	Utility::dateTimeSync(val, ds);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::vector<bool> >(std::size_t pos, 
-	std::vector<bool>& val)
-{
-	std::size_t length = _pPreparator->getLength();
-	bool** p = AnyCast<bool*>(&_pPreparator->at(pos));
-	val.assign(*p, *p + length);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::deque<bool> >(std::size_t pos, 
-	std::deque<bool>& val)
-{
-	std::size_t length = _pPreparator->getLength();
-	bool** p = AnyCast<bool*>(&_pPreparator->at(pos));
-	val.assign(*p, *p + length);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractBoundImplContainer<std::list<bool> >(std::size_t pos, 
-	std::list<bool>& val)
-{
-	std::size_t length = _pPreparator->getLength();
-	bool** p = AnyCast<bool*>(&_pPreparator->at(pos));
-	val.assign(*p, *p + length);
-	return true;
-}
-
-
-template<>
-bool Extractor::extractManualImpl<std::string>(std::size_t pos, std::string& val, SQLSMALLINT cType)
-{
-	std::size_t maxSize = _pPreparator->getMaxFieldSize();
-	std::size_t fetchedSize = 0;
-	std::size_t totalSize = 0;
-	
-	SQLLEN len;
-	const int bufSize = CHUNK_SIZE;
-	Poco::Buffer<char> apChar(bufSize);
-	char* pChar = apChar.begin();
-	SQLRETURN rc = 0;
-	
-	val.clear();
-	resizeLengths(pos);
-
-	do
-	{
-		std::memset(pChar, 0, bufSize);
-		len = 0;
-		rc = SQLGetData(_rStmt, 
-			(SQLUSMALLINT) pos + 1, 
-			cType, //C data type
-			pChar, //returned value
-			bufSize, //buffer length
-			&len); //length indicator
-
-		if (SQL_NO_DATA != rc && Utility::isError(rc))
-			throw StatementException(_rStmt, "SQLGetData()");
-
-		if (SQL_NO_TOTAL == len)//unknown length, throw
-			throw UnknownDataLengthException("Could not determine returned data length.");
-
-		if (isNullLengthIndicator(len))
-		{
-			_lengths[pos] = len;
-			return false;
-		}
-
-		if (SQL_NO_DATA == rc || !len)
-			break;
-
-		_lengths[pos] += len;
-		fetchedSize = _lengths[pos] > CHUNK_SIZE ? CHUNK_SIZE : _lengths[pos];
-		totalSize += fetchedSize;
-		if (totalSize <= maxSize) 
-			val.append(pChar, fetchedSize);
-		else 
-			throw DataException(Poco::format(FLD_SIZE_EXCEEDED_FMT, fetchedSize, maxSize));
-	}while (true);
-
-	return true;
-}
-
-
-template<>
-bool Extractor::extractManualImpl<UTF16String>(std::size_t pos, UTF16String& val, SQLSMALLINT cType)
-{
-	std::size_t maxSize = _pPreparator->getMaxFieldSize();
-	std::size_t fetchedSize = 0;
-	std::size_t totalSize = 0;
-
-	SQLLEN len;
-	const int bufSize = CHUNK_SIZE;
-	Poco::Buffer<UTF16String::value_type> apChar(bufSize);
-	UTF16String::value_type* pChar = apChar.begin();
-	SQLRETURN rc = 0;
-
-	val.clear();
-	resizeLengths(pos);
-
-	do
-	{
-		std::memset(pChar, 0, bufSize);
-		len = 0;
-		rc = SQLGetData(_rStmt,
-			(SQLUSMALLINT)pos + 1,
-			cType, //C data type
-			pChar, //returned value
-			bufSize, //buffer length
-			&len); //length indicator
-
-		if (SQL_NO_DATA != rc && Utility::isError(rc))
-			throw StatementException(_rStmt, "SQLGetData()");
-
-		if (SQL_NO_TOTAL == len)//unknown length, throw
-			throw UnknownDataLengthException("Could not determine returned data length.");
-
-		if (isNullLengthIndicator(len))
-		{
-			_lengths[pos] = len;
-			return false;
-		}
-
-		if (SQL_NO_DATA == rc || !len)
-			break;
-
-		_lengths[pos] += len;
-		fetchedSize = _lengths[pos] > CHUNK_SIZE ? CHUNK_SIZE : _lengths[pos];
-		totalSize += fetchedSize;
-		if (totalSize <= maxSize)
-			val.append(pChar, fetchedSize / sizeof(UTF16Char));
-		else
-			throw DataException(Poco::format(FLD_SIZE_EXCEEDED_FMT, fetchedSize, maxSize));
-	} while (true);
-
-	return true;
-}
-
-
-template<>
-bool Extractor::extractManualImpl<Poco::Data::CLOB>(std::size_t pos, 
-	Poco::Data::CLOB& val, 
-	SQLSMALLINT cType)
-{
-	std::size_t maxSize = _pPreparator->getMaxFieldSize();
-	std::size_t fetchedSize = 0;
-	std::size_t totalSize = 0;
-
-	SQLLEN len;
-	const int bufSize = CHUNK_SIZE;
-	Poco::Buffer<char> apChar(bufSize);
-	char* pChar = apChar.begin();
-	SQLRETURN rc = 0;
-	
-	val.clear();
-	resizeLengths(pos);
-
-	do
-	{
-		std::memset(pChar, 0, bufSize);
-		len = 0;
-		rc = SQLGetData(_rStmt, 
-			(SQLUSMALLINT) pos + 1, 
-			cType, //C data type
-			pChar, //returned value
-			bufSize, //buffer length
-			&len); //length indicator
-		
-		_lengths[pos] += len;
-
-		if (SQL_NO_DATA != rc && Utility::isError(rc))
-			throw StatementException(_rStmt, "SQLGetData()");
-
-		if (SQL_NO_TOTAL == len)//unknown length, throw
-			throw UnknownDataLengthException("Could not determine returned data length.");
-
-		if (isNullLengthIndicator(len))
-			return false;
-
-		if (SQL_NO_DATA == rc || !len)
-			break;
-
-		fetchedSize = len > CHUNK_SIZE ? CHUNK_SIZE : len;
-		totalSize += fetchedSize;
-		if (totalSize <= maxSize) 
-			val.appendRaw(pChar, fetchedSize);
-		else 
-			throw DataException(Poco::format(FLD_SIZE_EXCEEDED_FMT, fetchedSize, maxSize));
-
-	}while (true);
-
-	return true;
-}
-
-
-template<>
-bool Extractor::extractManualImpl<Poco::Data::Date>(std::size_t pos, 
-	Poco::Data::Date& val, 
-	SQLSMALLINT cType)
-{
-	SQL_DATE_STRUCT ds;
-	resizeLengths(pos);
-
-	SQLRETURN rc = SQLGetData(_rStmt, 
-		(SQLUSMALLINT) pos + 1, 
-		cType, //C data type
-		&ds, //returned value
-		sizeof(ds), //buffer length
-		&_lengths[pos]); //length indicator
-	
-	if (Utility::isError(rc))
-		throw StatementException(_rStmt, "SQLGetData()");
-
-	if (isNullLengthIndicator(_lengths[pos])) 
-		return false;
-	else 
-		Utility::dateSync(val, ds);
-
-	return true;
-}
-
-
-template<>
-bool Extractor::extractManualImpl<Poco::Data::Time>(std::size_t pos, 
-	Poco::Data::Time& val, 
-	SQLSMALLINT cType)
-{
-	SQL_TIME_STRUCT ts;
-	resizeLengths(pos);
-
-	SQLRETURN rc = SQLGetData(_rStmt, 
-		(SQLUSMALLINT) pos + 1, 
-		cType, //C data type
-		&ts, //returned value
-		sizeof(ts), //buffer length
-		&_lengths[pos]); //length indicator
-	
-	if (Utility::isError(rc))
-		throw StatementException(_rStmt, "SQLGetData()");
-
-	if (isNullLengthIndicator(_lengths[pos])) 
-		return false;
-	else 
-		Utility::timeSync(val, ts);
-
-	return true;
-}
-
-
-template<>
-bool Extractor::extractManualImpl<Poco::DateTime>(std::size_t pos, 
-	Poco::DateTime& val, 
-	SQLSMALLINT cType)
-{
-	SQL_TIMESTAMP_STRUCT ts;
-	resizeLengths(pos);
-
-	SQLRETURN rc = SQLGetData(_rStmt, 
-		(SQLUSMALLINT) pos + 1, 
-		cType, //C data type
-		&ts, //returned value
-		sizeof(ts), //buffer length
-		&_lengths[pos]); //length indicator
-	
-	if (Utility::isError(rc))
-		throw StatementException(_rStmt, "SQLGetData()");
-
-	if (isNullLengthIndicator(_lengths[pos])) 
-		return false;
-	else 
-		Utility::dateTimeSync(val, ts);
-
-	return true;
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::Int32& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_SLONG);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::Int32>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::Int32>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::Int32>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::Int64& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_SBIGINT);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::Int64>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::Int64>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::Int64>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-#ifndef POCO_LONG_IS_64_BIT
-bool Extractor::extract(std::size_t pos, long& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_SLONG);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, unsigned long& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_SLONG);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<long>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<long>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<long>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-#endif
-
-
-bool Extractor::extract(std::size_t pos, double& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_DOUBLE);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<double>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<double>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<double>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::string& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_CHAR);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<std::string>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<std::string>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<std::string>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, UTF16String& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_WCHAR);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<UTF16String>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<UTF16String>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<UTF16String>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::Data::BLOB& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_BINARY);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::Data::CLOB& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_BINARY);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::Data::BLOB>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::Data::BLOB>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::Data::BLOB>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::Data::CLOB>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::Data::CLOB>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::Data::CLOB>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::Data::Date& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_TYPE_DATE);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::Data::Date>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::Data::Date>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::Data::Date>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::Data::Time& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_TYPE_TIME);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::Data::Time>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::Data::Time>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::Data::Time>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::DateTime& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_TYPE_TIMESTAMP);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::DateTime>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::DateTime>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::DateTime>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::Int8& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_STINYINT);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::Int8>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::Int8>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::Int8>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::UInt8& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_UTINYINT);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::UInt8>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::UInt8>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::UInt8>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::Int16& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_SSHORT);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::Int16>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::Int16>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::Int16>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::UInt16& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_USHORT);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::UInt16>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::UInt16>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::UInt16>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::UInt32& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_ULONG);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::UInt32>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::UInt32>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::UInt32>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::UInt64& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_SBIGINT);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::UInt64>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::UInt64>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::UInt64>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, bool& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_BIT);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<bool>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<bool>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<bool>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, float& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_FLOAT);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<float>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<float>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<float>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, char& val)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-		return extractManualImpl(pos, val, SQL_C_STINYINT);
-	else
-		return extractBoundImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<char>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<char>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<char>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImplContainer(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::Any& val)
-{
-	return extractImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::Any>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImpl(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::Any>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImpl(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::Any>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImpl(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, Poco::DynamicAny& val)
-{
-	return extractImpl(pos, val);
-}
-
-
-bool Extractor::extract(std::size_t pos, std::vector<Poco::DynamicAny>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImpl(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::deque<Poco::DynamicAny>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImpl(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::extract(std::size_t pos, std::list<Poco::DynamicAny>& val)
-{
-	if (Preparator::DE_BOUND == _dataExtraction)
-		return extractBoundImpl(pos, val);
-	else
-		throw InvalidAccessException("Direct container extraction only allowed for bound mode.");
-}
-
-
-bool Extractor::isNull(std::size_t col, std::size_t row)
-{
-	if (Preparator::DE_MANUAL == _dataExtraction)
-	{
-		try
-		{
-			return isNullLengthIndicator(_lengths.at(col));
-		} 
-		catch (std::out_of_range& ex)
-		{
-			throw RangeException(ex.what()); 
-		}
-	}
-	else
-		return SQL_NULL_DATA == _pPreparator->actualDataSize(col, row);
-}
-
-
-void Extractor::checkDataSize(std::size_t size)
-{
-	std::size_t maxSize = _pPreparator->getMaxFieldSize();
-	if (size > maxSize)
-		throw DataException(Poco::format(FLD_SIZE_EXCEEDED_FMT, size, maxSize));
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/ODBCException.cpp b/contrib/poco/Data/ODBC/src/ODBCException.cpp
deleted file mode 100644
index a9249e4cb..000000000
--- a/contrib/poco/Data/ODBC/src/ODBCException.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// ODBCException.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  ODBCException
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/ODBCException.h"
-#include <typeinfo>
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-POCO_IMPLEMENT_EXCEPTION(ODBCException, Poco::Data::DataException, "Generic ODBC error")
-POCO_IMPLEMENT_EXCEPTION(InsufficientStorageException, ODBCException, "Insufficient storage error")
-POCO_IMPLEMENT_EXCEPTION(UnknownDataLengthException, ODBCException, "Unknown length of remaining data")
-POCO_IMPLEMENT_EXCEPTION(DataTruncatedException, ODBCException, "Variable length character or binary data truncated")
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/ODBCMetaColumn.cpp b/contrib/poco/Data/ODBC/src/ODBCMetaColumn.cpp
deleted file mode 100644
index 597589dc9..000000000
--- a/contrib/poco/Data/ODBC/src/ODBCMetaColumn.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-// ODBCMetaColumn.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  ODBCMetaColumn
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/ODBCMetaColumn.h"
-#include "Poco/Data/ODBC/Utility.h"
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-ODBCMetaColumn::ODBCMetaColumn(const StatementHandle& rStmt, std::size_t position) : 
-	MetaColumn(position),
-	_rStmt(rStmt)
-{
-	init();
-}
-
-	
-ODBCMetaColumn::~ODBCMetaColumn()
-{
-}
-
-
-void ODBCMetaColumn::getDescription()
-{
-	std::memset(_columnDesc.name, 0, NAME_BUFFER_LENGTH);
-	_columnDesc.nameBufferLength = 0;
-	_columnDesc.dataType = 0;
-	_columnDesc.size = 0;
-	_columnDesc.decimalDigits = 0;
-	_columnDesc.isNullable = 0;
-
-	if (Utility::isError(Poco::Data::ODBC::SQLDescribeCol(_rStmt, 
-		(SQLUSMALLINT) position() + 1, // ODBC columns are 1-based
-		_columnDesc.name, 
-		NAME_BUFFER_LENGTH,
-		&_columnDesc.nameBufferLength, 
-		&_columnDesc.dataType,
-		&_columnDesc.size, 
-		&_columnDesc.decimalDigits, 
-		&_columnDesc.isNullable)))
-	{
-		throw StatementException(_rStmt);
-	}
-}
-
-
-bool ODBCMetaColumn::isUnsigned() const
-{
-	SQLLEN val = 0;
-	if (Utility::isError(Poco::Data::ODBC::SQLColAttribute(_rStmt,
-		(SQLUSMALLINT)position() + 1, // ODBC columns are 1-based
-		SQL_DESC_UNSIGNED,
-		0,
-		0,
-		0,
-		&val)))
-	{
-		throw StatementException(_rStmt);
-	}
-	return (val == SQL_TRUE);
-}
-
-
-void ODBCMetaColumn::init()
-{
-	getDescription();
-
-	if (Utility::isError(Poco::Data::ODBC::SQLColAttribute(_rStmt,
-			(SQLUSMALLINT) position() + 1, // ODBC columns are 1-based
-			SQL_DESC_LENGTH,
-			0,
-			0,
-			0,
-			&_dataLength)))
-	{
-		throw StatementException(_rStmt);
-	}
-
-	setName(std::string((char*) _columnDesc.name));
-	setLength(_columnDesc.size);
-	setPrecision(_columnDesc.decimalDigits);
-	setNullable(SQL_NULLABLE == _columnDesc.isNullable);
-	switch(_columnDesc.dataType)
-	{
-	case SQL_BIT:
-		setType(MetaColumn::FDT_BOOL); break;
-
-	case SQL_CHAR:
-	case SQL_VARCHAR:
-	case SQL_LONGVARCHAR:
-#ifdef SQL_GUID
-	case SQL_GUID:
-#endif
-		setType(MetaColumn::FDT_STRING); break;
-
-	case SQL_WCHAR:
-	case SQL_WVARCHAR:
-	case SQL_WLONGVARCHAR:
-		setType(MetaColumn::FDT_WSTRING); break;
-
-	case SQL_TINYINT:
-		setType(isUnsigned() ? MetaColumn::FDT_UINT8 : MetaColumn::FDT_INT8);
-		break;
-
-	case SQL_SMALLINT:
-		setType(isUnsigned() ? MetaColumn::FDT_UINT16 : MetaColumn::FDT_INT16);
-		break;
-
-	case SQL_INTEGER:
-		setType(isUnsigned() ? MetaColumn::FDT_UINT32 : MetaColumn::FDT_INT32);
-		break;
-
-	case SQL_BIGINT:
-		setType(isUnsigned() ? MetaColumn::FDT_UINT64 : MetaColumn::FDT_INT64);
-		break;
-
-	case SQL_DOUBLE:
-	case SQL_FLOAT:
-		setType(MetaColumn::FDT_DOUBLE); break;
-
-	case SQL_NUMERIC:
-	case SQL_DECIMAL:
-		// Oracle has no INTEGER type - it's essentially NUMBER with 38 whole and
-		// 0 fractional digits. It also does not recognize SQL_BIGINT type,
-		// so the workaround here is to hardcode it to 32 bit integer
-		if (0 == _columnDesc.decimalDigits) setType(MetaColumn::FDT_INT32);
-		else setType(MetaColumn::FDT_DOUBLE);
-		break;
-
-	case SQL_REAL:
-		setType(MetaColumn::FDT_FLOAT); break;
-	
-	case SQL_BINARY:
-	case SQL_VARBINARY:
-	case SQL_LONGVARBINARY:
-	case -98:// IBM DB2 non-standard type
-		setType(MetaColumn::FDT_BLOB); break;
-	
-	case SQL_TYPE_DATE:
-		setType(MetaColumn::FDT_DATE); break;
-	
-	case SQL_TYPE_TIME:
-		setType(MetaColumn::FDT_TIME); break;
-	
-	case SQL_TYPE_TIMESTAMP:
-		setType(MetaColumn::FDT_TIMESTAMP); break;
-	
-	default:
-		throw DataFormatException("Unsupported data type.");
-	}
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/ODBCStatementImpl.cpp b/contrib/poco/Data/ODBC/src/ODBCStatementImpl.cpp
deleted file mode 100644
index b27dade26..000000000
--- a/contrib/poco/Data/ODBC/src/ODBCStatementImpl.cpp
+++ /dev/null
@@ -1,455 +0,0 @@
-//
-// ODBCStatementImpl.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  ODBCStatementImpl
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/ODBCStatementImpl.h"
-#include "Poco/Data/ODBC/ConnectionHandle.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-#include "Poco/Data/AbstractPreparation.h"
-#include "Poco/Exception.h"
-
-
-
-
-using Poco::DataFormatException;
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-const std::string ODBCStatementImpl::INVALID_CURSOR_STATE = "24000";
-
-
-ODBCStatementImpl::ODBCStatementImpl(SessionImpl& rSession):
-	Poco::Data::StatementImpl(rSession),
-	_rConnection(rSession.dbc()),
-	_stmt(rSession.dbc()),
-	_stepCalled(false),
-	_nextResponse(0),
-	_prepared(false),
-	_affectedRowCount(0),
-	_canCompile(true)
-{
-	int queryTimeout = rSession.queryTimeout();
-	if (queryTimeout >= 0)
-	{
-		SQLULEN uqt = static_cast<SQLULEN>(queryTimeout);
-		SQLSetStmtAttr(_stmt,
-			SQL_ATTR_QUERY_TIMEOUT,
-			(SQLPOINTER) uqt,
-			0);
-	}
-}
-
-
-ODBCStatementImpl::~ODBCStatementImpl()
-{
-	ColumnPtrVecVec::iterator it = _columnPtrs.begin();
-	ColumnPtrVecVec::iterator end = _columnPtrs.end();
-	for (; it != end; ++it)
-	{
-		ColumnPtrVec::iterator itC = it->begin();
-		ColumnPtrVec::iterator endC = it->end();
-		for (; itC != endC; ++itC) delete *itC;
-	}
-}
-
-
-void ODBCStatementImpl::compileImpl()
-{
-	if (!_canCompile) return;
-
-	_stepCalled = false;
-	_nextResponse = 0;
-
-	if (_preparations.size())
-		PreparatorVec().swap(_preparations);
-
-	addPreparator();
-
-	Binder::ParameterBinding bind = session().getFeature("autoBind") ? 
-		Binder::PB_IMMEDIATE : Binder::PB_AT_EXEC;
-
-	TypeInfo* pDT = 0;
-	try
-	{
-		Poco::Any dti = session().getProperty("dataTypeInfo");
-		pDT = AnyCast<TypeInfo*>(dti);
-	}
-	catch (NotSupportedException&) 
-	{
-	}
-
-	std::size_t maxFieldSize = AnyCast<std::size_t>(session().getProperty("maxFieldSize"));
-	
-	_pBinder = new Binder(_stmt, maxFieldSize, bind, pDT);
-	
-	makeInternalExtractors();
-	doPrepare();
-
-	 _canCompile = false;
-}
-
-
-void ODBCStatementImpl::makeInternalExtractors()
-{
-	if (hasData() && !extractions().size()) 
-	{
-		try
-		{
-			fillColumns();
-		} 
-		catch (DataFormatException&)
-		{
-			if (isStoredProcedure()) return;
-			throw;
-		}
-
-		makeExtractors(columnsReturned());
-		fixupExtraction();
-	}
-}
-
-
-void ODBCStatementImpl::addPreparator()
-{
-	if (0 == _preparations.size())
-	{
-		std::string statement(toString());
-		if (statement.empty())
-			throw ODBCException("Empty statements are illegal");
-
-		Preparator::DataExtraction ext = session().getFeature("autoExtract") ? 
-			Preparator::DE_BOUND : Preparator::DE_MANUAL;
-
-		std::size_t maxFieldSize = AnyCast<std::size_t>(session().getProperty("maxFieldSize"));
-
-		_preparations.push_back(new Preparator(_stmt, statement, maxFieldSize, ext));
-	}
-	else
-		_preparations.push_back(new Preparator(*_preparations[0]));
-
-	_extractors.push_back(new Extractor(_stmt, _preparations.back()));
-}
-
-
-void ODBCStatementImpl::doPrepare()
-{
-	if (session().getFeature("autoExtract") && hasData())
-	{
-		std::size_t curDataSet = currentDataSet();
-		poco_check_ptr (_preparations[curDataSet]);
-
-		Extractions& extracts = extractions();
-		Extractions::iterator it    = extracts.begin();
-		Extractions::iterator itEnd = extracts.end();
-
-		if (it != itEnd && (*it)->isBulk())
-		{
-			std::size_t limit = getExtractionLimit();
-			if (limit == Limit::LIMIT_UNLIMITED) 
-				throw InvalidArgumentException("Bulk operation not allowed without limit.");
-			checkError(Poco::Data::ODBC::SQLSetStmtAttr(_stmt, SQL_ATTR_ROW_ARRAY_SIZE, (SQLPOINTER) limit, 0),
-					"SQLSetStmtAttr(SQL_ATTR_ROW_ARRAY_SIZE)");
-		}
-
-		AbstractPreparation::Ptr pAP = 0;
-		Poco::Data::AbstractPreparator::Ptr pP = _preparations[curDataSet];
-		for (std::size_t pos = 0; it != itEnd; ++it)
-		{
-			pAP = (*it)->createPreparation(pP, pos);
-			pAP->prepare();
-			pos += (*it)->numOfColumnsHandled();
-		}
-
-		_prepared = true;
-	}
-}
-
-
-bool ODBCStatementImpl::canBind() const
-{
-	if (!bindings().empty())
-		return (*bindings().begin())->canBind();
-
-	return false;
-}
-
-
-void ODBCStatementImpl::doBind()
-{
-	this->clear();
-	Bindings& binds = bindings();
-	if (!binds.empty())
-	{
-		Bindings::iterator it    = binds.begin();
-		Bindings::iterator itEnd = binds.end();
-
-		if (it != itEnd && 0 == _affectedRowCount)
-			_affectedRowCount = static_cast<std::size_t>((*it)->numOfRowsHandled());
-
-		for (std::size_t pos = 0; it != itEnd && (*it)->canBind(); ++it)
-		{
-			(*it)->bind(pos);
-			pos += (*it)->numOfColumnsHandled();
-		}
-	}
-}
-
-
-void ODBCStatementImpl::bindImpl()
-{
-	doBind();
-
-	SQLRETURN rc = SQLExecute(_stmt);
-
-	if (SQL_NEED_DATA == rc) putData();
-	else checkError(rc, "SQLExecute()");
-
-	_pBinder->synchronize();
-}
-
-
-void ODBCStatementImpl::putData()
-{
-	SQLPOINTER pParam = 0;
-	SQLINTEGER dataSize = 0;
-	SQLRETURN rc;
-
-	while (SQL_NEED_DATA == (rc = SQLParamData(_stmt, &pParam)))
-	{
-		if (pParam)
-		{
-			dataSize = (SQLINTEGER) _pBinder->parameterSize(pParam);
-
-			if (Utility::isError(SQLPutData(_stmt, pParam, dataSize))) 
-				throw StatementException(_stmt, "SQLPutData()");
-		}
-		else // if pParam is null pointer, do a dummy call
-		{
-			char dummy = 0;
-			if (Utility::isError(SQLPutData(_stmt, &dummy, 0))) 
-				throw StatementException(_stmt, "SQLPutData()");
-		}
-	}
-
-	checkError(rc, "SQLParamData()");
-}
-
-
-void ODBCStatementImpl::clear()
-{
-	SQLRETURN rc = SQLCloseCursor(_stmt);
-	_stepCalled = false;
-	_affectedRowCount = 0;
-
-	if (Utility::isError(rc))
-	{
-		StatementError err(_stmt);
-		bool ignoreError = false;
-
-		const StatementDiagnostics& diagnostics = err.diagnostics();
-		//ignore "Invalid cursor state" error
-		//(returned by 3.x drivers when cursor is not opened)
-		for (int i = 0; i < diagnostics.count(); ++i)
-		{
-			if ((ignoreError =
-				(INVALID_CURSOR_STATE == std::string(diagnostics.sqlState(i)))))
-			{
-				break;
-			}
-		}
-
-		if (!ignoreError)
-			throw StatementException(_stmt, "SQLCloseCursor()");
-	}
-}
-
-
-bool ODBCStatementImpl::hasNext()
-{
-	if (hasData())
-	{
-		if (!extractions().size())
-			makeInternalExtractors();
-
-		if (!_prepared) doPrepare();
-
-		if (_stepCalled)
-			return _stepCalled = nextRowReady();
-
-		makeStep();
-
-		if (!nextRowReady())
-		{
-			if (hasMoreDataSets()) activateNextDataSet();
-			else return false;
-
-			if (SQL_NO_DATA == SQLMoreResults(_stmt))
-				return false;
-
-			addPreparator();
-			doPrepare();
-			fixupExtraction();
-			makeStep();
-		}
-		else if (Utility::isError(_nextResponse))
-			checkError(_nextResponse, "SQLFetch()");
-
-		return true;
-	}
-
-	return false;
-}
-
-
-void ODBCStatementImpl::makeStep()
-{
-	_extractors[currentDataSet()]->reset();
-	_nextResponse = SQLFetch(_stmt);
-	checkError(_nextResponse);
-	_stepCalled = true;
-}
-
-
-std::size_t ODBCStatementImpl::next()
-{
-	std::size_t count = 0;
-
-	if (nextRowReady())
-	{
-		Extractions& extracts = extractions();
-		Extractions::iterator it    = extracts.begin();
-		Extractions::iterator itEnd = extracts.end();
-		std::size_t prevCount = 0;
-		for (std::size_t pos = 0; it != itEnd; ++it)
-		{
-			count = (*it)->extract(pos);
-			if (prevCount && count != prevCount)
-				throw IllegalStateException("Different extraction counts");
-			prevCount = count;
-			pos += (*it)->numOfColumnsHandled();
-		}
-		_stepCalled = false;
-	}
-	else
-	{
-		throw StatementException(_stmt,
-			std::string("Next row not available."));
-	}
-
-	return count;
-}
-
-
-std::string ODBCStatementImpl::nativeSQL()
-{
-	std::string statement = toString();
-
-	SQLINTEGER length = (SQLINTEGER) statement.size() * 2;
-
-	char* pNative = 0;
-	SQLINTEGER retlen = length;
-	do
-	{
-		delete [] pNative;
-		pNative = new char[retlen];
-		std::memset(pNative, 0, retlen);
-		length = retlen;
-		if (Utility::isError(SQLNativeSql(_rConnection,
-			(SQLCHAR*) statement.c_str(),
-			(SQLINTEGER) statement.size(),
-			(SQLCHAR*) pNative,
-			length,
-			&retlen)))
-		{
-			delete [] pNative;
-			throw ConnectionException(_rConnection, "SQLNativeSql()");
-		}
-		++retlen;//accommodate for terminating '\0'
-	}while (retlen > length);
-
-	std::string sql(pNative);
-	delete [] pNative;
-	return sql;
-}
-
-
-void ODBCStatementImpl::checkError(SQLRETURN rc, const std::string& msg)
-{
-	if (SQL_NO_DATA == rc) return;
-
-	if (Utility::isError(rc))
-	{
-		std::ostringstream os;
-		os << std::endl << "Requested SQL statement: " << toString() << std::endl; 	 
-		os << "Native SQL statement: " << nativeSQL() << std::endl; 	 
-		std::string str(msg); str += os.str();
-		
-		throw StatementException(_stmt, str);
-	}
-}
-
-
-void ODBCStatementImpl::fillColumns()
-{
-	std::size_t colCount = columnsReturned();
-	std::size_t curDataSet = currentDataSet();
-	if (curDataSet >= _columnPtrs.size())
-		_columnPtrs.resize(curDataSet + 1);
-
-	for (int i = 0; i < colCount; ++i)
-		_columnPtrs[curDataSet].push_back(new ODBCMetaColumn(_stmt, i));
-}
-
-
-bool ODBCStatementImpl::isStoredProcedure() const 	 
-{ 	 
-	std::string str = toString(); 	 
-	if (trimInPlace(str).size() < 2) return false; 	 
-
-	return ('{' == str[0] && '}' == str[str.size()-1]); 	 
-}
-
-
-const MetaColumn& ODBCStatementImpl::metaColumn(std::size_t pos) const
-{
-	std::size_t curDataSet = currentDataSet();
-	poco_assert_dbg (curDataSet < _columnPtrs.size());
-
-	std::size_t sz = _columnPtrs[curDataSet].size();
-
-	if (0 == sz || pos > sz - 1)
-		throw InvalidAccessException(format("Invalid column number: %u", pos));
-
-	return *_columnPtrs[curDataSet][pos];
-}
-
-
-int ODBCStatementImpl::affectedRowCount() const
-{
-	if (0 == _affectedRowCount)
-	{
-		SQLLEN rows = 0;
-		if (!Utility::isError(SQLRowCount(_stmt, &rows)))
-			_affectedRowCount = static_cast<std::size_t>(rows);
-	}
-
-	return static_cast<int>(_affectedRowCount);
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/Parameter.cpp b/contrib/poco/Data/ODBC/src/Parameter.cpp
deleted file mode 100644
index 23023779b..000000000
--- a/contrib/poco/Data/ODBC/src/Parameter.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Parameter.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Parameter
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/Parameter.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Data/ODBC/Error.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-Parameter::Parameter(const StatementHandle& rStmt, std::size_t colNum) : 
-	_rStmt(rStmt), 
-	_number(colNum)
-{
-	init();
-}
-
-	
-Parameter::~Parameter()
-{
-}
-
-
-void Parameter::init()
-{
-	if (Utility::isError(SQLDescribeParam(_rStmt, 
-		(SQLUSMALLINT) _number + 1, 
-		&_dataType,
-		&_columnSize,
-		&_decimalDigits,
-		&_isNullable)))
-	{
-		throw StatementException(_rStmt);
-	}
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/Preparator.cpp b/contrib/poco/Data/ODBC/src/Preparator.cpp
deleted file mode 100644
index 55427692d..000000000
--- a/contrib/poco/Data/ODBC/src/Preparator.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-//
-// Preparator.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Preparator
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/Preparator.h"
-#include "Poco/Data/ODBC/ODBCMetaColumn.h"
-#include "Poco/Exception.h"
-
-
-using Poco::InvalidArgumentException;
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-Preparator::Preparator(const StatementHandle& rStmt, 
-	const std::string& statement, 
-	std::size_t maxFieldSize,
-	DataExtraction dataExtraction): 
-	_rStmt(rStmt),
-	_maxFieldSize(maxFieldSize),
-	_dataExtraction(dataExtraction)
-{
-	SQLCHAR* pStr = (SQLCHAR*) statement.c_str();
-	if (Utility::isError(Poco::Data::ODBC::SQLPrepare(_rStmt, pStr, (SQLINTEGER) statement.length())))
-		throw StatementException(_rStmt);
-}
-
-
-Preparator::Preparator(const Preparator& other): 
-	_rStmt(other._rStmt),
-	_maxFieldSize(other._maxFieldSize),
-	_dataExtraction(other._dataExtraction)
-{
-	resize();
-}
-
-
-Preparator::~Preparator()
-{
-	try
-	{
-		freeMemory();
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-void Preparator::freeMemory() const
-{
-	IndexMap::iterator it = _varLengthArrays.begin();
-	IndexMap::iterator end = _varLengthArrays.end();
-	for (; it != end; ++it)
-	{
-		switch (it->second)
-		{
-			case DT_BOOL:
-				deleteCachedArray<bool>(it->first);
-				break;
-
-			case DT_CHAR:
-				deleteCachedArray<char>(it->first);
-				break;
-
-			case DT_WCHAR:
-				deleteCachedArray<UTF16String::value_type>(it->first);
-				break;
-
-			case DT_UCHAR:
-				deleteCachedArray<unsigned char>(it->first);
-				break;
-
-			case DT_CHAR_ARRAY:
-			{
-				char** pc = AnyCast<char*>(&_values[it->first]);
-				if (pc) std::free(*pc);
-				break;
-			}
-
-			case DT_WCHAR_ARRAY:
-			{
-				UTF16String::value_type** pc = AnyCast<UTF16String::value_type*>(&_values[it->first]);
-				if (pc) std::free(*pc);
-				break;
-			}
-
-			case DT_UCHAR_ARRAY:
-			{
-				unsigned char** pc = AnyCast<unsigned char*>(&_values[it->first]);
-				if (pc) std::free(*pc);
-				break;
-			}
-
-			case DT_BOOL_ARRAY:
-			{
-				bool** pb = AnyCast<bool*>(&_values[it->first]);
-				if (pb) std::free(*pb);
-				break;
-			}
-
-			default:
-				throw InvalidArgumentException("Unknown data type.");
-		}
-	}
-}
-
-
-std::size_t Preparator::columns() const
-{
-	if (_values.empty()) resize();
-	return _values.size();
-}
-
-
-void Preparator::resize() const
-{
-	SQLSMALLINT nCol = 0;
-	if (!Utility::isError(SQLNumResultCols(_rStmt, &nCol)) && 0 != nCol)
-	{
-		_values.resize(nCol, 0);
-		_lengths.resize(nCol, 0);
-		_lenLengths.resize(nCol);
-		if(_varLengthArrays.size())
-		{
-			freeMemory();
-			_varLengthArrays.clear();
-		}
-	}
-}
-
-
-std::size_t Preparator::maxDataSize(std::size_t pos) const
-{
-	poco_assert_dbg (pos < _values.size());
-
-	std::size_t sz = 0;
-	std::size_t maxsz = getMaxFieldSize();
-
-	try 
-	{
-		ODBCMetaColumn mc(_rStmt, pos);
-		sz = mc.length();
-
-		// accommodate for terminating zero (non-bulk only!)
-		MetaColumn::ColumnDataType type = mc.type();
-		if (!isBulk() && ((ODBCMetaColumn::FDT_WSTRING == type) || (ODBCMetaColumn::FDT_STRING == type))) ++sz;
-	}
-	catch (StatementException&) { }
-
-	if (!sz || sz > maxsz) sz = maxsz;
-
-	return sz;
-}
-
-
-std::size_t Preparator::actualDataSize(std::size_t col, std::size_t row) const
-{
-	SQLLEN size = (POCO_DATA_INVALID_ROW == row) ? _lengths.at(col) :
-		_lenLengths.at(col).at(row);
-
-	// workaround for drivers returning negative length
-	if (size < 0 && SQL_NULL_DATA != size) size *= -1;
-
-	return size;
-}
-
-
-void Preparator::prepareBoolArray(std::size_t pos, SQLSMALLINT valueType, std::size_t length)
-{
-	poco_assert_dbg (DE_BOUND == _dataExtraction);
-	poco_assert_dbg (pos < _values.size());
-	poco_assert_dbg (pos < _lengths.size());
-	poco_assert_dbg (pos < _lenLengths.size());
-
-	bool* pArray = (bool*) std::calloc(length, sizeof(bool));
-
-	_values[pos] = Any(pArray);
-	_lengths[pos] = 0;
-	_lenLengths[pos].resize(length);
-	_varLengthArrays.insert(IndexMap::value_type(pos, DT_BOOL_ARRAY));
-
-	if (Utility::isError(SQLBindCol(_rStmt, 
-		(SQLUSMALLINT) pos + 1, 
-		valueType, 
-		(SQLPOINTER) pArray, 
-		(SQLINTEGER) sizeof(bool), 
-		&_lenLengths[pos][0])))
-	{
-		throw StatementException(_rStmt, "SQLBindCol()");
-	}
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/SessionImpl.cpp b/contrib/poco/Data/ODBC/src/SessionImpl.cpp
deleted file mode 100644
index 99e7ff340..000000000
--- a/contrib/poco/Data/ODBC/src/SessionImpl.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-//
-// SessionImpl.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  SessionImpl
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/SessionImpl.h"
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Data/ODBC/ODBCStatementImpl.h"
-#include "Poco/Data/ODBC/Error.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-#include "Poco/Data/Session.h"
-#include "Poco/String.h"
-#include <sqlext.h>
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-SessionImpl::SessionImpl(const std::string& connect,
-	std::size_t loginTimeout,
-	std::size_t maxFieldSize,
-	bool autoBind,
-	bool autoExtract): 
-	Poco::Data::AbstractSessionImpl<SessionImpl>(connect, loginTimeout),
-		_connector(Connector::KEY),
-		_maxFieldSize(maxFieldSize),
-		_autoBind(autoBind),
-		_autoExtract(autoExtract),
-		_canTransact(ODBC_TXN_CAPABILITY_UNKNOWN),
-		_inTransaction(false),
-		_queryTimeout(-1)
-{
-	setFeature("bulk", true);
-	open();
-	setProperty("handle", _db.handle());
-}
-
-
-SessionImpl::SessionImpl(const std::string& connect,
-	Poco::Any maxFieldSize, 
-	bool enforceCapability,
-	bool autoBind,
-	bool autoExtract): Poco::Data::AbstractSessionImpl<SessionImpl>(connect),
-		_connector(Connector::KEY),
-		_maxFieldSize(maxFieldSize),
-		_autoBind(autoBind),
-		_autoExtract(autoExtract),
-		_canTransact(ODBC_TXN_CAPABILITY_UNKNOWN),
-		_inTransaction(false),
-		_queryTimeout(-1)
-{
-	setFeature("bulk", true);
-	open();
-	setProperty("handle", _db.handle());
-}
-
-
-SessionImpl::~SessionImpl()
-{
-	try
-	{
-		if (isTransaction() && !getFeature("autoCommit"))
-		{
-			try { rollback(); }
-			catch (...) { }
-		}
-
-		close();
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-Poco::Data::StatementImpl* SessionImpl::createStatementImpl()
-{
-	return new ODBCStatementImpl(*this);
-}
-
-
-void SessionImpl::open(const std::string& connect)
-{
-	if (connect != connectionString())
-	{
-		if (isConnected())
-			throw InvalidAccessException("Session already connected");
-
-		if (!connect.empty())
-			setConnectionString(connect);
-	}
-
-	poco_assert_dbg (!connectionString().empty());
-
-	SQLULEN tout = static_cast<SQLULEN>(getLoginTimeout());
-	if (Utility::isError(SQLSetConnectAttr(_db, SQL_ATTR_LOGIN_TIMEOUT, (SQLPOINTER) tout, 0)))
-	{
-		if (Utility::isError(SQLGetConnectAttr(_db, SQL_ATTR_LOGIN_TIMEOUT, &tout, 0, 0)) ||
-				getLoginTimeout() != tout)
-		{
-			ConnectionError e(_db);
-			throw ConnectionFailedException(e.toString());
-		}
-	}
-
-	SQLCHAR connectOutput[512] = {0};
-	SQLSMALLINT result;
-
-	if (Utility::isError(Poco::Data::ODBC::SQLDriverConnect(_db
-		, NULL
-		,(SQLCHAR*) connectionString().c_str()
-		,(SQLSMALLINT) SQL_NTS
-		, connectOutput
-		, sizeof(connectOutput)
-		, &result
-		, SQL_DRIVER_NOPROMPT)))
-	{
-		ConnectionError err(_db);
-		std::string errStr = err.toString();
-		close();
-		throw ConnectionFailedException(errStr);
-	}
-
-	_dataTypes.fillTypeInfo(_db);
-		addProperty("dataTypeInfo", 
-		&SessionImpl::setDataTypeInfo, 
-		&SessionImpl::dataTypeInfo);
-
-	addFeature("autoCommit", 
-		&SessionImpl::autoCommit, 
-		&SessionImpl::isAutoCommit);
-
-	addFeature("autoBind", 
-		&SessionImpl::autoBind, 
-		&SessionImpl::isAutoBind);
-
-	addFeature("autoExtract", 
-		&SessionImpl::autoExtract, 
-		&SessionImpl::isAutoExtract);
-
-	addProperty("maxFieldSize",
-		&SessionImpl::setMaxFieldSize,
-		&SessionImpl::getMaxFieldSize);
-
-	addProperty("queryTimeout",
-		&SessionImpl::setQueryTimeout,
-		&SessionImpl::getQueryTimeout);
-
-	Poco::Data::ODBC::SQLSetConnectAttr(_db, SQL_ATTR_QUIET_MODE, 0, 0);
-
-	if (!canTransact()) autoCommit("", true);
-}
-
-
-bool SessionImpl::isConnected()
-{
-	SQLULEN value = 0;
-
-	if (Utility::isError(Poco::Data::ODBC::SQLGetConnectAttr(_db,
-		SQL_ATTR_CONNECTION_DEAD,
-		&value,
-		0,
-		0))) return false;
-
-	return (SQL_CD_FALSE == value);
-}
-
-
-void SessionImpl::setConnectionTimeout(std::size_t timeout)
-{
-	SQLUINTEGER value = static_cast<SQLUINTEGER>(timeout);
-
-	checkError(Poco::Data::ODBC::SQLSetConnectAttr(_db,
-		SQL_ATTR_CONNECTION_TIMEOUT,
-		&value,
-		SQL_IS_UINTEGER), "Failed to set connection timeout.");
-}
-
-
-std::size_t SessionImpl::getConnectionTimeout()
-{
-	SQLULEN value = 0;
-
-	checkError(Poco::Data::ODBC::SQLGetConnectAttr(_db,
-		SQL_ATTR_CONNECTION_TIMEOUT,
-		&value,
-		0,
-		0), "Failed to get connection timeout.");
-
-	return value;
-}
-
-
-bool SessionImpl::canTransact()
-{
-	if (ODBC_TXN_CAPABILITY_UNKNOWN == _canTransact)
-	{
-		SQLUSMALLINT ret;
-		checkError(Poco::Data::ODBC::SQLGetInfo(_db, SQL_TXN_CAPABLE, &ret, 0, 0), 
-			"Failed to obtain transaction capability info.");
-
-		_canTransact = (SQL_TC_NONE != ret) ? 
-			ODBC_TXN_CAPABILITY_TRUE : 
-			ODBC_TXN_CAPABILITY_FALSE;
-	}
-
-	return ODBC_TXN_CAPABILITY_TRUE == _canTransact;
-}
-
-
-void SessionImpl::setTransactionIsolation(Poco::UInt32 ti)
-{
-#if POCO_PTR_IS_64_BIT
-	Poco::UInt64 isolation = 0;
-#else
-	Poco::UInt32 isolation = 0;
-#endif
-
-	if (ti & Session::TRANSACTION_READ_UNCOMMITTED)
-		isolation |= SQL_TXN_READ_UNCOMMITTED;
-
-	if (ti & Session::TRANSACTION_READ_COMMITTED)
-		isolation |= SQL_TXN_READ_COMMITTED;
-
-	if (ti & Session::TRANSACTION_REPEATABLE_READ)
-		isolation |= SQL_TXN_REPEATABLE_READ;
-
-	if (ti & Session::TRANSACTION_SERIALIZABLE)
-		isolation |= SQL_TXN_SERIALIZABLE;
-
-	checkError(SQLSetConnectAttr(_db, SQL_ATTR_TXN_ISOLATION, (SQLPOINTER) isolation, 0));
-}
-
-
-Poco::UInt32 SessionImpl::getTransactionIsolation()
-{
-	SQLULEN isolation = 0;
-	checkError(SQLGetConnectAttr(_db, SQL_ATTR_TXN_ISOLATION,
-		&isolation,
-		0,
-		0));
-
-	return transactionIsolation(isolation);
-}
-
-
-bool SessionImpl::hasTransactionIsolation(Poco::UInt32 ti)
-{
-	if (isTransaction()) throw InvalidAccessException();
-
-	bool retval = true;
-	Poco::UInt32 old = getTransactionIsolation();
-	try { setTransactionIsolation(ti); }
-	catch (Poco::Exception&) { retval = false; }
-	setTransactionIsolation(old);
-	return retval;
-}
-
-
-Poco::UInt32 SessionImpl::getDefaultTransactionIsolation()
-{
-	SQLUINTEGER isolation = 0;
-	checkError(SQLGetInfo(_db, SQL_DEFAULT_TXN_ISOLATION,
-		&isolation,
-		0,
-		0));
-
-	return transactionIsolation(isolation);
-}
-
-
-Poco::UInt32 SessionImpl::transactionIsolation(SQLULEN isolation)
-{
-	if (0 == isolation)
-		throw InvalidArgumentException("transactionIsolation(SQLUINTEGER)");
-
-	Poco::UInt32 ret = 0;
-
-	if (isolation & SQL_TXN_READ_UNCOMMITTED)
-		ret |= Session::TRANSACTION_READ_UNCOMMITTED;
-
-	if (isolation & SQL_TXN_READ_COMMITTED)
-		ret |= Session::TRANSACTION_READ_COMMITTED;
-
-	if (isolation & SQL_TXN_REPEATABLE_READ)
-		ret |= Session::TRANSACTION_REPEATABLE_READ;
-
-	if (isolation & SQL_TXN_SERIALIZABLE)
-		ret |= Session::TRANSACTION_SERIALIZABLE;
-
-	if (0 == ret)
-		throw InvalidArgumentException("transactionIsolation(SQLUINTEGER)");
-
-	return ret;
-}
-
-
-void SessionImpl::autoCommit(const std::string&, bool val)
-{
-	checkError(Poco::Data::ODBC::SQLSetConnectAttr(_db, 
-		SQL_ATTR_AUTOCOMMIT, 
-		val ? (SQLPOINTER) SQL_AUTOCOMMIT_ON : 
-			(SQLPOINTER) SQL_AUTOCOMMIT_OFF, 
-		SQL_IS_UINTEGER), "Failed to set automatic commit.");
-}
-
-
-bool SessionImpl::isAutoCommit(const std::string&)
-{
-	SQLULEN value = 0;
-
-	checkError(Poco::Data::ODBC::SQLGetConnectAttr(_db,
-		SQL_ATTR_AUTOCOMMIT,
-		&value,
-		0,
-		0));
-
-	return (0 != value);
-}
-
-
-bool SessionImpl::isTransaction()
-{
-	if (!canTransact()) return false;
-
-	SQLULEN value = 0;
-	checkError(Poco::Data::ODBC::SQLGetConnectAttr(_db,
-		SQL_ATTR_AUTOCOMMIT,
-		&value,
-		0,
-		0));
-
-	if (0 == value) return _inTransaction;
-	else return false;
-}
-
-
-void SessionImpl::begin()
-{
-	if (isAutoCommit())
-		throw InvalidAccessException("Session in auto commit mode.");
-
-	{
-		Poco::FastMutex::ScopedLock l(_mutex);
-
-		if (_inTransaction)
-			throw InvalidAccessException("Transaction in progress.");
-
-		_inTransaction = true;
-	}
-}
-
-
-void SessionImpl::commit()
-{
-	if (!isAutoCommit())
-		checkError(SQLEndTran(SQL_HANDLE_DBC, _db, SQL_COMMIT));
-
-	_inTransaction = false;
-}
-
-
-void SessionImpl::rollback()
-{
-	if (!isAutoCommit())
-		checkError(SQLEndTran(SQL_HANDLE_DBC, _db, SQL_ROLLBACK));
-
-	_inTransaction = false;
-}
-
-
-void SessionImpl::close()
-{
-	if (!isConnected()) return;
-
-	try
-	{
-		commit();
-	}
-	catch (ConnectionException&) 
-	{
-	}
-
-	SQLDisconnect(_db);
-}
-
-
-int SessionImpl::maxStatementLength()
-{
-	SQLUINTEGER info;
-	SQLRETURN rc = 0;
-	if (Utility::isError(rc = Poco::Data::ODBC::SQLGetInfo(_db,
-		SQL_MAXIMUM_STATEMENT_LENGTH,
-		(SQLPOINTER) &info,
-		0,
-		0)))
-	{
-		throw ConnectionException(_db, 
-			"SQLGetInfo(SQL_MAXIMUM_STATEMENT_LENGTH)");
-	}
-
-	return info;
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/TypeInfo.cpp b/contrib/poco/Data/ODBC/src/TypeInfo.cpp
deleted file mode 100644
index ca5aa0eb1..000000000
--- a/contrib/poco/Data/ODBC/src/TypeInfo.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-//
-// TypeInfo.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  TypeInfo
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/TypeInfo.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-#include "Poco/Format.h"
-#include "Poco/Exception.h"
-#include <iostream>
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-TypeInfo::TypeInfo(SQLHDBC* pHDBC): _pHDBC(pHDBC)
-{
-	fillCTypes();
-	fillSQLTypes();
-	if (_pHDBC) fillTypeInfo(*_pHDBC);
-}
-
-
-TypeInfo::~TypeInfo()
-{
-}
-
-
-void TypeInfo::fillCTypes()
-{
-	_cDataTypes.insert(ValueType(SQL_CHAR, SQL_C_CHAR));
-	_cDataTypes.insert(ValueType(SQL_VARCHAR, SQL_C_CHAR));
-	_cDataTypes.insert(ValueType(SQL_LONGVARCHAR, SQL_C_CHAR));
-	_cDataTypes.insert(ValueType(SQL_DECIMAL, SQL_C_DOUBLE));
-	_cDataTypes.insert(ValueType(SQL_NUMERIC, SQL_C_DOUBLE));
-	_cDataTypes.insert(ValueType(SQL_BIT, SQL_C_BIT));
-	_cDataTypes.insert(ValueType(SQL_TINYINT, SQL_C_STINYINT));
-	_cDataTypes.insert(ValueType(SQL_SMALLINT, SQL_C_SSHORT));
-	_cDataTypes.insert(ValueType(SQL_INTEGER, SQL_C_SLONG));
-	_cDataTypes.insert(ValueType(SQL_BIGINT, SQL_C_SBIGINT));
-	_cDataTypes.insert(ValueType(SQL_REAL, SQL_C_FLOAT));
-	_cDataTypes.insert(ValueType(SQL_FLOAT, SQL_C_DOUBLE));
-	_cDataTypes.insert(ValueType(SQL_DOUBLE, SQL_C_DOUBLE));
-	_cDataTypes.insert(ValueType(SQL_BINARY, SQL_C_BINARY));
-	_cDataTypes.insert(ValueType(SQL_VARBINARY, SQL_C_BINARY));
-	_cDataTypes.insert(ValueType(SQL_LONGVARBINARY, SQL_C_BINARY));
-	_cDataTypes.insert(ValueType(SQL_TYPE_DATE, SQL_C_TYPE_DATE));
-	_cDataTypes.insert(ValueType(SQL_TYPE_TIME, SQL_C_TYPE_TIME));
-	_cDataTypes.insert(ValueType(SQL_TYPE_TIMESTAMP, SQL_C_TYPE_TIMESTAMP));
-}
-
-
-void TypeInfo::fillSQLTypes()
-{
-	_sqlDataTypes.insert(ValueType(SQL_C_CHAR, SQL_LONGVARCHAR));
-	_sqlDataTypes.insert(ValueType(SQL_C_BIT, SQL_BIT));
-	_sqlDataTypes.insert(ValueType(SQL_C_TINYINT, SQL_TINYINT));
-	_sqlDataTypes.insert(ValueType(SQL_C_STINYINT, SQL_TINYINT));
-	_sqlDataTypes.insert(ValueType(SQL_C_UTINYINT, SQL_TINYINT));
-	_sqlDataTypes.insert(ValueType(SQL_C_SHORT, SQL_SMALLINT));
-	_sqlDataTypes.insert(ValueType(SQL_C_SSHORT, SQL_SMALLINT));
-	_sqlDataTypes.insert(ValueType(SQL_C_USHORT, SQL_SMALLINT));
-	_sqlDataTypes.insert(ValueType(SQL_C_LONG, SQL_INTEGER));
-	_sqlDataTypes.insert(ValueType(SQL_C_SLONG, SQL_INTEGER));
-	_sqlDataTypes.insert(ValueType(SQL_C_ULONG, SQL_INTEGER));
-	_sqlDataTypes.insert(ValueType(SQL_C_SBIGINT, SQL_BIGINT));
-	_sqlDataTypes.insert(ValueType(SQL_C_UBIGINT, SQL_BIGINT));
-	_sqlDataTypes.insert(ValueType(SQL_C_FLOAT, SQL_REAL));
-	_sqlDataTypes.insert(ValueType(SQL_C_DOUBLE, SQL_DOUBLE));
-	_sqlDataTypes.insert(ValueType(SQL_C_BINARY, SQL_LONGVARBINARY));
-	_sqlDataTypes.insert(ValueType(SQL_C_TYPE_DATE, SQL_TYPE_DATE));
-	_sqlDataTypes.insert(ValueType(SQL_C_TYPE_TIME, SQL_TYPE_TIME));
-	_sqlDataTypes.insert(ValueType(SQL_C_TYPE_TIMESTAMP, SQL_TYPE_TIMESTAMP));
-}
-
-
-void TypeInfo::fillTypeInfo(SQLHDBC pHDBC)
-{
-	_pHDBC = &pHDBC;
-
-	if (_typeInfo.empty() && _pHDBC)
-	{
-		const static int stringSize = 512;
-		TypeInfoVec().swap(_typeInfo);
-
-		SQLRETURN rc;
-		SQLHSTMT hstmt = SQL_NULL_HSTMT;
-
-		rc = SQLAllocHandle(SQL_HANDLE_STMT, *_pHDBC, &hstmt);
-		if (!SQL_SUCCEEDED(rc))
-			throw StatementException(hstmt, "SQLGetData()");
-
-		rc = SQLGetTypeInfo(hstmt, SQL_ALL_TYPES);
-		if (SQL_SUCCEEDED(rc))
-		{
-			while (SQLFetch(hstmt) != SQL_NO_DATA_FOUND)
-			{
-				char typeName[stringSize] = { 0 };
-				char literalPrefix[stringSize] = { 0 };
-				char literalSuffix[stringSize] = { 0 };
-				char createParams[stringSize] = { 0 };
-				char localTypeName[stringSize] = { 0 };
-				
-				TypeInfoTup ti("TYPE_NAME", "",
-					"DATA_TYPE", 0,
-					"COLUMN_SIZE", 0,
-					"LITERAL_PREFIX", "",
-					"LITERAL_SUFFIX", "",
-					"CREATE_PARAMS", "",
-					"NULLABLE", 0,
-					"CASE_SENSITIVE", 0,
-					"SEARCHABLE", 0,
-					"UNSIGNED_ATTRIBUTE", 0,
-					"FIXED_PREC_SCALE", 0,
-					"AUTO_UNIQUE_VALUE", 0,
-					"LOCAL_TYPE_NAME", "",
-					"MINIMUM_SCALE", 0,
-					"MAXIMUM_SCALE", 0,
-					"SQL_DATA_TYPE", 0,
-					"SQL_DATETIME_SUB", 0,
-					"NUM_PREC_RADIX", 0,
-					"INTERVAL_PRECISION", 0);
-
-				SQLLEN ind = 0;
-				rc = SQLGetData(hstmt, 1, SQL_C_CHAR, typeName, sizeof(typeName), &ind);
-				ti.set<0>(typeName);
-				rc = SQLGetData(hstmt, 2, SQL_C_SSHORT, &ti.get<1>(), sizeof(SQLSMALLINT), &ind);
-				rc = SQLGetData(hstmt, 3, SQL_C_SLONG, &ti.get<2>(), sizeof(SQLINTEGER), &ind);
-				rc = SQLGetData(hstmt, 4, SQL_C_CHAR, literalPrefix, sizeof(literalPrefix), &ind);
-				ti.set<3>(literalPrefix);
-				rc = SQLGetData(hstmt, 5, SQL_C_CHAR, literalSuffix, sizeof(literalSuffix), &ind);
-				ti.set<4>(literalSuffix);
-				rc = SQLGetData(hstmt, 6, SQL_C_CHAR, createParams, sizeof(createParams), &ind);
-				ti.set<5>(createParams);
-				rc = SQLGetData(hstmt, 7, SQL_C_SSHORT, &ti.get<6>(), sizeof(SQLSMALLINT), &ind); 
-				rc = SQLGetData(hstmt, 8, SQL_C_SSHORT, &ti.get<7>(), sizeof(SQLSMALLINT), &ind); 
-				rc = SQLGetData(hstmt, 9, SQL_C_SSHORT, &ti.get<8>(), sizeof(SQLSMALLINT), &ind); 
-				rc = SQLGetData(hstmt, 10, SQL_C_SSHORT, &ti.get<9>(), sizeof(SQLSMALLINT), &ind); 
-				rc = SQLGetData(hstmt, 11, SQL_C_SSHORT, &ti.get<10>(), sizeof(SQLSMALLINT), &ind);
-				rc = SQLGetData(hstmt, 12, SQL_C_SSHORT, &ti.get<11>(), sizeof(SQLSMALLINT), &ind);
-				rc = SQLGetData(hstmt, 13, SQL_C_CHAR, localTypeName, sizeof(localTypeName), &ind);
-				ti.set<12>(localTypeName);
-				rc = SQLGetData(hstmt, 14, SQL_C_SSHORT, &ti.get<13>(), sizeof(SQLSMALLINT), &ind);
-				rc = SQLGetData(hstmt, 15, SQL_C_SSHORT, &ti.get<14>(), sizeof(SQLSMALLINT), &ind);
-				rc = SQLGetData(hstmt, 16, SQL_C_SSHORT, &ti.get<15>(), sizeof(SQLSMALLINT), &ind);
-				rc = SQLGetData(hstmt, 17, SQL_C_SSHORT, &ti.get<16>(), sizeof(SQLSMALLINT), &ind);
-				rc = SQLGetData(hstmt, 18, SQL_C_SLONG, &ti.get<17>(), sizeof(SQLINTEGER), &ind);
-				rc = SQLGetData(hstmt, 19, SQL_C_SSHORT, &ti.get<18>(), sizeof(SQLSMALLINT), &ind);
-
-				_typeInfo.push_back(ti);
-			}
-		}
-
-		SQLFreeHandle(SQL_HANDLE_STMT, hstmt);
-	}
-}
-
-
-DynamicAny TypeInfo::getInfo(SQLSMALLINT type, const std::string& param) const
-{
-	TypeInfoVec::const_iterator it = _typeInfo.begin();
-	TypeInfoVec::const_iterator end = _typeInfo.end();
-	for (; it != end; ++it)
-	{
-		if (type == it->get<1>())
-			return (*it)[param];
-	}
-
-	throw NotFoundException(param);
-}
-
-
-bool TypeInfo::tryGetInfo(SQLSMALLINT type, const std::string& param, DynamicAny& result) const
-{
-	TypeInfoVec::const_iterator it = _typeInfo.begin();
-	TypeInfoVec::const_iterator end = _typeInfo.end();
-	for (; it != end; ++it)
-	{
-		if (type == it->get<1>())
-		{
-			result = (*it)[param];
-			return true;
-		}
-	}
-	
-	return false;
-}
-
-
-int TypeInfo::cDataType(int sqlDataType) const
-{
-	DataTypeMap::const_iterator it = _cDataTypes.find(sqlDataType);
-
-	if (_cDataTypes.end() == it)
-		throw NotFoundException(format("C data type not found for SQL data type: %d", sqlDataType));
-
-	return it->second;
-}
-
-
-int TypeInfo::sqlDataType(int cDataType) const
-{
-	DataTypeMap::const_iterator it = _sqlDataTypes.find(cDataType);
-
-	if (_sqlDataTypes.end() == it)
-		throw NotFoundException(format("SQL data type not found for C data type: %d", cDataType));
-
-	return it->second;
-}
-
-
-void TypeInfo::print(std::ostream& ostr)
-{
-	if (_typeInfo.empty())
-	{
-		ostr << "No data found.";
-		return;
-	}
-
-	TypeInfoTup::NameVec::const_iterator nIt = (*_typeInfo[0].names()).begin();
-	TypeInfoTup::NameVec::const_iterator nItEnd = (*_typeInfo[0].names()).end();
-	for (; nIt != nItEnd; ++nIt)
-		ostr << *nIt << "\t";
-
-	ostr << std::endl;
-
-	TypeInfoVec::const_iterator it = _typeInfo.begin();
-	TypeInfoVec::const_iterator end = _typeInfo.end();
-
-	for (; it != end; ++it)
-	{
-		ostr << it->get<0>() << "\t" 
-			<< it->get<1>() << "\t" 
-			<< it->get<2>() << "\t" 
-			<< it->get<3>() << "\t" 
-			<< it->get<4>() << "\t" 
-			<< it->get<5>() << "\t" 
-			<< it->get<6>() << "\t" 
-			<< it->get<7>() << "\t" 
-			<< it->get<8>() << "\t" 
-			<< it->get<9>() << "\t" 
-			<< it->get<10>() << "\t" 
-			<< it->get<11>() << "\t" 
-			<< it->get<12>() << "\t" 
-			<< it->get<13>() << "\t" 
-			<< it->get<14>() << "\t"
-			<< it->get<15>() << "\t" 
-			<< it->get<16>() << "\t" 
-			<< it->get<17>() << "\t" 
-			<< it->get<18>() << std::endl;
-	}
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/Unicode.cpp b/contrib/poco/Data/ODBC/src/Unicode.cpp
deleted file mode 100644
index 5129972cd..000000000
--- a/contrib/poco/Data/ODBC/src/Unicode.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Unicode.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Unicode
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/ODBC.h"
-
-
-#if defined(POCO_ODBC_UNICODE_WINDOWS)
-#include "Unicode_WIN32.cpp"
-#elif defined(POCO_ODBC_UNICODE_UNIXODBC)
-#include "Unicode_UNIXODBC.cpp"
-#endif
diff --git a/contrib/poco/Data/ODBC/src/Unicode_UNIXODBC.cpp b/contrib/poco/Data/ODBC/src/Unicode_UNIXODBC.cpp
deleted file mode 100644
index 1c5555f8c..000000000
--- a/contrib/poco/Data/ODBC/src/Unicode_UNIXODBC.cpp
+++ /dev/null
@@ -1,774 +0,0 @@
-//
-// Unicode.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Unicode
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/ODBC.h"
-#include "Poco/Data/ODBC/Unicode_UNIXODBC.h"
-#include "Poco/TextConverter.h"
-#include "Poco/UTF8Encoding.h"
-#include "Poco/UTF16Encoding.h"
-#include "Poco/Buffer.h"
-#include "Poco/Exception.h"
-
-
-using Poco::Buffer;
-using Poco::UTF8Encoding;
-using Poco::UTF16Encoding;
-using Poco::TextConverter;
-using Poco::InvalidArgumentException;
-using Poco::NotImplementedException;
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-void makeUTF16(SQLCHAR* pSQLChar, SQLINTEGER length, std::string& target)
-{
-	int len = length;
-	if (SQL_NTS == len) 
-		len = (int) std::strlen((const char *) pSQLChar);
-
-	UTF8Encoding utf8Encoding;
-	UTF16Encoding utf16Encoding;
-	TextConverter converter(utf8Encoding, utf16Encoding);
-
-	if (0 != converter.convert(pSQLChar, len, target))
-		throw DataFormatException("Error converting UTF-8 to UTF-16");
-}
-
-
-void makeUTF8(Poco::Buffer<SQLWCHAR>& buffer, SQLINTEGER length, SQLPOINTER pTarget, SQLINTEGER targetLength)
-{
-	UTF8Encoding utf8Encoding;
-	UTF16Encoding utf16Encoding;
-	TextConverter converter(utf16Encoding, utf8Encoding);
-
-	std::string result;
-	if (0 != converter.convert(buffer.begin(), length, result))
-		throw DataFormatException("Error converting UTF-16 to UTF-8");
-	
-	std::memset(pTarget, 0, targetLength);
-	std::strncpy((char*) pTarget, result.c_str(), result.size() < targetLength ? result.size() : targetLength);
-}
-
-
-SQLRETURN SQLColAttribute(SQLHSTMT hstmt,
-	SQLUSMALLINT   iCol,
-	SQLUSMALLINT   iField,
-	SQLPOINTER	   pCharAttr,
-	SQLSMALLINT	   cbCharAttrMax,	
-	SQLSMALLINT*   pcbCharAttr,
-	NumAttrPtrType pNumAttr)
-{
-	if (isString(pCharAttr, cbCharAttrMax))
-	{
-		Buffer<SQLWCHAR> buffer(stringLength(pCharAttr, cbCharAttrMax));
-
-		SQLRETURN rc = SQLColAttributeW(hstmt,
-			iCol,
-			iField,
-			buffer.begin(),
-			(SQLSMALLINT) buffer.sizeBytes(),
-			pcbCharAttr,
-			pNumAttr);
-
-		makeUTF8(buffer, *pcbCharAttr, pCharAttr, cbCharAttrMax);
-		return rc;
-	}
-
-	return SQLColAttributeW(hstmt,
-		iCol,
-		iField,
-		pCharAttr,
-		cbCharAttrMax,	
-		pcbCharAttr,
-		pNumAttr);
-}
-
-
-SQLRETURN SQLColAttributes(SQLHSTMT hstmt,
-	SQLUSMALLINT icol,
-	SQLUSMALLINT fDescType,
-	SQLPOINTER   rgbDesc,
-	SQLSMALLINT  cbDescMax,
-	SQLSMALLINT* pcbDesc,
-	SQLLEN*      pfDesc)
-{
-	return SQLColAttribute(hstmt,
-		icol,
-		fDescType,
-		rgbDesc,
-		cbDescMax,
-		pcbDesc,
-		pfDesc);
-}
-
-
-SQLRETURN SQLConnect(SQLHDBC hdbc,
-	SQLCHAR*    szDSN,
-	SQLSMALLINT cbDSN,
-	SQLCHAR*    szUID,
-	SQLSMALLINT cbUID,
-	SQLCHAR*    szAuthStr,
-	SQLSMALLINT cbAuthStr)
-{
-	std::string sqlDSN;
-	makeUTF16(szDSN, cbDSN, sqlDSN);
-
-	std::string sqlUID;
-	makeUTF16(szUID, cbUID, sqlUID);
-
-	std::string sqlPWD;
-	makeUTF16(szAuthStr, cbAuthStr, sqlPWD);
-	
-	return SQLConnectW(hdbc, 
-		(SQLWCHAR*) sqlDSN.c_str(), cbDSN,
-		(SQLWCHAR*) sqlUID.c_str(), cbUID,
-		(SQLWCHAR*) sqlPWD.c_str(), cbAuthStr);
-}
-
-
-SQLRETURN SQLDescribeCol(SQLHSTMT hstmt,
-	SQLUSMALLINT icol,
-	SQLCHAR*     szColName,
-	SQLSMALLINT  cbColNameMax,
-	SQLSMALLINT* pcbColName,
-	SQLSMALLINT* pfSqlType,
-	SQLULEN*     pcbColDef,
-	SQLSMALLINT* pibScale,
-	SQLSMALLINT* pfNullable)
-{
-	Buffer<SQLWCHAR> buffer(cbColNameMax);
-	SQLRETURN rc = SQLDescribeColW(hstmt,
-		icol,
-		(SQLWCHAR*) buffer.begin(),
-		(SQLSMALLINT) buffer.size(),
-		pcbColName,
-		pfSqlType,
-		pcbColDef,
-		pibScale,
-		pfNullable);
-
-	makeUTF8(buffer, *pcbColName * sizeof(SQLWCHAR), szColName, cbColNameMax);
-	return rc;
-}
-
-
-SQLRETURN SQLError(SQLHENV henv,
-	SQLHDBC      hdbc,
-	SQLHSTMT     hstmt,
-	SQLCHAR*     szSqlState,
-	SQLINTEGER*  pfNativeError,
-	SQLCHAR*     szErrorMsg,
-	SQLSMALLINT  cbErrorMsgMax,
-	SQLSMALLINT* pcbErrorMsg)
-{
-	throw NotImplementedException("SQLError is obsolete. "
-		"Use SQLGetDiagRec instead.");
-}
-
-
-SQLRETURN SQLExecDirect(SQLHSTMT hstmt,
-	SQLCHAR*   szSqlStr,
-	SQLINTEGER cbSqlStr)
-{
-	std::string sqlStr;
-	makeUTF16(szSqlStr, cbSqlStr, sqlStr);
-
-	return SQLExecDirectW(hstmt, (SQLWCHAR*) sqlStr.c_str(), cbSqlStr);
-}
-
-
-SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc,
-	SQLINTEGER  fAttribute,
-	SQLPOINTER  rgbValue,
-	SQLINTEGER  cbValueMax,
-	SQLINTEGER* pcbValue)
-{
-	if (isString(rgbValue, cbValueMax))
-	{
-		Buffer<SQLWCHAR> buffer(stringLength(rgbValue, cbValueMax));
-
-		SQLRETURN rc = SQLGetConnectAttrW(hdbc,
-				fAttribute,
-				buffer.begin(),
-				(SQLINTEGER) buffer.sizeBytes(),
-				pcbValue);
-
-		makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax);
-		return rc;
-	}
-	
-
-	return SQLGetConnectAttrW(hdbc,
-		fAttribute,
-		rgbValue,
-		cbValueMax,
-		pcbValue);
-}
-
-
-SQLRETURN SQLGetCursorName(SQLHSTMT hstmt,
-	SQLCHAR*     szCursor,
-	SQLSMALLINT  cbCursorMax,
-	SQLSMALLINT* pcbCursor)
-{
-	throw NotImplementedException("Not implemented");
-}
-
-
-SQLRETURN SQLSetDescField(SQLHDESC hdesc,
-	SQLSMALLINT iRecord, 
-	SQLSMALLINT iField,
-	SQLPOINTER  rgbValue, 
-	SQLINTEGER  cbValueMax)
-{
-	if (isString(rgbValue, cbValueMax))
-	{
-		std::string str;
-		makeUTF16((SQLCHAR*) rgbValue, cbValueMax, str);
-
-		return SQLSetDescFieldW(hdesc,
-			iRecord, 
-			iField,
-			(SQLPOINTER) str.c_str(), 
-			(SQLINTEGER) str.size() * sizeof(SQLWCHAR));
-	}
-
-	return SQLSetDescFieldW(hdesc,
-		iRecord, 
-		iField,
-		rgbValue, 
-		cbValueMax);
-}
-
-
-SQLRETURN SQLGetDescField(SQLHDESC hdesc,
-	SQLSMALLINT iRecord,
-	SQLSMALLINT iField,
-	SQLPOINTER  rgbValue,
-	SQLINTEGER	cbValueMax,
-	SQLINTEGER* pcbValue)
-{
-	if (isString(rgbValue, cbValueMax))
-	{
-		Buffer<SQLWCHAR> buffer(stringLength(rgbValue, cbValueMax));
-
-		SQLRETURN rc = SQLGetDescFieldW(hdesc,
-			iRecord,
-			iField,
-			buffer.begin(),
-			(SQLINTEGER) buffer.sizeBytes(),
-			pcbValue);
-
-		makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax);
-
-		return rc;
-	}
-
-	return SQLGetDescFieldW(hdesc,
-		iRecord,
-		iField,
-		rgbValue,
-		cbValueMax,
-		pcbValue);
-}
-
-
-SQLRETURN SQLGetDescRec(SQLHDESC hdesc,
-	SQLSMALLINT  iRecord,
-	SQLCHAR*     szName,
-	SQLSMALLINT  cbNameMax,
-	SQLSMALLINT* pcbName,
-	SQLSMALLINT* pfType,
-	SQLSMALLINT* pfSubType,
-	SQLLEN*      pLength,
-	SQLSMALLINT* pPrecision, 
-	SQLSMALLINT* pScale,
-	SQLSMALLINT* pNullable)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLGetDiagField(SQLSMALLINT fHandleType,
-	SQLHANDLE    handle,
-	SQLSMALLINT  iRecord,
-	SQLSMALLINT  fDiagField,
-	SQLPOINTER   rgbDiagInfo,
-	SQLSMALLINT  cbDiagInfoMax,
-	SQLSMALLINT* pcbDiagInfo)
-{
-	if (isString(rgbDiagInfo, cbDiagInfoMax))
-	{
-		Buffer<SQLWCHAR> buffer(stringLength(rgbDiagInfo, cbDiagInfoMax));
-
-		SQLRETURN rc = SQLGetDiagFieldW(fHandleType,
-			handle,
-			iRecord,
-			fDiagField,
-			buffer.begin(),
-			(SQLSMALLINT) buffer.sizeBytes(),
-			pcbDiagInfo);
-
-		makeUTF8(buffer, *pcbDiagInfo, rgbDiagInfo, cbDiagInfoMax);
-
-		return rc;
-	}
-
-	return SQLGetDiagFieldW(fHandleType,
-		handle,
-		iRecord,
-		fDiagField,
-		rgbDiagInfo,
-		cbDiagInfoMax,
-		pcbDiagInfo);
-}
-
-
-SQLRETURN SQLGetDiagRec(SQLSMALLINT fHandleType,
-	SQLHANDLE    handle,
-	SQLSMALLINT  iRecord,
-	SQLCHAR*     szSqlState,
-	SQLINTEGER*  pfNativeError,
-	SQLCHAR*     szErrorMsg,
-	SQLSMALLINT  cbErrorMsgMax,
-	SQLSMALLINT* pcbErrorMsg)
-{
-	const SQLINTEGER stateLen = SQL_SQLSTATE_SIZE + 1;
-	Buffer<SQLWCHAR> bufState(stateLen);
-	Buffer<SQLWCHAR> bufErr(cbErrorMsgMax);
-
-	SQLRETURN rc = SQLGetDiagRecW(fHandleType,
-		handle,
-		iRecord,
-		bufState.begin(),
-		pfNativeError,
-		bufErr.begin(),
-		(SQLSMALLINT) bufErr.size(),
-		pcbErrorMsg);
-
-	makeUTF8(bufState, stateLen * sizeof(SQLWCHAR), szSqlState, stateLen);
-	makeUTF8(bufErr, *pcbErrorMsg * sizeof(SQLWCHAR), szErrorMsg, cbErrorMsgMax);
-
-	return rc;
-}
-
-
-SQLRETURN SQLPrepare(SQLHSTMT hstmt,
-	SQLCHAR*   szSqlStr,
-	SQLINTEGER cbSqlStr)
-{
-	std::string sqlStr;
-	makeUTF16(szSqlStr, cbSqlStr, sqlStr);
-
-	return SQLPrepareW(hstmt, (SQLWCHAR*) sqlStr.c_str(), (SQLINTEGER) sqlStr.size());
-}
-
-
-SQLRETURN SQLSetConnectAttr(SQLHDBC hdbc,
-	SQLINTEGER fAttribute,
-	SQLPOINTER rgbValue,
-	SQLINTEGER cbValue)
-{
-	if (isString(rgbValue, cbValue))
-	{
-		std::string str;
-		makeUTF16((SQLCHAR*) rgbValue, cbValue, str);
-
-		return SQLSetConnectAttrW(hdbc,
-			fAttribute,
-			(SQLWCHAR*) str.c_str(), 
-			(SQLINTEGER) str.size() * sizeof(SQLWCHAR));
-	}
-
-	return SQLSetConnectAttrW(hdbc,	fAttribute,	rgbValue, cbValue);
-}
-
-
-SQLRETURN SQLSetCursorName(SQLHSTMT hstmt,
-	SQLCHAR*    szCursor,
-	SQLSMALLINT cbCursor)
-{
-	throw NotImplementedException("Not implemented");
-}
-
-
-SQLRETURN SQLSetStmtAttr(SQLHSTMT hstmt,
-	SQLINTEGER fAttribute,
-	SQLPOINTER rgbValue,
-	SQLINTEGER cbValueMax)
-{
-	if (isString(rgbValue, cbValueMax))
-	{
-		std::string str;
-		makeUTF16((SQLCHAR*) rgbValue, cbValueMax, str);
-
-		return SQLSetStmtAttrW(hstmt,
-			fAttribute,
-			(SQLWCHAR*) str.c_str(),
-			(SQLINTEGER) str.size());
-	}
-
-	return SQLSetStmtAttrW(hstmt, fAttribute, rgbValue,	cbValueMax);
-}
-
-
-SQLRETURN SQLGetStmtAttr(SQLHSTMT hstmt,
-	SQLINTEGER  fAttribute,
-	SQLPOINTER  rgbValue,
-	SQLINTEGER  cbValueMax,
-	SQLINTEGER* pcbValue)
-{
-	if (isString(rgbValue, cbValueMax))
-	{
-		Buffer<SQLWCHAR> buffer(stringLength(rgbValue, cbValueMax));
-
-		return SQLGetStmtAttrW(hstmt,
-			fAttribute,
-			(SQLPOINTER) buffer.begin(),
-			(SQLINTEGER) buffer.sizeBytes(),
-			pcbValue);
-	}
-
-	return SQLGetStmtAttrW(hstmt, fAttribute, rgbValue, cbValueMax, pcbValue);
-}
-
-
-SQLRETURN SQLColumns(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szTableName,
-	SQLSMALLINT cbTableName,
-	SQLCHAR*    szColumnName,
-	SQLSMALLINT cbColumnName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLGetConnectOption(SQLHDBC hdbc,
-	SQLUSMALLINT fOption,
-	SQLPOINTER   pvParam)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLGetInfo(SQLHDBC hdbc,
-	SQLUSMALLINT fInfoType,
-	SQLPOINTER   rgbInfoValue,
-	SQLSMALLINT  cbInfoValueMax,
-	SQLSMALLINT* pcbInfoValue)
-{
-	if (cbInfoValueMax)
-	{
-		Buffer<SQLWCHAR> buffer(cbInfoValueMax);
-
-		SQLRETURN rc = SQLGetInfoW(hdbc,
-			fInfoType,
-			(SQLPOINTER) buffer.begin(),
-			(SQLSMALLINT) buffer.sizeBytes(),
-			pcbInfoValue);
-
-		makeUTF8(buffer, *pcbInfoValue, rgbInfoValue, cbInfoValueMax);
-		
-		return rc;
-	}
-
-	return SQLGetInfoW(hdbc, fInfoType, rgbInfoValue, cbInfoValueMax, pcbInfoValue);
-}
-
-
-SQLRETURN SQLGetTypeInfo(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
-{
-	return SQLGetTypeInfoW(StatementHandle, DataType);
-}
-
-
-SQLRETURN SQLSetConnectOption(SQLHDBC hdbc,
-	SQLUSMALLINT fOption,
-	SQLULEN      vParam)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLSpecialColumns(SQLHSTMT hstmt,
-	SQLUSMALLINT fColType,
-	SQLCHAR*     szCatalogName,
-	SQLSMALLINT  cbCatalogName,
-	SQLCHAR*     szSchemaName,
-	SQLSMALLINT  cbSchemaName,
-	SQLCHAR*     szTableName,
-	SQLSMALLINT  cbTableName,
-	SQLUSMALLINT fScope,
-	SQLUSMALLINT fNullable)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLStatistics(SQLHSTMT hstmt,
-	SQLCHAR*     szCatalogName,
-	SQLSMALLINT  cbCatalogName,
-	SQLCHAR*     szSchemaName,
-	SQLSMALLINT  cbSchemaName,
-	SQLCHAR*     szTableName,
-	SQLSMALLINT  cbTableName,
-	SQLUSMALLINT fUnique,
-	SQLUSMALLINT fAccuracy)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLTables(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szTableName,
-	SQLSMALLINT cbTableName,
-	SQLCHAR*    szTableType,
-	SQLSMALLINT cbTableType)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLDataSources(SQLHENV henv,
-	SQLUSMALLINT fDirection,
-	SQLCHAR*     szDSN,
-	SQLSMALLINT  cbDSNMax,
-	SQLSMALLINT* pcbDSN,
-	SQLCHAR*     szDesc,
-	SQLSMALLINT  cbDescMax,
-	SQLSMALLINT* pcbDesc)
-{
-	Buffer<SQLWCHAR> bufDSN(cbDSNMax);
-	Buffer<SQLWCHAR> bufDesc(cbDescMax);
-
-	SQLRETURN rc = SQLDataSourcesW(henv,
-		fDirection,
-		bufDSN.begin(),
-		(SQLSMALLINT) bufDSN.size(),
-		pcbDSN,
-		bufDesc.begin(),
-		(SQLSMALLINT) bufDesc.size(),
-		pcbDesc);
-
-	makeUTF8(bufDSN, *pcbDSN * sizeof(SQLWCHAR), szDSN, cbDSNMax);
-	makeUTF8(bufDesc, *pcbDesc * sizeof(SQLWCHAR), szDesc, cbDescMax);
-
-	return rc;
-}
-
-
-SQLRETURN SQLDriverConnect(SQLHDBC hdbc,
-	SQLHWND      hwnd,
-	SQLCHAR*     szConnStrIn,
-	SQLSMALLINT  cbConnStrIn,
-	SQLCHAR*     szConnStrOut,
-	SQLSMALLINT  cbConnStrOutMax,
-	SQLSMALLINT* pcbConnStrOut,
-	SQLUSMALLINT fDriverCompletion)
-{
-	SQLSMALLINT len = cbConnStrIn;
-	if (SQL_NTS == len) 
-		len = (SQLSMALLINT) std::strlen((const char*) szConnStrIn) + 1;
-
-	std::string connStrIn;
-	makeUTF16(szConnStrIn, len, connStrIn);
-	
-	Buffer<SQLWCHAR> out(cbConnStrOutMax);
-	SQLRETURN rc = SQLDriverConnectW(hdbc,
-		hwnd,
-		(SQLWCHAR*) connStrIn.c_str(),
-		(SQLSMALLINT) connStrIn.size(),
-		out.begin(),
-		cbConnStrOutMax,
-		pcbConnStrOut,
-		fDriverCompletion);
-
-	makeUTF8(out, *pcbConnStrOut * sizeof(SQLWCHAR), pcbConnStrOut, cbConnStrOutMax);
-
-	return rc;
-}
-
-
-SQLRETURN SQLBrowseConnect(SQLHDBC hdbc,
-	SQLCHAR*     szConnStrIn,
-	SQLSMALLINT  cbConnStrIn,
-	SQLCHAR*     szConnStrOut,
-	SQLSMALLINT  cbConnStrOutMax,
-	SQLSMALLINT* pcbConnStrOut)
-{
-	std::string str;
-	makeUTF16(szConnStrIn, cbConnStrIn, str);
-
-	Buffer<SQLWCHAR> bufConnStrOut(cbConnStrOutMax);
-
-	SQLRETURN rc = SQLBrowseConnectW(hdbc,
-		(SQLWCHAR*) str.c_str(),
-		(SQLSMALLINT) str.size(),
-		bufConnStrOut.begin(),
-		(SQLSMALLINT) bufConnStrOut.size(),
-		pcbConnStrOut);
-
-	makeUTF8(bufConnStrOut, *pcbConnStrOut * sizeof(SQLWCHAR), szConnStrOut, cbConnStrOutMax);
-
-	return rc;
-}
-
-
-SQLRETURN SQLColumnPrivileges(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szTableName,
-	SQLSMALLINT cbTableName,
-	SQLCHAR*    szColumnName,
-	SQLSMALLINT cbColumnName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLForeignKeys(SQLHSTMT hstmt,
-	SQLCHAR*    szPkCatalogName,
-	SQLSMALLINT cbPkCatalogName,
-	SQLCHAR*    szPkSchemaName,
-	SQLSMALLINT cbPkSchemaName,
-	SQLCHAR*    szPkTableName,
-	SQLSMALLINT cbPkTableName,
-	SQLCHAR*    szFkCatalogName,
-	SQLSMALLINT cbFkCatalogName,
-	SQLCHAR*    szFkSchemaName,
-	SQLSMALLINT cbFkSchemaName,
-	SQLCHAR*    szFkTableName,
-	SQLSMALLINT cbFkTableName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLNativeSql(SQLHDBC hdbc,
-	SQLCHAR*    szSqlStrIn,
-	SQLINTEGER  cbSqlStrIn,
-	SQLCHAR*    szSqlStr,
-	SQLINTEGER  cbSqlStrMax,
-	SQLINTEGER* pcbSqlStr)
-{
-	std::string str;
-	makeUTF16(szSqlStrIn, cbSqlStrIn, str);
-
-	Buffer<SQLWCHAR> bufSQLOut(cbSqlStrMax);
-
-	SQLRETURN rc = SQLNativeSqlW(hdbc,
-		(SQLWCHAR*) str.c_str(),
-		(SQLINTEGER) str.size(),
-		bufSQLOut.begin(),
-		(SQLINTEGER) bufSQLOut.size(),
-		pcbSqlStr);
-
-	makeUTF8(bufSQLOut, *pcbSqlStr * sizeof(SQLWCHAR), szSqlStr, cbSqlStrMax);
-
-	return rc;
-}
-
-
-SQLRETURN SQLPrimaryKeys(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szTableName,
-	SQLSMALLINT cbTableName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLProcedureColumns(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szProcName,
-	SQLSMALLINT cbProcName,
-	SQLCHAR*    szColumnName,
-	SQLSMALLINT cbColumnName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLProcedures(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szProcName,
-	SQLSMALLINT cbProcName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLTablePrivileges(SQLHSTMT hstmt,
-	SQLCHAR*    szCatalogName,
-	SQLSMALLINT cbCatalogName,
-	SQLCHAR*    szSchemaName,
-	SQLSMALLINT cbSchemaName,
-	SQLCHAR*    szTableName,
-	SQLSMALLINT cbTableName)
-{
-	throw NotImplementedException();
-}
-
-
-SQLRETURN SQLDrivers(SQLHENV henv,
-	SQLUSMALLINT fDirection,
-	SQLCHAR*     szDriverDesc,
-	SQLSMALLINT  cbDriverDescMax,
-	SQLSMALLINT* pcbDriverDesc,
-	SQLCHAR*     szDriverAttributes,
-	SQLSMALLINT  cbDrvrAttrMax,
-	SQLSMALLINT* pcbDrvrAttr)
-{
-	Buffer<SQLWCHAR> bufDriverDesc(cbDriverDescMax);
-	Buffer<SQLWCHAR> bufDriverAttr(cbDrvrAttrMax);
-
-	SQLRETURN rc = SQLDriversW(henv,
-		fDirection,
-		bufDriverDesc.begin(),
-		(SQLSMALLINT) bufDriverDesc.size(),
-		pcbDriverDesc,
-		bufDriverAttr.begin(),
-		(SQLSMALLINT) bufDriverAttr.size(),
-		pcbDrvrAttr);
-
-	makeUTF8(bufDriverDesc, *pcbDriverDesc * sizeof(SQLWCHAR), szDriverDesc, cbDriverDescMax);
-	makeUTF8(bufDriverAttr, *pcbDrvrAttr * sizeof(SQLWCHAR), szDriverAttributes, cbDrvrAttrMax);
-
-	return rc;
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/ODBC/src/Utility.cpp b/contrib/poco/Data/ODBC/src/Utility.cpp
deleted file mode 100644
index 62a22a40b..000000000
--- a/contrib/poco/Data/ODBC/src/Utility.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// Utility.cpp
-//
-// Library: Data/ODBC
-// Package: ODBC
-// Module:  Utility
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ODBC/Utility.h"
-#include "Poco/Data/ODBC/Handle.h"
-#include "Poco/Data/ODBC/ODBCException.h"
-#include "Poco/NumberFormatter.h"
-#include "Poco/DateTime.h"
-#include <cmath>
-
-
-namespace Poco {
-namespace Data {
-namespace ODBC {
-
-
-const TypeInfo Utility::_dataTypes;
-
-
-Utility::DriverMap& Utility::drivers(Utility::DriverMap& driverMap)
-{
-	static const EnvironmentHandle henv;
-	const int length = sizeof(SQLCHAR) * 512;
-
-	SQLCHAR desc[length];
-	std::memset(desc, 0, length);
-	SQLSMALLINT len1 = length;
-	SQLCHAR attr[length];
-	std::memset(attr, 0, length);
-	SQLSMALLINT len2 = length;
-	RETCODE rc = 0;
-
-	if (!Utility::isError(rc = SQLDrivers(henv, 
-		SQL_FETCH_FIRST,
-		desc,
-		length,
-		&len1,
-		attr,
-		len2,
-		&len2)))
-	{
-		do
-		{
-			driverMap.insert(DSNMap::value_type(std::string((char *) desc), 
-				std::string((char *) attr)));
-			std::memset(desc, 0, length);
-			std::memset(attr, 0, length);
-			len2 = length;
-		}while (!Utility::isError(rc = SQLDrivers(henv, 
-			SQL_FETCH_NEXT,
-			desc,
-			length,
-			&len1,
-			attr,
-			len2,
-			&len2)));
-	}
-
-	if (SQL_NO_DATA != rc) 
-		throw EnvironmentException(henv);
-
-	return driverMap;
-}
-
-
-Utility::DSNMap& Utility::dataSources(Utility::DSNMap& dsnMap)
-{
-	static const EnvironmentHandle henv;
-	const int length = sizeof(SQLCHAR) * 512;
-	const int dsnLength = sizeof(SQLCHAR) * (SQL_MAX_DSN_LENGTH + 1);
-
-	SQLCHAR dsn[dsnLength];
-	std::memset(dsn, 0, dsnLength);
-	SQLSMALLINT len1 = sizeof(SQLCHAR) * SQL_MAX_DSN_LENGTH;
-	SQLCHAR desc[length];
-	std::memset(desc, 0, length);
-	SQLSMALLINT len2 = length;
-	RETCODE rc = 0;
-
-	while (!Utility::isError(rc = Poco::Data::ODBC::SQLDataSources(henv, 
-		SQL_FETCH_NEXT,
-		dsn,
-		SQL_MAX_DSN_LENGTH,
-		&len1,
-		desc,
-		len2,
-		&len2)))
-	{
-		dsnMap.insert(DSNMap::value_type(std::string((char *) dsn), std::string((char *) desc)));
-		std::memset(dsn, 0, dsnLength);
-		std::memset(desc, 0, length);
-		len2 = length;
-	}
-
-	if (SQL_NO_DATA != rc) 
-		throw EnvironmentException(henv);
-
-	return dsnMap;
-}
-
-
-void Utility::dateTimeSync(Poco::DateTime& dt, const SQL_TIMESTAMP_STRUCT& ts)
-{
-	double msec = ts.fraction/1000000;
-	double usec = 1000 * (msec - std::floor(msec));
-
-	dt.assign(ts.year,
-		ts.month,
-		ts.day,
-		ts.hour,
-		ts.minute,
-		ts.second,
-		(int) std::floor(msec),
-		(int) std::floor(usec));
-}
-
-
-void Utility::dateSync(SQL_DATE_STRUCT& ds, const Date& d)
-{
-	ds.year = d.year();
-	ds.month = d.month();
-	ds.day = d.day();
-}
-
-
-void Utility::timeSync(SQL_TIME_STRUCT& ts, const Time& t)
-{
-	ts.hour = t.hour();
-	ts.minute = t.minute();
-	ts.second = t.second();
-}
-
-
-void Utility::dateTimeSync(SQL_TIMESTAMP_STRUCT& ts, const Poco::DateTime& dt)
-{
-	ts.year = dt.year();
-	ts.month = dt.month();
-	ts.day = dt.day();
-	ts.hour = dt.hour();
-	ts.minute = dt.minute();
-	ts.second = dt.second();
-	// Fraction support is limited to milliseconds due to MS SQL Server limitation
-	// see http://support.microsoft.com/kb/263872
-	ts.fraction = (dt.millisecond() * 1000000);// + (dt.microsecond() * 1000);
-}
-
-
-} } } // namespace Poco::Data::ODBC
diff --git a/contrib/poco/Data/include/Poco/Data/AbstractBinder.h b/contrib/poco/Data/include/Poco/Data/AbstractBinder.h
deleted file mode 100644
index 1e6045047..000000000
--- a/contrib/poco/Data/include/Poco/Data/AbstractBinder.h
+++ /dev/null
@@ -1,377 +0,0 @@
-//
-// AbstractBinder.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractBinder
-//
-// Definition of the AbstractBinder class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_AbstractBinder_INCLUDED
-#define Data_AbstractBinder_INCLUDED
-
-
-#include <cstddef>
-#include <deque>
-#include <list>
-#include <vector>
-#include "Poco/Any.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Date.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/Data/Time.h"
-#include "Poco/DateTime.h"
-#include "Poco/Dynamic/Var.h"
-#include "Poco/Nullable.h"
-#include "Poco/UTFString.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    typedef NullType NullData;
-
-
-    namespace Keywords
-    {
-
-
-        static const NullData null = NULL_GENERIC;
-
-
-    } // namespace Keywords
-
-
-    class Data_API AbstractBinder
-    /// Interface for Binding data types to placeholders.
-    {
-    public:
-        typedef SharedPtr<AbstractBinder> Ptr;
-
-        enum Direction
-        /// Binding direction for a parameter.
-        {
-            PD_IN,
-            PD_OUT,
-            PD_IN_OUT
-        };
-
-        AbstractBinder();
-        /// Creates the AbstractBinder.
-
-        virtual ~AbstractBinder();
-        /// Destroys the AbstractBinder.
-
-        virtual void bind(std::size_t pos, const Poco::Int8 & val, Direction dir = PD_IN) = 0;
-        /// Binds an Int8.
-
-        virtual void bind(std::size_t pos, const std::vector<Poco::Int8> & val, Direction dir = PD_IN);
-        /// Binds an Int8 vector.
-
-        virtual void bind(std::size_t pos, const std::deque<Poco::Int8> & val, Direction dir = PD_IN);
-        /// Binds an Int8 deque.
-
-        virtual void bind(std::size_t pos, const std::list<Poco::Int8> & val, Direction dir = PD_IN);
-        /// Binds an Int8 list.
-
-        virtual void bind(std::size_t pos, const Poco::UInt8 & val, Direction dir = PD_IN) = 0;
-        /// Binds an UInt8.
-
-        virtual void bind(std::size_t pos, const std::vector<Poco::UInt8> & val, Direction dir = PD_IN);
-        /// Binds an UInt8 vector.
-
-        virtual void bind(std::size_t pos, const std::deque<Poco::UInt8> & val, Direction dir = PD_IN);
-        /// Binds an UInt8 deque.
-
-        virtual void bind(std::size_t pos, const std::list<Poco::UInt8> & val, Direction dir = PD_IN);
-        /// Binds an UInt8 list.
-
-        virtual void bind(std::size_t pos, const Poco::Int16 & val, Direction dir = PD_IN) = 0;
-        /// Binds an Int16.
-
-        virtual void bind(std::size_t pos, const std::vector<Poco::Int16> & val, Direction dir = PD_IN);
-        /// Binds an Int16 vector.
-
-        virtual void bind(std::size_t pos, const std::deque<Poco::Int16> & val, Direction dir = PD_IN);
-        /// Binds an Int16 deque.
-
-        virtual void bind(std::size_t pos, const std::list<Poco::Int16> & val, Direction dir = PD_IN);
-        /// Binds an Int16 list.
-
-        virtual void bind(std::size_t pos, const Poco::UInt16 & val, Direction dir = PD_IN) = 0;
-        /// Binds an UInt16.
-
-        virtual void bind(std::size_t pos, const std::vector<Poco::UInt16> & val, Direction dir = PD_IN);
-        /// Binds an UInt16 vector.
-
-        virtual void bind(std::size_t pos, const std::deque<Poco::UInt16> & val, Direction dir = PD_IN);
-        /// Binds an UInt16 deque.
-
-        virtual void bind(std::size_t pos, const std::list<Poco::UInt16> & val, Direction dir = PD_IN);
-        /// Binds an UInt16 list.
-
-        virtual void bind(std::size_t pos, const Poco::Int32 & val, Direction dir = PD_IN) = 0;
-        /// Binds an Int32.
-
-        virtual void bind(std::size_t pos, const std::vector<Poco::Int32> & val, Direction dir = PD_IN);
-        /// Binds an Int32 vector.
-
-        virtual void bind(std::size_t pos, const std::deque<Poco::Int32> & val, Direction dir = PD_IN);
-        /// Binds an Int32 deque.
-
-        virtual void bind(std::size_t pos, const std::list<Poco::Int32> & val, Direction dir = PD_IN);
-        /// Binds an Int32 list.
-
-        virtual void bind(std::size_t pos, const Poco::UInt32 & val, Direction dir = PD_IN) = 0;
-        /// Binds an UInt32.
-
-        virtual void bind(std::size_t pos, const std::vector<Poco::UInt32> & val, Direction dir = PD_IN);
-        /// Binds an UInt32 vector.
-
-        virtual void bind(std::size_t pos, const std::deque<Poco::UInt32> & val, Direction dir = PD_IN);
-        /// Binds an UInt32 deque.
-
-        virtual void bind(std::size_t pos, const std::list<Poco::UInt32> & val, Direction dir = PD_IN);
-        /// Binds an UInt32 list.
-
-        virtual void bind(std::size_t pos, const Poco::Int64 & val, Direction dir = PD_IN) = 0;
-        /// Binds an Int64.
-
-        virtual void bind(std::size_t pos, const std::vector<Poco::Int64> & val, Direction dir = PD_IN);
-        /// Binds an Int64 vector.
-
-        virtual void bind(std::size_t pos, const std::deque<Poco::Int64> & val, Direction dir = PD_IN);
-        /// Binds an Int64 deque.
-
-        virtual void bind(std::size_t pos, const std::list<Poco::Int64> & val, Direction dir = PD_IN);
-        /// Binds an Int64 list.
-
-        virtual void bind(std::size_t pos, const Poco::UInt64 & val, Direction dir = PD_IN) = 0;
-        /// Binds an UInt64.
-
-        virtual void bind(std::size_t pos, const std::vector<Poco::UInt64> & val, Direction dir = PD_IN);
-        /// Binds an UInt64 vector.
-
-        virtual void bind(std::size_t pos, const std::deque<Poco::UInt64> & val, Direction dir = PD_IN);
-        /// Binds an UInt64 deque.
-
-        virtual void bind(std::size_t pos, const std::list<Poco::UInt64> & val, Direction dir = PD_IN);
-        /// Binds an UInt64 list.
-
-#ifndef POCO_LONG_IS_64_BIT
-        virtual void bind(std::size_t pos, const long & val, Direction dir = PD_IN) = 0;
-        /// Binds a long.
-
-        virtual void bind(std::size_t pos, const unsigned long & val, Direction dir = PD_IN) = 0;
-        /// Binds an unsigned long.
-
-        virtual void bind(std::size_t pos, const std::vector<long> & val, Direction dir = PD_IN);
-        /// Binds a long vector.
-
-        virtual void bind(std::size_t pos, const std::deque<long> & val, Direction dir = PD_IN);
-        /// Binds a long deque.
-
-        virtual void bind(std::size_t pos, const std::list<long> & val, Direction dir = PD_IN);
-        /// Binds a long list.
-#endif
-
-        virtual void bind(std::size_t pos, const bool & val, Direction dir = PD_IN) = 0;
-        /// Binds a boolean.
-
-        virtual void bind(std::size_t pos, const std::vector<bool> & val, Direction dir = PD_IN);
-        /// Binds a boolean vector.
-
-        virtual void bind(std::size_t pos, const std::deque<bool> & val, Direction dir = PD_IN);
-        /// Binds a boolean deque.
-
-        virtual void bind(std::size_t pos, const std::list<bool> & val, Direction dir = PD_IN);
-        /// Binds a boolean list.
-
-        virtual void bind(std::size_t pos, const float & val, Direction dir = PD_IN) = 0;
-        /// Binds a float.
-
-        virtual void bind(std::size_t pos, const std::vector<float> & val, Direction dir = PD_IN);
-        /// Binds a float vector.
-
-        virtual void bind(std::size_t pos, const std::deque<float> & val, Direction dir = PD_IN);
-        /// Binds a float deque.
-
-        virtual void bind(std::size_t pos, const std::list<float> & val, Direction dir = PD_IN);
-        /// Binds a float list.
-
-        virtual void bind(std::size_t pos, const double & val, Direction dir = PD_IN) = 0;
-        /// Binds a double.
-
-        virtual void bind(std::size_t pos, const std::vector<double> & val, Direction dir = PD_IN);
-        /// Binds a double vector.
-
-        virtual void bind(std::size_t pos, const std::deque<double> & val, Direction dir = PD_IN);
-        /// Binds a double deque.
-
-        virtual void bind(std::size_t pos, const std::list<double> & val, Direction dir = PD_IN);
-        /// Binds a double list.
-
-        virtual void bind(std::size_t pos, const char & val, Direction dir = PD_IN) = 0;
-        /// Binds a single character.
-
-        virtual void bind(std::size_t pos, const std::vector<char> & val, Direction dir = PD_IN);
-        /// Binds a character vector.
-
-        virtual void bind(std::size_t pos, const std::deque<char> & val, Direction dir = PD_IN);
-        /// Binds a character deque.
-
-        virtual void bind(std::size_t pos, const std::list<char> & val, Direction dir = PD_IN);
-        /// Binds a character list.
-
-        virtual void bind(std::size_t pos, const char * const & pVal, Direction dir = PD_IN) = 0;
-        /// Binds a const char ptr.
-
-        virtual void bind(std::size_t pos, const std::string & val, Direction dir = PD_IN) = 0;
-        /// Binds a string.
-
-        virtual void bind(std::size_t pos, const std::vector<std::string> & val, Direction dir = PD_IN);
-        /// Binds a string vector.
-
-        virtual void bind(std::size_t pos, const std::deque<std::string> & val, Direction dir = PD_IN);
-        /// Binds a string deque.
-
-        virtual void bind(std::size_t pos, const std::list<std::string> & val, Direction dir = PD_IN);
-        /// Binds a string list.
-
-        virtual void bind(std::size_t pos, const UTF16String & val, Direction dir = PD_IN);
-        /// Binds a UTF-16 Unicode string.
-
-        virtual void bind(std::size_t pos, const std::vector<UTF16String> & val, Direction dir = PD_IN);
-        /// Binds a UTF-16 Unicode string vector.
-
-        virtual void bind(std::size_t pos, const std::deque<UTF16String> & val, Direction dir = PD_IN);
-        /// Binds a UTF-16 Unicode string deque.
-
-        virtual void bind(std::size_t pos, const std::list<UTF16String> & val, Direction dir = PD_IN);
-        /// Binds a UTF-16 Unicode string list.
-
-        virtual void bind(std::size_t pos, const BLOB & val, Direction dir = PD_IN) = 0;
-        /// Binds a BLOB.
-
-        virtual void bind(std::size_t pos, const CLOB & val, Direction dir = PD_IN) = 0;
-        /// Binds a CLOB.
-
-        virtual void bind(std::size_t pos, const std::vector<BLOB> & val, Direction dir = PD_IN);
-        /// Binds a BLOB vector.
-
-        virtual void bind(std::size_t pos, const std::deque<BLOB> & val, Direction dir = PD_IN);
-        /// Binds a BLOB deque.
-
-        virtual void bind(std::size_t pos, const std::list<BLOB> & val, Direction dir = PD_IN);
-        /// Binds a BLOB list.
-
-        virtual void bind(std::size_t pos, const std::vector<CLOB> & val, Direction dir = PD_IN);
-        /// Binds a CLOB vector.
-
-        virtual void bind(std::size_t pos, const std::deque<CLOB> & val, Direction dir = PD_IN);
-        /// Binds a CLOB deque.
-
-        virtual void bind(std::size_t pos, const std::list<CLOB> & val, Direction dir = PD_IN);
-        /// Binds a CLOB list.
-
-        virtual void bind(std::size_t pos, const DateTime & val, Direction dir = PD_IN) = 0;
-        /// Binds a DateTime.
-
-        virtual void bind(std::size_t pos, const std::vector<DateTime> & val, Direction dir = PD_IN);
-        /// Binds a DateTime vector.
-
-        virtual void bind(std::size_t pos, const std::deque<DateTime> & val, Direction dir = PD_IN);
-        /// Binds a DateTime deque.
-
-        virtual void bind(std::size_t pos, const std::list<DateTime> & val, Direction dir = PD_IN);
-        /// Binds a DateTime list.
-
-        virtual void bind(std::size_t pos, const Date & val, Direction dir = PD_IN) = 0;
-        /// Binds a Date.
-
-        virtual void bind(std::size_t pos, const std::vector<Date> & val, Direction dir = PD_IN);
-        /// Binds a Date vector.
-
-        virtual void bind(std::size_t pos, const std::deque<Date> & val, Direction dir = PD_IN);
-        /// Binds a Date deque.
-
-        virtual void bind(std::size_t pos, const std::list<Date> & val, Direction dir = PD_IN);
-        /// Binds a Date list.
-
-        virtual void bind(std::size_t pos, const Time & val, Direction dir = PD_IN) = 0;
-        /// Binds a Time.
-
-        virtual void bind(std::size_t pos, const std::vector<Time> & val, Direction dir = PD_IN);
-        /// Binds a Time vector.
-
-        virtual void bind(std::size_t pos, const std::deque<Time> & val, Direction dir = PD_IN);
-        /// Binds a Time deque.
-
-        virtual void bind(std::size_t pos, const std::list<Time> & val, Direction dir = PD_IN);
-        /// Binds a Time list.
-
-        virtual void bind(std::size_t pos, const NullData & val, Direction dir = PD_IN) = 0;
-        /// Binds a null.
-
-        virtual void bind(std::size_t pos, const std::vector<NullData> & val, Direction dir = PD_IN);
-        /// Binds a null vector.
-
-        virtual void bind(std::size_t pos, const std::deque<NullData> & val, Direction dir = PD_IN);
-        /// Binds a null deque.
-
-        virtual void bind(std::size_t pos, const std::list<NullData> & val, Direction dir = PD_IN);
-        /// Binds a null list.
-
-        void bind(std::size_t pos, const Any & val, Direction dir = PD_IN);
-        /// Binds an Any.
-
-        void bind(std::size_t pos, const Poco::Dynamic::Var & val, Direction dir = PD_IN);
-        /// Binds a Var.
-
-        virtual void reset();
-        /// Resets a binder. No-op by default. Implement for binders that cache data.
-
-        static bool isOutBound(Direction dir);
-        /// Returns true if direction is out bound;
-
-        static bool isInBound(Direction dir);
-        /// Returns true if direction is in bound;
-    };
-
-
-    //
-    // inlines
-    //
-    inline void AbstractBinder::reset()
-    {
-        //no-op
-    }
-
-
-    inline bool AbstractBinder::isOutBound(Direction dir)
-    {
-        return PD_OUT == dir || PD_IN_OUT == dir;
-    }
-
-
-    inline bool AbstractBinder::isInBound(Direction dir)
-    {
-        return PD_IN == dir || PD_IN_OUT == dir;
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_AbstractBinder_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/AbstractBinding.h b/contrib/poco/Data/include/Poco/Data/AbstractBinding.h
deleted file mode 100644
index 80c54c301..000000000
--- a/contrib/poco/Data/include/Poco/Data/AbstractBinding.h
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// AbstractBinding.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractBinding
-//
-// Definition of the AbstractBinding class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_AbstractBinding_INCLUDED
-#define Data_AbstractBinding_INCLUDED
-
-
-#include <cstddef>
-#include <deque>
-#include <list>
-#include <vector>
-#include "Poco/Any.h"
-#include "Poco/AutoPtr.h"
-#include "Poco/Data/AbstractBinder.h"
-#include "Poco/Data/Data.h"
-#include "Poco/RefCountedObject.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API AbstractBinding
-    /// AbstractBinding connects a value with a placeholder via an AbstractBinder interface.
-    {
-    public:
-        typedef SharedPtr<AbstractBinding> Ptr;
-        typedef AbstractBinder::Ptr BinderPtr;
-
-        enum Direction
-        {
-            PD_IN = AbstractBinder::PD_IN,
-            PD_OUT = AbstractBinder::PD_OUT,
-            PD_IN_OUT = AbstractBinder::PD_IN_OUT
-        };
-
-        AbstractBinding(const std::string & name = "", Direction direction = PD_IN, Poco::UInt32 bulkSize = 0);
-        /// Creates the AbstractBinding.
-
-        virtual ~AbstractBinding();
-        /// Destroys the AbstractBinding.
-
-        void setBinder(BinderPtr pBinder);
-        /// Sets the object used for binding; object does NOT take ownership of the pointer.
-
-        BinderPtr getBinder() const;
-        /// Returns the AbstractBinder used for binding data.
-
-        virtual std::size_t numOfColumnsHandled() const = 0;
-        /// Returns the number of columns that the binding handles.
-        ///
-        /// The trivial case will be one single column but when
-        /// complex types are used this value can be larger than one.
-
-        virtual std::size_t numOfRowsHandled() const = 0;
-        /// Returns the number of rows that the binding handles.
-        ///
-        /// The trivial case will be one single row but
-        /// for collection data types it can be larger.
-
-        virtual bool canBind() const = 0;
-        /// Returns true if we have enough data to bind
-
-        virtual void bind(std::size_t pos) = 0;
-        /// Binds a value to the given column position
-
-        virtual void reset() = 0;
-        /// Allows a binding to be reused.
-
-        AbstractBinder::Direction getDirection() const;
-        /// Returns the binding direction.
-
-        const std::string & name() const;
-        /// Returns the name for this binding.
-
-        bool isBulk() const;
-        /// Returns true if extraction is bulk.
-
-        Poco::UInt32 bulkSize() const;
-        /// Returns the size of the bulk binding.
-
-    private:
-        BinderPtr _pBinder;
-        std::string _name;
-        Direction _direction;
-        Poco::UInt32 _bulkSize;
-    };
-
-
-    typedef std::vector<AbstractBinding::Ptr> AbstractBindingVec;
-    typedef std::deque<AbstractBinding::Ptr> AbstractBindingDeq;
-    typedef std::list<AbstractBinding::Ptr> AbstractBindingLst;
-
-
-    //
-    // inlines
-    //
-    inline AbstractBinder::Ptr AbstractBinding::getBinder() const
-    {
-        return _pBinder;
-    }
-
-
-    inline const std::string & AbstractBinding::name() const
-    {
-        return _name;
-    }
-
-
-    inline AbstractBinder::Direction AbstractBinding::getDirection() const
-    {
-        return (AbstractBinder::Direction)_direction;
-    }
-
-
-    inline bool AbstractBinding::isBulk() const
-    {
-        return _bulkSize > 0;
-    }
-
-
-    inline Poco::UInt32 AbstractBinding::bulkSize() const
-    {
-        return _bulkSize;
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_AbstractBinding_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/AbstractExtraction.h b/contrib/poco/Data/include/Poco/Data/AbstractExtraction.h
deleted file mode 100644
index 53191affe..000000000
--- a/contrib/poco/Data/include/Poco/Data/AbstractExtraction.h
+++ /dev/null
@@ -1,281 +0,0 @@
-//
-// AbstractExtraction.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractExtraction
-//
-// Definition of the AbstractExtraction class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_AbstractExtraction_INCLUDED
-#define Data_AbstractExtraction_INCLUDED
-
-
-#include <cstddef>
-#include <deque>
-#include <list>
-#include <vector>
-#include "Poco/AutoPtr.h"
-#include "Poco/Data/AbstractExtractor.h"
-#include "Poco/Data/AbstractPreparation.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Limit.h"
-#include "Poco/RefCountedObject.h"
-#include "Poco/UTFString.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class AbstractPreparator;
-
-
-    class Data_API AbstractExtraction
-    /// AbstractExtraction is the interface class that connects output positions to concrete values
-    /// retrieved via an AbstractExtractor.
-    {
-    public:
-        typedef SharedPtr<AbstractExtraction> Ptr;
-        typedef SharedPtr<AbstractExtractor> ExtractorPtr;
-        typedef SharedPtr<AbstractPreparator> PreparatorPtr;
-
-        AbstractExtraction(Poco::UInt32 limit = Limit::LIMIT_UNLIMITED, Poco::UInt32 position = 0, bool bulk = false);
-        /// Creates the AbstractExtraction. A limit value equal to EXTRACT_UNLIMITED (0xffffffffu)
-        /// means that we extract as much data as possible during one execute.
-        /// Otherwise the limit value is used to partition data extracting to a limited amount of rows.
-
-        virtual ~AbstractExtraction();
-        /// Destroys the AbstractExtraction.
-
-        void setExtractor(ExtractorPtr pExtractor);
-        /// Sets the class used for extracting the data. Does not take ownership of the pointer.
-
-        ExtractorPtr getExtractor() const;
-        /// Retrieves the extractor object
-
-        Poco::UInt32 position() const;
-        /// Returns the extraction position.
-
-        virtual std::size_t numOfColumnsHandled() const = 0;
-        /// Returns the number of columns that the extraction handles.
-        ///
-        /// The trivial case will be one single column but when
-        /// complex types are used this value can be larger than one.
-
-        virtual std::size_t numOfRowsHandled() const = 0;
-        /// Returns the number of rows that the extraction handles.
-        ///
-        /// The trivial case will be one single row but
-        /// for collection data types (ie vector) it can be larger.
-
-        virtual std::size_t numOfRowsAllowed() const = 0;
-        /// Returns the upper limit on number of rows that the extraction will handle.
-
-        virtual std::size_t extract(std::size_t pos) = 0;
-        /// Extracts a value from the param, starting at the given column position.
-        /// Returns the number of rows extracted.
-
-        virtual void reset();
-        /// Resets the extractor so that it can be re-used.
-        /// Does nothing in this implementation.
-        /// Implementations should override it for different behavior.
-
-        virtual bool canExtract() const;
-        /// Returns true. Implementations should override it for different behavior.
-
-        virtual AbstractPreparation::Ptr createPreparation(PreparatorPtr & pPrep, std::size_t pos) = 0;
-        /// Creates and returns shared pointer to Preparation object for the extracting object.
-
-        void setLimit(Poco::UInt32 limit);
-        /// Sets the limit.
-
-        Poco::UInt32 getLimit() const;
-        /// Gets the limit.
-
-        virtual bool isNull(std::size_t row) const;
-        /// In implementations, this function returns true if value at row is null,
-        /// false otherwise.
-        /// Normal behavior is to replace nulls with default values.
-        /// However, extraction implementations may remember the underlying database
-        /// null values and be able to later provide information about them.
-        /// Here, this function throws NotImplementedException.
-
-        bool isBulk() const;
-        /// Returns true if this is bulk extraction.
-
-        void setEmptyStringIsNull(bool emptyStringIsNull);
-        /// Sets the empty string handling flag.
-
-        bool getEmptyStringIsNull() const;
-        /// Returns the empty string handling flag.
-
-        void setForceEmptyString(bool forceEmptyString);
-        /// Sets the force empty string flag.
-
-        bool getForceEmptyString() const;
-        /// Returns the force empty string flag.
-
-        template <typename T>
-        bool isValueNull(const T & str, bool deflt)
-        /// Utility function to determine the nullness of the value.
-        /// This generic version always returns default value
-        /// (i.e. does nothing). The std::string overload does
-        /// the actual work.
-        ///
-        {
-            return deflt;
-        }
-
-        bool isValueNull(const std::string & str, bool deflt);
-        /// Overload for const reference to std::string.
-        ///
-        /// Returns true when following conditions are met:
-        ///
-        /// - string is empty
-        /// - getEmptyStringIsNull() returns true
-
-        bool isValueNull(const Poco::UTF16String & str, bool deflt);
-        /// Overload for const reference to UTF16String.
-        ///
-        /// Returns true when following conditions are met:
-        ///
-        /// - string is empty
-        /// - getEmptyStringIsNull() returns true
-
-    private:
-        template <typename S>
-        bool isStringNull(const S & str, bool deflt)
-        {
-            if (getForceEmptyString())
-                return false;
-
-            if (getEmptyStringIsNull() && str.empty())
-                return true;
-
-            return deflt;
-        }
-
-        ExtractorPtr _pExtractor;
-        Poco::UInt32 _limit;
-        Poco::UInt32 _position;
-        bool _bulk;
-        bool _emptyStringIsNull;
-        bool _forceEmptyString;
-    };
-
-
-    typedef std::vector<AbstractExtraction::Ptr> AbstractExtractionVec;
-    typedef std::vector<AbstractExtractionVec> AbstractExtractionVecVec;
-    typedef std::deque<AbstractExtraction::Ptr> AbstractExtractionDeq;
-    typedef std::vector<AbstractExtractionDeq> AbstractExtractionDeqVec;
-    typedef std::list<AbstractExtraction::Ptr> AbstractExtractionLst;
-    typedef std::vector<AbstractExtractionLst> AbstractExtractionLstVec;
-
-
-    //
-    // inlines
-    //
-    inline void AbstractExtraction::setExtractor(ExtractorPtr pExtractor)
-    {
-        _pExtractor = pExtractor;
-    }
-
-
-    inline AbstractExtraction::ExtractorPtr AbstractExtraction::getExtractor() const
-    {
-        return _pExtractor;
-    }
-
-
-    inline void AbstractExtraction::setLimit(Poco::UInt32 limit)
-    {
-        _limit = limit;
-    }
-
-
-    inline Poco::UInt32 AbstractExtraction::getLimit() const
-    {
-        return _limit;
-    }
-
-
-    inline bool AbstractExtraction::isNull(std::size_t row) const
-    {
-        throw NotImplementedException("Check for null values not implemented.");
-    }
-
-
-    inline Poco::UInt32 AbstractExtraction::position() const
-    {
-        return _position;
-    }
-
-
-    inline bool AbstractExtraction::isBulk() const
-    {
-        return _bulk;
-    }
-
-
-    inline void AbstractExtraction::reset()
-    {
-    }
-
-
-    inline bool AbstractExtraction::canExtract() const
-    {
-        return true;
-    }
-
-
-    inline void AbstractExtraction::setEmptyStringIsNull(bool emptyStringIsNull)
-    {
-        _emptyStringIsNull = emptyStringIsNull;
-    }
-
-
-    inline bool AbstractExtraction::getEmptyStringIsNull() const
-    {
-        return _emptyStringIsNull;
-    }
-
-
-    inline void AbstractExtraction::setForceEmptyString(bool forceEmptyString)
-    {
-        _forceEmptyString = forceEmptyString;
-    }
-
-
-    inline bool AbstractExtraction::getForceEmptyString() const
-    {
-        return _forceEmptyString;
-    }
-
-
-    inline bool AbstractExtraction::isValueNull(const std::string & str, bool deflt)
-    {
-        return isStringNull(str, deflt);
-    }
-
-
-    inline bool AbstractExtraction::isValueNull(const Poco::UTF16String & str, bool deflt)
-    {
-        return isStringNull(str, deflt);
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_AbstractExtraction_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/AbstractExtractor.h b/contrib/poco/Data/include/Poco/Data/AbstractExtractor.h
deleted file mode 100644
index 9416ad0b2..000000000
--- a/contrib/poco/Data/include/Poco/Data/AbstractExtractor.h
+++ /dev/null
@@ -1,355 +0,0 @@
-//
-// AbstractExtractor.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractExtractor
-//
-// Definition of the AbstractExtractor class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_AbstractExtractor_INCLUDED
-#define Data_AbstractExtractor_INCLUDED
-
-
-#include <cstddef>
-#include <deque>
-#include <list>
-#include <string>
-#include <vector>
-#include "Poco/Data/Constants.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/UTFString.h"
-
-
-namespace Poco
-{
-
-
-class DateTime;
-class Any;
-
-namespace Dynamic
-{
-    class Var;
-}
-
-namespace Data
-{
-
-
-    class Date;
-    class Time;
-
-
-    class Data_API AbstractExtractor
-    /// Interface used to extract data from a single result row.
-    /// If an extractor receives null it is not allowed to change val!
-    {
-    public:
-        typedef SharedPtr<AbstractExtractor> Ptr;
-
-        AbstractExtractor();
-        /// Creates the AbstractExtractor.
-
-        virtual ~AbstractExtractor();
-        /// Destroys the AbstractExtractor.
-
-        virtual bool extract(std::size_t pos, Poco::Int8 & val) = 0;
-        /// Extracts an Int8. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Poco::Int8> & val);
-        /// Extracts an Int8 vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Poco::Int8> & val);
-        /// Extracts an Int8 deque.
-
-        virtual bool extract(std::size_t pos, std::list<Poco::Int8> & val);
-        /// Extracts an Int8 list.
-
-        virtual bool extract(std::size_t pos, Poco::UInt8 & val) = 0;
-        /// Extracts an UInt8. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Poco::UInt8> & val);
-        /// Extracts an UInt8 vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Poco::UInt8> & val);
-        /// Extracts an UInt8 deque.
-
-        virtual bool extract(std::size_t pos, std::list<Poco::UInt8> & val);
-        /// Extracts an UInt8 list.
-
-        virtual bool extract(std::size_t pos, Poco::Int16 & val) = 0;
-        /// Extracts an Int16. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Poco::Int16> & val);
-        /// Extracts an Int16 vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Poco::Int16> & val);
-        /// Extracts an Int16 deque.
-
-        virtual bool extract(std::size_t pos, std::list<Poco::Int16> & val);
-        /// Extracts an Int16 list.
-
-        virtual bool extract(std::size_t pos, Poco::UInt16 & val) = 0;
-        /// Extracts an UInt16. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Poco::UInt16> & val);
-        /// Extracts an UInt16 vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Poco::UInt16> & val);
-        /// Extracts an UInt16 deque.
-
-        virtual bool extract(std::size_t pos, std::list<Poco::UInt16> & val);
-        /// Extracts an UInt16 list.
-
-        virtual bool extract(std::size_t pos, Poco::Int32 & val) = 0;
-        /// Extracts an Int32. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Poco::Int32> & val);
-        /// Extracts an Int32 vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Poco::Int32> & val);
-        /// Extracts an Int32 deque.
-
-        virtual bool extract(std::size_t pos, std::list<Poco::Int32> & val);
-        /// Extracts an Int32 list.
-
-        virtual bool extract(std::size_t pos, Poco::UInt32 & val) = 0;
-        /// Extracts an UInt32. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Poco::UInt32> & val);
-        /// Extracts an UInt32 vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Poco::UInt32> & val);
-        /// Extracts an UInt32 deque.
-
-        virtual bool extract(std::size_t pos, std::list<Poco::UInt32> & val);
-        /// Extracts an UInt32 list.
-
-        virtual bool extract(std::size_t pos, Poco::Int64 & val) = 0;
-        /// Extracts an Int64. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Poco::Int64> & val);
-        /// Extracts an Int64 vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Poco::Int64> & val);
-        /// Extracts an Int64 deque.
-
-        virtual bool extract(std::size_t pos, std::list<Poco::Int64> & val);
-        /// Extracts an Int64 list.
-
-        virtual bool extract(std::size_t pos, Poco::UInt64 & val) = 0;
-        /// Extracts an UInt64. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Poco::UInt64> & val);
-        /// Extracts an UInt64 vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Poco::UInt64> & val);
-        /// Extracts an UInt64 deque.
-
-        virtual bool extract(std::size_t pos, std::list<Poco::UInt64> & val);
-        /// Extracts an UInt64 list.
-
-#ifndef POCO_LONG_IS_64_BIT
-        virtual bool extract(std::size_t pos, long & val) = 0;
-        /// Extracts a long. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, unsigned long & val) = 0;
-        /// Extracts an unsigned long. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<long> & val);
-        /// Extracts a long vector.
-
-        virtual bool extract(std::size_t pos, std::deque<long> & val);
-        /// Extracts a long deque.
-
-        virtual bool extract(std::size_t pos, std::list<long> & val);
-        /// Extracts a long list.
-#endif
-
-        virtual bool extract(std::size_t pos, bool & val) = 0;
-        /// Extracts a boolean. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<bool> & val);
-        /// Extracts a boolean vector.
-
-        virtual bool extract(std::size_t pos, std::deque<bool> & val);
-        /// Extracts a boolean deque.
-
-        virtual bool extract(std::size_t pos, std::list<bool> & val);
-        /// Extracts a boolean list.
-
-        virtual bool extract(std::size_t pos, float & val) = 0;
-        /// Extracts a float. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<float> & val);
-        /// Extracts a float vector.
-
-        virtual bool extract(std::size_t pos, std::deque<float> & val);
-        /// Extracts a float deque.
-
-        virtual bool extract(std::size_t pos, std::list<float> & val);
-        /// Extracts a float list.
-
-        virtual bool extract(std::size_t pos, double & val) = 0;
-        /// Extracts a double. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<double> & val);
-        /// Extracts a double vector.
-
-        virtual bool extract(std::size_t pos, std::deque<double> & val);
-        /// Extracts a double deque.
-
-        virtual bool extract(std::size_t pos, std::list<double> & val);
-        /// Extracts a double list.
-
-        virtual bool extract(std::size_t pos, char & val) = 0;
-        /// Extracts a single character. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<char> & val);
-        /// Extracts a character vector.
-
-        virtual bool extract(std::size_t pos, std::deque<char> & val);
-        /// Extracts a character deque.
-
-        virtual bool extract(std::size_t pos, std::list<char> & val);
-        /// Extracts a character list.
-
-        virtual bool extract(std::size_t pos, std::string & val) = 0;
-        /// Extracts a string. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<std::string> & val);
-        /// Extracts a string vector.
-
-        virtual bool extract(std::size_t pos, std::deque<std::string> & val);
-        /// Extracts a string deque.
-
-        virtual bool extract(std::size_t pos, std::list<std::string> & val);
-        /// Extracts a string list.
-
-        virtual bool extract(std::size_t pos, UTF16String & val);
-        /// Extracts a UTF16String. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<UTF16String> & val);
-        /// Extracts a UTF16String vector.
-
-        virtual bool extract(std::size_t pos, std::deque<UTF16String> & val);
-        /// Extracts a UTF16String deque.
-
-        virtual bool extract(std::size_t pos, std::list<UTF16String> & val);
-        /// Extracts a UTF16String list.
-
-        virtual bool extract(std::size_t pos, BLOB & val) = 0;
-        /// Extracts a BLOB. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, CLOB & val) = 0;
-        /// Extracts a CLOB. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<BLOB> & val);
-        /// Extracts a BLOB vector.
-
-        virtual bool extract(std::size_t pos, std::deque<BLOB> & val);
-        /// Extracts a BLOB deque.
-
-        virtual bool extract(std::size_t pos, std::list<BLOB> & val);
-        /// Extracts a BLOB list.
-
-        virtual bool extract(std::size_t pos, std::vector<CLOB> & val);
-        /// Extracts a CLOB vector.
-
-        virtual bool extract(std::size_t pos, std::deque<CLOB> & val);
-        /// Extracts a CLOB deque.
-
-        virtual bool extract(std::size_t pos, std::list<CLOB> & val);
-        /// Extracts a CLOB list.
-
-        virtual bool extract(std::size_t pos, DateTime & val) = 0;
-        /// Extracts a DateTime. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<DateTime> & val);
-        /// Extracts a DateTime vector.
-
-        virtual bool extract(std::size_t pos, std::deque<DateTime> & val);
-        /// Extracts a DateTime deque.
-
-        virtual bool extract(std::size_t pos, std::list<DateTime> & val);
-        /// Extracts a DateTime list.
-
-        virtual bool extract(std::size_t pos, Date & val) = 0;
-        /// Extracts a Date. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Date> & val);
-        /// Extracts a Date vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Date> & val);
-        /// Extracts a Date deque.
-
-        virtual bool extract(std::size_t pos, std::list<Date> & val);
-        /// Extracts a Date list.
-
-        virtual bool extract(std::size_t pos, Time & val) = 0;
-        /// Extracts a Time. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Time> & val);
-        /// Extracts a Time vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Time> & val);
-        /// Extracts a Time deque.
-
-        virtual bool extract(std::size_t pos, std::list<Time> & val);
-        /// Extracts a Time list.
-
-        virtual bool extract(std::size_t pos, Any & val) = 0;
-        /// Extracts an Any. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Any> & val);
-        /// Extracts an Any vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Any> & val);
-        /// Extracts an Any deque.
-
-        virtual bool extract(std::size_t pos, std::list<Any> & val);
-        /// Extracts an Any list.
-
-        virtual bool extract(std::size_t pos, Poco::Dynamic::Var & val) = 0;
-        /// Extracts a Var. Returns false if null was received.
-
-        virtual bool extract(std::size_t pos, std::vector<Poco::Dynamic::Var> & val);
-        /// Extracts a Var vector.
-
-        virtual bool extract(std::size_t pos, std::deque<Poco::Dynamic::Var> & val);
-        /// Extracts a Var deque.
-
-        virtual bool extract(std::size_t pos, std::list<Poco::Dynamic::Var> & val);
-        /// Extracts a Var list.
-
-        virtual bool isNull(std::size_t col, std::size_t row = POCO_DATA_INVALID_ROW) = 0;
-        /// Returns true if the value at [col,row] position is null.
-
-        virtual void reset();
-        /// Resets any information internally cached by the extractor.
-    };
-
-
-    ///
-    /// inlines
-    ///
-    inline void AbstractExtractor::reset()
-    {
-        //default no-op
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_AbstractExtractor_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/AbstractPreparation.h b/contrib/poco/Data/include/Poco/Data/AbstractPreparation.h
deleted file mode 100644
index 47f1b545b..000000000
--- a/contrib/poco/Data/include/Poco/Data/AbstractPreparation.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// AbstractPreparation.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractPreparation
-//
-// Definition of the AbstractPreparation class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_AbstractPreparation_INCLUDED
-#define Data_AbstractPreparation_INCLUDED
-
-
-#include <cstddef>
-#include "Poco/Data/AbstractPreparator.h"
-#include "Poco/Data/Data.h"
-#include "Poco/SharedPtr.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API AbstractPreparation
-    /// Interface for calling the appropriate AbstractPreparator method
-    {
-    public:
-        typedef SharedPtr<AbstractPreparation> Ptr;
-        typedef AbstractPreparator::Ptr PreparatorPtr;
-
-        AbstractPreparation(PreparatorPtr pPreparator);
-        /// Creates the AbstractPreparation.
-
-        virtual ~AbstractPreparation();
-        /// Destroys the AbstractPreparation.
-
-        virtual void prepare() = 0;
-        /// Prepares data.
-
-    protected:
-        AbstractPreparation();
-        AbstractPreparation(const AbstractPreparation &);
-        AbstractPreparation & operator=(const AbstractPreparation &);
-
-        PreparatorPtr preparation();
-        /// Returns the preparation object
-
-        PreparatorPtr _pPreparator;
-    };
-
-
-    //
-    // inlines
-    //
-    inline AbstractPreparation::PreparatorPtr AbstractPreparation::preparation()
-    {
-        return _pPreparator;
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_AbstractPreparation_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/AbstractPreparator.h b/contrib/poco/Data/include/Poco/Data/AbstractPreparator.h
deleted file mode 100644
index e4c279f62..000000000
--- a/contrib/poco/Data/include/Poco/Data/AbstractPreparator.h
+++ /dev/null
@@ -1,392 +0,0 @@
-//
-// AbstractPreparator.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractPreparator
-//
-// Definition of the AbstractPreparator class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_AbstractPreparator_INCLUDED
-#define Data_AbstractPreparator_INCLUDED
-
-
-#include <cstddef>
-#include <deque>
-#include <list>
-#include <vector>
-#include "Poco/Data/Data.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/RefCountedObject.h"
-#include "Poco/UTFString.h"
-
-
-namespace Poco
-{
-
-
-class DateTime;
-class Any;
-
-namespace Dynamic
-{
-    class Var;
-}
-
-
-namespace Data
-{
-
-
-    class Date;
-    class Time;
-
-
-    class Data_API AbstractPreparator
-    /// Interface used for database preparation where we first have to register all data types
-    /// (and memory output locations) before extracting data, e.g. ODBC.
-    /// Extract works as two-phase extract: first we call prepare once, then extract n-times.
-    /// There are cases (bulk operations using std::vector storage) when extract is called only once.
-    /// The value passed to a prepare() call is not used by the prepare, serving only as an indication
-    /// of the data type being prepared, thus all values are passed as const references.
-    /// Implementing this interface is not mandatory for a connector. Connectors that only extract data
-    /// after SQL execution (e.g. SQLite) do not need this functionality at all.
-    {
-    public:
-        typedef SharedPtr<AbstractPreparator> Ptr;
-
-        AbstractPreparator(Poco::UInt32 length = 1u);
-        /// Creates the AbstractPreparator.
-
-        virtual ~AbstractPreparator();
-        /// Destroys the AbstractPreparator.
-
-        virtual void prepare(std::size_t pos, const Poco::Int8 &) = 0;
-        /// Prepares an Int8.
-
-        virtual void prepare(std::size_t pos, const std::vector<Poco::Int8> & val);
-        /// Prepares an Int8 vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Poco::Int8> & val);
-        /// Prepares an Int8 deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Poco::Int8> & val);
-        /// Prepares an Int8 list.
-
-        virtual void prepare(std::size_t pos, const Poco::UInt8 &) = 0;
-        /// Prepares an UInt8.
-
-        virtual void prepare(std::size_t pos, const std::vector<Poco::UInt8> & val);
-        /// Prepares an UInt8 vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Poco::UInt8> & val);
-        /// Prepares an UInt8 deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Poco::UInt8> & val);
-        /// Prepares an UInt8 list.
-
-        virtual void prepare(std::size_t pos, const Poco::Int16 &) = 0;
-        /// Prepares an Int16.
-
-        virtual void prepare(std::size_t pos, const std::vector<Poco::Int16> & val);
-        /// Prepares an Int16 vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Poco::Int16> & val);
-        /// Prepares an Int16 deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Poco::Int16> & val);
-        /// Prepares an Int16 list.
-
-        virtual void prepare(std::size_t pos, const Poco::UInt16 &) = 0;
-        /// Prepares an UInt16.
-
-        virtual void prepare(std::size_t pos, const std::vector<Poco::UInt16> & val);
-        /// Prepares an UInt16 vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Poco::UInt16> & val);
-        /// Prepares an UInt16 deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Poco::UInt16> & val);
-        /// Prepares an UInt16 list.
-
-        virtual void prepare(std::size_t pos, const Poco::Int32 &) = 0;
-        /// Prepares an Int32.
-
-        virtual void prepare(std::size_t pos, const std::vector<Poco::Int32> & val);
-        /// Prepares an Int32 vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Poco::Int32> & val);
-        /// Prepares an Int32 deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Poco::Int32> & val);
-        /// Prepares an Int32 list.
-
-        virtual void prepare(std::size_t pos, const Poco::UInt32 &) = 0;
-        /// Prepares an UInt32.
-
-        virtual void prepare(std::size_t pos, const std::vector<Poco::UInt32> & val);
-        /// Prepares an UInt32 vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Poco::UInt32> & val);
-        /// Prepares an UInt32 deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Poco::UInt32> & val);
-        /// Prepares an UInt32 list.
-
-        virtual void prepare(std::size_t pos, const Poco::Int64 &) = 0;
-        /// Prepares an Int64.
-
-        virtual void prepare(std::size_t pos, const std::vector<Poco::Int64> & val);
-        /// Prepares an Int64 vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Poco::Int64> & val);
-        /// Prepares an Int64 deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Poco::Int64> & val);
-        /// Prepares an Int64 list.
-
-        virtual void prepare(std::size_t pos, const Poco::UInt64 &) = 0;
-        /// Prepares an UInt64.
-
-        virtual void prepare(std::size_t pos, const std::vector<Poco::UInt64> & val);
-        /// Prepares an UInt64 vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Poco::UInt64> & val);
-        /// Prepares an UInt64 deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Poco::UInt64> & val);
-        /// Prepares an UInt64 list.
-
-#ifndef POCO_LONG_IS_64_BIT
-        virtual void prepare(std::size_t pos, const long &) = 0;
-        /// Prepares a long.
-
-        virtual void prepare(std::size_t pos, const unsigned long &) = 0;
-        /// Prepares an unsigned long.
-
-        virtual void prepare(std::size_t pos, const std::vector<long> & val);
-        /// Prepares a long vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<long> & val);
-        /// Prepares a long deque.
-
-        virtual void prepare(std::size_t pos, const std::list<long> & val);
-        /// Prepares a long list.
-#endif
-
-        virtual void prepare(std::size_t pos, const bool &) = 0;
-        /// Prepares a boolean.
-
-        virtual void prepare(std::size_t pos, const std::vector<bool> & val);
-        /// Prepares a boolean vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<bool> & val);
-        /// Prepares a boolean deque.
-
-        virtual void prepare(std::size_t pos, const std::list<bool> & val);
-        /// Prepares a boolean list.
-
-        virtual void prepare(std::size_t pos, const float &) = 0;
-        /// Prepares a float.
-
-        virtual void prepare(std::size_t pos, const std::vector<float> & val);
-        /// Prepares a float vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<float> & val);
-        /// Prepares a float deque.
-
-        virtual void prepare(std::size_t pos, const std::list<float> & val);
-        /// Prepares a float list.
-
-        virtual void prepare(std::size_t pos, const double &) = 0;
-        /// Prepares a double.
-
-        virtual void prepare(std::size_t pos, const std::vector<double> & val);
-        /// Prepares a double vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<double> & val);
-        /// Prepares a double deque.
-
-        virtual void prepare(std::size_t pos, const std::list<double> & val);
-        /// Prepares a double list.
-
-        virtual void prepare(std::size_t pos, const char &) = 0;
-        /// Prepares a single character.
-
-        virtual void prepare(std::size_t pos, const std::vector<char> & val);
-        /// Prepares a character vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<char> & val);
-        /// Prepares a character deque.
-
-        virtual void prepare(std::size_t pos, const std::list<char> & val);
-        /// Prepares a character list.
-
-        virtual void prepare(std::size_t pos, const std::string &) = 0;
-        /// Prepares a string.
-
-        virtual void prepare(std::size_t pos, const std::vector<std::string> & val);
-        /// Prepares a string vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<std::string> & val);
-        /// Prepares a string deque.
-
-        virtual void prepare(std::size_t pos, const std::list<std::string> & val);
-        /// Prepares a character list.
-
-        virtual void prepare(std::size_t pos, const UTF16String &);
-        /// Prepares a UTF16String.
-
-        virtual void prepare(std::size_t pos, const std::vector<UTF16String> & val);
-        /// Prepares a UTF16String vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<UTF16String> & val);
-        /// Prepares a UTF16String deque.
-
-        virtual void prepare(std::size_t pos, const std::list<UTF16String> & val);
-        /// Prepares a UTF16String list.
-
-        virtual void prepare(std::size_t pos, const BLOB &) = 0;
-        /// Prepares a BLOB.
-
-        virtual void prepare(std::size_t pos, const CLOB &) = 0;
-        /// Prepares a CLOB.
-
-        virtual void prepare(std::size_t pos, const std::vector<BLOB> & val);
-        /// Prepares a BLOB vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<BLOB> & val);
-        /// Prepares a BLOB deque.
-
-        virtual void prepare(std::size_t pos, const std::list<BLOB> & val);
-        /// Prepares a BLOB list.
-
-        virtual void prepare(std::size_t pos, const std::vector<CLOB> & val);
-        /// Prepares a CLOB vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<CLOB> & val);
-        /// Prepares a CLOB deque.
-
-        virtual void prepare(std::size_t pos, const std::list<CLOB> & val);
-        /// Prepares a CLOB list.
-
-        virtual void prepare(std::size_t pos, const DateTime &) = 0;
-        /// Prepares a DateTime.
-
-        virtual void prepare(std::size_t pos, const std::vector<DateTime> & val);
-        /// Prepares a DateTime vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<DateTime> & val);
-        /// Prepares a DateTime deque.
-
-        virtual void prepare(std::size_t pos, const std::list<DateTime> & val);
-        /// Prepares a DateTime list.
-
-        virtual void prepare(std::size_t pos, const Date &) = 0;
-        /// Prepares a Date.
-
-        virtual void prepare(std::size_t pos, const std::vector<Date> & val);
-        /// Prepares a Date vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Date> & val);
-        /// Prepares a Date deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Date> & val);
-        /// Prepares a Date list.
-
-        virtual void prepare(std::size_t pos, const Time &) = 0;
-        /// Prepares a Time.
-
-        virtual void prepare(std::size_t pos, const std::vector<Time> & val);
-        /// Prepares a Time vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Time> & val);
-        /// Prepares a Time deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Time> & val);
-        /// Prepares a Time list.
-
-        virtual void prepare(std::size_t pos, const Any &) = 0;
-        /// Prepares an Any.
-
-        virtual void prepare(std::size_t pos, const std::vector<Any> & val);
-        /// Prepares an Any vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Any> & val);
-        /// Prepares an Any deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Any> & val);
-        /// Prepares an Any list.
-
-        virtual void prepare(std::size_t pos, const Poco::Dynamic::Var &) = 0;
-        /// Prepares a Var.
-
-        virtual void prepare(std::size_t pos, const std::vector<Poco::Dynamic::Var> & val);
-        /// Prepares a Var vector.
-
-        virtual void prepare(std::size_t pos, const std::deque<Poco::Dynamic::Var> & val);
-        /// Prepares a Var deque.
-
-        virtual void prepare(std::size_t pos, const std::list<Poco::Dynamic::Var> & val);
-        /// Prepares a Var list.
-
-        void setLength(Poco::UInt32 length);
-        /// Sets the length of prepared data.
-        /// Needed only for data lengths greater than 1 (i.e. for
-        /// bulk operations).
-
-        Poco::UInt32 getLength() const;
-        /// Returns the length of prepared data. Defaults to 1.
-        /// The length is greater than one for bulk operations.
-
-        void setBulk(bool bulkPrep = true);
-        /// Sets bulk operation flag (always false at object creation time)
-
-        bool isBulk() const;
-        /// Returns bulk operation flag.
-
-    private:
-        Poco::UInt32 _length;
-        bool _bulk;
-    };
-
-
-    ///
-    /// inlines
-    ///
-    inline void AbstractPreparator::setLength(Poco::UInt32 length)
-    {
-        _length = length;
-    }
-
-
-    inline Poco::UInt32 AbstractPreparator::getLength() const
-    {
-        return _length;
-    }
-
-
-    inline void AbstractPreparator::setBulk(bool bulkPrep)
-    {
-        _bulk = bulkPrep;
-    }
-
-
-    inline bool AbstractPreparator::isBulk() const
-    {
-        return _bulk;
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_AbstractPreparator_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/AbstractSessionImpl.h b/contrib/poco/Data/include/Poco/Data/AbstractSessionImpl.h
deleted file mode 100644
index 015a9e201..000000000
--- a/contrib/poco/Data/include/Poco/Data/AbstractSessionImpl.h
+++ /dev/null
@@ -1,312 +0,0 @@
-//
-// AbstractSessionImpl.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractSessionImpl
-//
-// Definition of the AbstractSessionImpl class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_AbstractSessionImpl_INCLUDED
-#define Data_AbstractSessionImpl_INCLUDED
-
-
-#include <map>
-#include "Poco/Data/Data.h"
-#include "Poco/Data/DataException.h"
-#include "Poco/Data/SessionImpl.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    template <class C>
-    class AbstractSessionImpl : public SessionImpl
-    /// A partial implementation of SessionImpl, providing
-    /// features and properties management.
-    ///
-    /// To implement a certain feature or property, a subclass
-    /// must provide setter and getter methods and register
-    /// them with addFeature() or addProperty().
-    {
-    public:
-        typedef void (C::*FeatureSetter)(const std::string &, bool);
-        /// The setter method for a feature.
-
-        typedef bool (C::*FeatureGetter)(const std::string &);
-        /// The getter method for a feature.
-
-        typedef void (C::*PropertySetter)(const std::string &, const Poco::Any &);
-        /// The setter method for a property.
-
-        typedef Poco::Any (C::*PropertyGetter)(const std::string &);
-        /// The getter method for a property.
-
-        AbstractSessionImpl(const std::string & connectionString, std::size_t timeout = LOGIN_TIMEOUT_DEFAULT)
-            : SessionImpl(connectionString, timeout)
-            , _storage(std::string("deque"))
-            , _bulk(false)
-            , _emptyStringIsNull(false)
-            , _forceEmptyString(false)
-        /// Creates the AbstractSessionImpl.
-        ///
-        /// Adds "storage" property and sets the default internal storage container
-        /// type to std::deque.
-        /// The storage is created by statements automatically whenever a query
-        /// returning results is executed but external storage is provided by the user.
-        /// Storage type can be reconfigured at runtime both globally (for the
-        /// duration of the session) and locally (for a single statement execution only).
-        /// See StatementImpl for details on how this property is used at runtime.
-        ///
-        /// Adds "handle" property which, if set by the back end, returns native handle
-        /// for the back end DB.
-        ///
-        /// Adds "bulk" feature and sets it to false.
-        /// Bulk feature determines whether the session is capable of bulk operations.
-        /// Connectors that are capable of it must set this feature prior to attempting
-        /// bulk operations.
-        ///
-        /// Adds "emptyStringIsNull" feature and sets it to false. This feature should be
-        /// set to true in order to modify the behavior of the databases that distinguish
-        /// between zero-length character strings as nulls. Setting this feature to true
-        /// shall disregard any difference between empty character strings and nulls,
-        /// causing the framework to treat them the same (i.e. behave like Oracle).
-        ///
-        /// Adds "forceEmptyString" feature and sets it to false. This feature should be set
-        /// to true in order to force the databases that do not distinguish empty strings from
-        /// nulls (e.g. Oracle) to always report empty string.
-        ///
-        /// The "emptyStringIsNull" and "forceEmptyString" features are mutually exclusive.
-        /// While these features can not both be true at the same time, they can both be false,
-        /// resulting in default underlying database behavior.
-        ///
-        {
-            addProperty("storage", &AbstractSessionImpl<C>::setStorage, &AbstractSessionImpl<C>::getStorage);
-
-            addProperty("handle", &AbstractSessionImpl<C>::setHandle, &AbstractSessionImpl<C>::getHandle);
-
-            addFeature("bulk", &AbstractSessionImpl<C>::setBulk, &AbstractSessionImpl<C>::getBulk);
-
-            addFeature("emptyStringIsNull", &AbstractSessionImpl<C>::setEmptyStringIsNull, &AbstractSessionImpl<C>::getEmptyStringIsNull);
-
-            addFeature("forceEmptyString", &AbstractSessionImpl<C>::setForceEmptyString, &AbstractSessionImpl<C>::getForceEmptyString);
-        }
-
-        ~AbstractSessionImpl()
-        /// Destroys the AbstractSessionImpl.
-        {
-        }
-
-        void setFeature(const std::string & name, bool state)
-        /// Looks a feature up in the features map
-        /// and calls the feature's setter, if there is one.
-        {
-            typename FeatureMap::const_iterator it = _features.find(name);
-            if (it != _features.end())
-            {
-                if (it->second.setter)
-                    (static_cast<C *>(this)->*it->second.setter)(name, state);
-                else
-                    throw NotImplementedException("set", name);
-            }
-            else
-                throw NotSupportedException(name);
-        }
-
-        bool getFeature(const std::string & name)
-        /// Looks a feature up in the features map
-        /// and calls the feature's getter, if there is one.
-        {
-            typename FeatureMap::const_iterator it = _features.find(name);
-            if (it != _features.end())
-            {
-                if (it->second.getter)
-                    return (static_cast<C *>(this)->*it->second.getter)(name);
-                else
-                    throw NotImplementedException("get", name);
-            }
-            else
-                throw NotSupportedException(name);
-        }
-
-        void setProperty(const std::string & name, const Poco::Any & value)
-        /// Looks a property up in the properties map
-        /// and calls the property's setter, if there is one.
-        {
-            typename PropertyMap::const_iterator it = _properties.find(name);
-            if (it != _properties.end())
-            {
-                if (it->second.setter)
-                    (static_cast<C *>(this)->*it->second.setter)(name, value);
-                else
-                    throw NotImplementedException("set", name);
-            }
-            else
-                throw NotSupportedException(name);
-        }
-
-        Poco::Any getProperty(const std::string & name)
-        /// Looks a property up in the properties map
-        /// and calls the property's getter, if there is one.
-        {
-            typename PropertyMap::const_iterator it = _properties.find(name);
-            if (it != _properties.end())
-            {
-                if (it->second.getter)
-                    return (static_cast<C *>(this)->*it->second.getter)(name);
-                else
-                    throw NotImplementedException("set", name);
-            }
-            else
-                throw NotSupportedException(name);
-        }
-
-        void setStorage(const std::string & value)
-        /// Sets the storage type.
-        {
-            _storage = value;
-        }
-
-        void setStorage(const std::string & name, const Poco::Any & value)
-        /// Sets the storage type.
-        {
-            _storage = Poco::RefAnyCast<std::string>(value);
-        }
-
-        Poco::Any getStorage(const std::string & name = "")
-        /// Returns the storage type
-        {
-            return _storage;
-        }
-
-        void setHandle(const std::string & name, const Poco::Any & handle)
-        /// Sets the native session handle.
-        {
-            _handle = handle;
-        }
-
-        Poco::Any getHandle(const std::string & name = "")
-        /// Returns the native session handle.
-        {
-            return _handle;
-        }
-
-        void setBulk(const std::string & name, bool bulk)
-        /// Sets the execution type.
-        {
-            _bulk = bulk;
-        }
-
-        bool getBulk(const std::string & name = "")
-        /// Returns the execution type
-        {
-            return _bulk;
-        }
-
-        void setEmptyStringIsNull(const std::string & name, bool emptyStringIsNull)
-        /// Sets the behavior regarding empty variable length strings.
-        /// Those are treated as NULL by Oracle and as empty string by
-        /// most other databases.
-        /// When this feature is true, empty strings are treated as NULL.
-        {
-            if (emptyStringIsNull && _forceEmptyString)
-                throw InvalidAccessException("Features mutually exclusive");
-
-            _emptyStringIsNull = emptyStringIsNull;
-        }
-
-        bool getEmptyStringIsNull(const std::string & name = "")
-        /// Returns the setting for the behavior regarding empty variable
-        /// length strings. See setEmptyStringIsNull(const std::string&, bool)
-        /// and this class documentation for feature rationale and details.
-        {
-            return _emptyStringIsNull;
-        }
-
-        void setForceEmptyString(const std::string & name, bool forceEmptyString)
-        /// Sets the behavior regarding empty variable length strings.
-        /// Those are treated as NULL by Oracle and as empty string by
-        /// most other databases.
-        /// When this feature is true, both empty strings and NULL values
-        /// are reported as empty strings.
-        {
-            if (forceEmptyString && _emptyStringIsNull)
-                throw InvalidAccessException("Features mutually exclusive");
-
-            _forceEmptyString = forceEmptyString;
-        }
-
-        bool getForceEmptyString(const std::string & name = "")
-        /// Returns the setting for the behavior regarding empty variable
-        /// length strings. See setForceEmptyString(const std::string&, bool)
-        /// and this class documentation for feature rationale and details.
-        {
-            return _forceEmptyString;
-        }
-
-    protected:
-        void addFeature(const std::string & name, FeatureSetter setter, FeatureGetter getter)
-        /// Adds a feature to the map of supported features.
-        ///
-        /// The setter or getter can be null, in case setting or getting a feature
-        /// is not supported.
-        {
-            Feature feature;
-            feature.setter = setter;
-            feature.getter = getter;
-            _features[name] = feature;
-        }
-
-        void addProperty(const std::string & name, PropertySetter setter, PropertyGetter getter)
-        /// Adds a property to the map of supported properties.
-        ///
-        /// The setter or getter can be null, in case setting or getting a property
-        /// is not supported.
-        {
-            Property property;
-            property.setter = setter;
-            property.getter = getter;
-            _properties[name] = property;
-        }
-
-    private:
-        struct Feature
-        {
-            FeatureSetter setter;
-            FeatureGetter getter;
-        };
-
-        struct Property
-        {
-            PropertySetter setter;
-            PropertyGetter getter;
-        };
-
-        typedef std::map<std::string, Feature> FeatureMap;
-        typedef std::map<std::string, Property> PropertyMap;
-
-        FeatureMap _features;
-        PropertyMap _properties;
-        std::string _storage;
-        bool _bulk;
-        bool _emptyStringIsNull;
-        bool _forceEmptyString;
-        Poco::Any _handle;
-    };
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_AbstractSessionImpl_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/ArchiveStrategy.h b/contrib/poco/Data/include/Poco/Data/ArchiveStrategy.h
deleted file mode 100644
index 7ecbd11a4..000000000
--- a/contrib/poco/Data/include/Poco/Data/ArchiveStrategy.h
+++ /dev/null
@@ -1,226 +0,0 @@
-//
-// ArchiveStrategy.h
-//
-// Library: Data
-// Package: Logging
-// Module:  ArchiveStrategy
-//
-// Definition of the ArchiveStrategy class and subclasses.
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_ArchiveStrategy_INCLUDED
-#define Data_ArchiveStrategy_INCLUDED
-
-
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Session.h"
-#include "Poco/DateTime.h"
-#include "Poco/Dynamic/Var.h"
-#include "Poco/SharedPtr.h"
-#include "Poco/Timespan.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API ArchiveStrategy
-    /// The ArchiveStrategy is used by SQLChannel to archive log rows.
-    {
-    public:
-        static const std::string DEFAULT_ARCHIVE_DESTINATION;
-
-        ArchiveStrategy(
-            const std::string & connector,
-            const std::string & connect,
-            const std::string & source,
-            const std::string & destination = DEFAULT_ARCHIVE_DESTINATION);
-        /// Creates archive strategy.
-
-        virtual ~ArchiveStrategy();
-        /// Destroys archive strategy.
-
-        void open();
-        /// Opens the session.
-
-        virtual void archive() = 0;
-        /// Archives the rows.
-
-        const std::string & getSource() const;
-        /// Returns the name of the source table containing rows to be archived.
-
-        void setSource(const std::string & source);
-        /// Sets the name of the source table.
-
-        const std::string & getDestination() const;
-        /// Returns the name of the destination table for rows to be archived.
-
-        void setDestination(const std::string & destination);
-        /// Sets the name of the destination table.
-
-        virtual const std::string & getThreshold() const = 0;
-        /// Returns the archive threshold.
-
-        virtual void setThreshold(const std::string & threshold) = 0;
-        /// Sets the archive threshold.
-
-    protected:
-        typedef Poco::SharedPtr<Session> SessionPtr;
-        typedef Poco::SharedPtr<Statement> StatementPtr;
-
-        Session & session();
-
-        void setCopyStatement();
-        void setDeleteStatement();
-        void setCountStatement();
-
-        Statement & getCopyStatement();
-        Statement & getDeleteStatement();
-        Statement & getCountStatement();
-
-    private:
-        ArchiveStrategy();
-        ArchiveStrategy(const ArchiveStrategy &);
-        ArchiveStrategy & operator=(const ArchiveStrategy &);
-
-        std::string _connector;
-        std::string _connect;
-        SessionPtr _pSession;
-        StatementPtr _pCopyStatement;
-        StatementPtr _pDeleteStatement;
-        StatementPtr _pCountStatement;
-        std::string _source;
-        std::string _destination;
-    };
-
-
-    //
-    // inlines
-    //
-
-    inline const std::string & ArchiveStrategy::getSource() const
-    {
-        return _source;
-    }
-
-
-    inline void ArchiveStrategy::setSource(const std::string & source)
-    {
-        _source = source;
-    }
-
-
-    inline void ArchiveStrategy::setDestination(const std::string & destination)
-    {
-        _destination = destination;
-    }
-
-
-    inline const std::string & ArchiveStrategy::getDestination() const
-    {
-        return _destination;
-    }
-
-
-    inline Session & ArchiveStrategy::session()
-    {
-        return *_pSession;
-    }
-
-
-    inline void ArchiveStrategy::setCopyStatement()
-    {
-        _pCopyStatement = new Statement(*_pSession);
-    }
-
-
-    inline void ArchiveStrategy::setDeleteStatement()
-    {
-        _pDeleteStatement = new Statement(*_pSession);
-    }
-
-
-    inline void ArchiveStrategy::setCountStatement()
-    {
-        _pCountStatement = new Statement(*_pSession);
-    }
-
-
-    inline Statement & ArchiveStrategy::getCopyStatement()
-    {
-        return *_pCopyStatement;
-    }
-
-
-    inline Statement & ArchiveStrategy::getDeleteStatement()
-    {
-        return *_pDeleteStatement;
-    }
-
-
-    inline Statement & ArchiveStrategy::getCountStatement()
-    {
-        return *_pCountStatement;
-    }
-
-
-    //
-    // ArchiveByAgeStrategy
-    //
-    class Data_API ArchiveByAgeStrategy : public ArchiveStrategy
-    /// Archives rows scheduled for archiving.
-    {
-    public:
-        ArchiveByAgeStrategy(
-            const std::string & connector,
-            const std::string & connect,
-            const std::string & sourceTable,
-            const std::string & destinationTable = DEFAULT_ARCHIVE_DESTINATION);
-
-        ~ArchiveByAgeStrategy();
-
-        void archive();
-
-        const std::string & getThreshold() const;
-        /// Returns the archive threshold.
-
-        void setThreshold(const std::string & threshold);
-        /// Sets the archive threshold.
-
-    private:
-        ArchiveByAgeStrategy();
-        ArchiveByAgeStrategy(const ArchiveByAgeStrategy &);
-        ArchiveByAgeStrategy & operator=(const ArchiveByAgeStrategy &);
-
-        void initStatements();
-
-        Timespan _maxAge;
-        std::string _ageString;
-        DateTime _archiveDateTime;
-        Poco::Dynamic::Var _archiveCount;
-    };
-
-
-    //
-    // inlines
-    //
-
-    inline const std::string & ArchiveByAgeStrategy::getThreshold() const
-    {
-        return _ageString;
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_ArchiveStrategy_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Binding.h b/contrib/poco/Data/include/Poco/Data/Binding.h
deleted file mode 100644
index 74d522ff9..000000000
--- a/contrib/poco/Data/include/Poco/Data/Binding.h
+++ /dev/null
@@ -1,1219 +0,0 @@
-//
-// Binding.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Binding
-//
-// Definition of the Binding class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Binding_INCLUDED
-#define Data_Binding_INCLUDED
-
-
-#include <cstddef>
-#include <deque>
-#include <list>
-#include <map>
-#include <set>
-#include <vector>
-#include "Poco/Bugcheck.h"
-#include "Poco/Data/AbstractBinding.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/DataException.h"
-#include "Poco/Data/TypeHandler.h"
-#include "Poco/MetaProgramming.h"
-#include "Poco/SharedPtr.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    template <class T>
-    class Binding : public AbstractBinding
-    /// Binding maps a value or multiple values (see Binding specializations for STL containers as
-    /// well as type handlers) to database column(s). Values to be bound can be either mapped
-    /// directly (by reference) or a copy can be created, depending on the value of the copy argument.
-    /// To pass a reference to a variable, it is recommended to pass it to the intermediate
-    /// utility function use(), which will create the proper binding. In cases when a reference
-    /// is passed to binding, the storage it refers to must be valid at the statement execution time.
-    /// To pass a copy of a variable, constant or string literal, use utility function bind().
-    /// Variables can be passed as either copies or references (i.e. using either use() or bind()).
-    /// Constants, however, can only be passed as copies. this is best achieved using bind() utility
-    /// function. An attempt to pass a constant by reference shall result in compile-time error.
-    {
-    public:
-        typedef T ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Binding<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        explicit Binding(T & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _val(val), _bound(false)
-        /// Creates the Binding using the passed reference as bound value.
-        /// If copy is true, a copy of the value referred to is created.
-        {
-        }
-
-        ~Binding()
-        /// Destroys the Binding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return 1u; }
-
-        bool canBind() const { return !_bound; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            TypeHandler<T>::bind(pos, _val, getBinder(), getDirection());
-            _bound = true;
-        }
-
-        void reset()
-        {
-            _bound = false;
-            AbstractBinder::Ptr pBinder = getBinder();
-            poco_assert_dbg(!pBinder.isNull());
-            pBinder->reset();
-        }
-
-    private:
-        const T & _val;
-        bool _bound;
-    };
-
-
-    template <class T>
-    class CopyBinding : public AbstractBinding
-    /// Binding maps a value or multiple values (see Binding specializations for STL containers as
-    /// well as type handlers) to database column(s). Values to be bound can be either mapped
-    /// directly (by reference) or a copy can be created, depending on the value of the copy argument.
-    /// To pass a reference to a variable, it is recommended to pass it to the intermediate
-    /// utility function use(), which will create the proper binding. In cases when a reference
-    /// is passed to binding, the storage it refers to must be valid at the statement execution time.
-    /// To pass a copy of a variable, constant or string literal, use utility function bind().
-    /// Variables can be passed as either copies or references (i.e. using either use() or bind()).
-    {
-    public:
-        typedef T ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef CopyBinding<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        explicit CopyBinding(T & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _pVal(new T(val)), _bound(false)
-        /// Creates the Binding using the passed reference as bound value.
-        /// If copy is true, a copy of the value referred to is created.
-        {
-        }
-
-        ~CopyBinding()
-        /// Destroys the CopyBinding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return 1; }
-
-        bool canBind() const { return !_bound; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            TypeHandler<T>::bind(pos, *_pVal, getBinder(), getDirection());
-            _bound = true;
-        }
-
-        void reset()
-        {
-            _bound = false;
-            AbstractBinder::Ptr pBinder = getBinder();
-            poco_assert_dbg(!pBinder.isNull());
-            pBinder->reset();
-        }
-
-    private:
-        //typedef typename TypeWrapper<T>::TYPE ValueType;
-        ValPtr _pVal;
-        bool _bound;
-    };
-
-
-    template <>
-    class Binding<const char *> : public AbstractBinding
-    /// Binding const char* specialization wraps char pointer into string.
-    {
-    public:
-        typedef const char * ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Binding<const char *> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        explicit Binding(const char * pVal, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _val(pVal ? pVal : throw NullPointerException()), _bound(false)
-        /// Creates the Binding by copying the passed string.
-        {
-        }
-
-        ~Binding()
-        /// Destroys the Binding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return 1u; }
-
-        std::size_t numOfRowsHandled() const { return 1u; }
-
-        bool canBind() const { return !_bound; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            TypeHandler<std::string>::bind(pos, _val, getBinder(), getDirection());
-            _bound = true;
-        }
-
-        void reset()
-        {
-            _bound = false;
-            AbstractBinder::Ptr pBinder = getBinder();
-            poco_assert_dbg(!pBinder.isNull());
-            pBinder->reset();
-        }
-
-    private:
-        std::string _val;
-        bool _bound;
-    };
-
-
-    template <>
-    class CopyBinding<const char *> : public AbstractBinding
-    /// Binding const char* specialization wraps char pointer into string.
-    {
-    public:
-        typedef const char * ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef CopyBinding<const char *> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        explicit CopyBinding(const char * pVal, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _val(pVal ? pVal : throw NullPointerException()), _bound(false)
-        /// Creates the Binding by copying the passed string.
-        {
-        }
-
-        ~CopyBinding()
-        /// Destroys the CopyBinding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return 1u; }
-
-        std::size_t numOfRowsHandled() const { return 1u; }
-
-        bool canBind() const { return !_bound; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            TypeHandler<std::string>::bind(pos, _val, getBinder(), getDirection());
-            _bound = true;
-        }
-
-        void reset()
-        {
-            _bound = false;
-            AbstractBinder::Ptr pBinder = getBinder();
-            poco_assert_dbg(!pBinder.isNull());
-            pBinder->reset();
-        }
-
-    private:
-        std::string _val;
-        bool _bound;
-    };
-
-
-    template <class T>
-    class Binding<std::vector<T>> : public AbstractBinding
-    /// Specialization for std::vector.
-    {
-    public:
-        typedef std::vector<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<Binding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit Binding(std::vector<T> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _val(val), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~Binding()
-        /// Destroys the Binding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_val.size()); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-
-            TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _val.begin();
-            _end = _val.end();
-        }
-
-    private:
-        const ValType & _val;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class T>
-    class CopyBinding<std::vector<T>> : public AbstractBinding
-    /// Specialization for std::vector.
-    {
-    public:
-        typedef std::vector<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<CopyBinding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit CopyBinding(std::vector<T> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _pVal(new std::vector<T>(val)), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~CopyBinding()
-        /// Destroys the CopyBinding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _pVal->size(); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-
-            TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _pVal->begin();
-            _end = _pVal->end();
-        }
-
-    private:
-        ValPtr _pVal;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <>
-    class Binding<std::vector<bool>> : public AbstractBinding
-    /// Specialization for std::vector<bool>.
-    /// This specialization is necessary due to the nature of std::vector<bool>.
-    /// For details, see the standard library implementation of std::vector<bool>
-    /// or
-    /// S. Meyers: "Effective STL" (Copyright Addison-Wesley 2001),
-    /// Item 18: "Avoid using vector<bool>."
-    ///
-    /// The workaround employed here is using std::deque<bool> as an
-    /// internal replacement container.
-    ///
-    /// IMPORTANT:
-    /// Only IN binding is supported.
-    {
-    public:
-        typedef std::vector<bool> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<Binding<ValType>> Ptr;
-        typedef ValType::const_iterator Iterator;
-
-        explicit Binding(const std::vector<bool> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _val(val), _deq(_val.begin(), _val.end()), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN != direction)
-                throw BindingException("Only IN direction is legal for std:vector<bool> binding.");
-
-            if (numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~Binding()
-        /// Destroys the Binding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return 1u; }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_val.size()); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<bool>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _deq.begin();
-            _end = _deq.end();
-        }
-
-    private:
-        const std::vector<bool> & _val;
-        std::deque<bool> _deq;
-        std::deque<bool>::const_iterator _begin;
-        std::deque<bool>::const_iterator _end;
-    };
-
-
-    template <>
-    class CopyBinding<std::vector<bool>> : public AbstractBinding
-    /// Specialization for std::vector<bool>.
-    /// This specialization is necessary due to the nature of std::vector<bool>.
-    /// For details, see the standard library implementation of std::vector<bool>
-    /// or
-    /// S. Meyers: "Effective STL" (Copyright Addison-Wesley 2001),
-    /// Item 18: "Avoid using vector<bool>."
-    ///
-    /// The workaround employed here is using std::deque<bool> as an
-    /// internal replacement container.
-    ///
-    /// IMPORTANT:
-    /// Only IN binding is supported.
-    {
-    public:
-        typedef std::vector<bool> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<CopyBinding<ValType>> Ptr;
-        typedef ValType::const_iterator Iterator;
-
-        explicit CopyBinding(const std::vector<bool> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _deq(val.begin(), val.end()), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN != direction)
-                throw BindingException("Only IN direction is legal for std:vector<bool> binding.");
-
-            if (numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-
-            reset();
-        }
-
-        ~CopyBinding()
-        /// Destroys the CopyBinding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return 1u; }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_deq.size()); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<bool>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _deq.begin();
-            _end = _deq.end();
-        }
-
-    private:
-        std::deque<bool> _deq;
-        std::deque<bool>::const_iterator _begin;
-        std::deque<bool>::const_iterator _end;
-    };
-
-
-    template <class T>
-    class Binding<std::list<T>> : public AbstractBinding
-    /// Specialization for std::list.
-    {
-    public:
-        typedef std::list<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<Binding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit Binding(std::list<T> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _val(val), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~Binding()
-        /// Destroys the Binding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _val.size(); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _val.begin();
-            _end = _val.end();
-        }
-
-    private:
-        const ValType & _val;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class T>
-    class CopyBinding<std::list<T>> : public AbstractBinding
-    /// Specialization for std::list.
-    {
-    public:
-        typedef typename std::list<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<CopyBinding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit CopyBinding(ValType & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _pVal(new std::list<T>(val)), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~CopyBinding()
-        /// Destroys the CopyBinding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _pVal->size(); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _pVal->begin();
-            _end = _pVal->end();
-        }
-
-    private:
-        ValPtr _pVal;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class T>
-    class Binding<std::deque<T>> : public AbstractBinding
-    /// Specialization for std::deque.
-    {
-    public:
-        typedef std::deque<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<Binding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit Binding(std::deque<T> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _val(val), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~Binding()
-        /// Destroys the Binding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _val.size(); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _val.begin();
-            _end = _val.end();
-        }
-
-    private:
-        const ValType & _val;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class T>
-    class CopyBinding<std::deque<T>> : public AbstractBinding
-    /// Specialization for std::deque.
-    {
-    public:
-        typedef std::deque<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<CopyBinding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit CopyBinding(std::deque<T> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _pVal(new std::deque<T>(val)), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~CopyBinding()
-        /// Destroys the CopyBinding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _pVal->size(); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _pVal->begin();
-            _end = _pVal->end();
-        }
-
-    private:
-        ValPtr _pVal;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class T>
-    class Binding<std::set<T>> : public AbstractBinding
-    /// Specialization for std::set.
-    {
-    public:
-        typedef std::set<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<Binding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit Binding(std::set<T> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _val(val), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~Binding()
-        /// Destroys the Binding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_val.size()); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _val.begin();
-            _end = _val.end();
-        }
-
-    private:
-        const ValType & _val;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class T>
-    class CopyBinding<std::set<T>> : public AbstractBinding
-    /// Specialization for std::set.
-    {
-    public:
-        typedef std::set<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<CopyBinding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit CopyBinding(std::set<T> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _pVal(new std::set<T>(val)), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~CopyBinding()
-        /// Destroys the CopyBinding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _pVal->size(); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _pVal->begin();
-            _end = _pVal->end();
-        }
-
-    private:
-        ValPtr _pVal;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class T>
-    class Binding<std::multiset<T>> : public AbstractBinding
-    /// Specialization for std::multiset.
-    {
-    public:
-        typedef std::multiset<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<Binding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit Binding(std::multiset<T> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _val(val), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~Binding()
-        /// Destroys the Binding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_val.size()); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _val.begin();
-            _end = _val.end();
-        }
-
-    private:
-        const ValType & _val;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class T>
-    class CopyBinding<std::multiset<T>> : public AbstractBinding
-    /// Specialization for std::multiset.
-    {
-    public:
-        typedef std::multiset<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<CopyBinding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit CopyBinding(std::multiset<T> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _pVal(new std::multiset<T>(val)), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~CopyBinding()
-        /// Destroys the CopyBinding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _pVal->size(); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<T>::bind(pos, *_begin, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _pVal->begin();
-            _end = _pVal->end();
-        }
-
-    private:
-        ValPtr _pVal;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class K, class V>
-    class Binding<std::map<K, V>> : public AbstractBinding
-    /// Specialization for std::map.
-    {
-    public:
-        typedef std::map<K, V> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<Binding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit Binding(std::map<K, V> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _val(val), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~Binding()
-        /// Destroys the Binding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<V>::size(); }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_val.size()); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<V>::bind(pos, _begin->second, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _val.begin();
-            _end = _val.end();
-        }
-
-    private:
-        const ValType & _val;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class K, class V>
-    class CopyBinding<std::map<K, V>> : public AbstractBinding
-    /// Specialization for std::map.
-    {
-    public:
-        typedef std::map<K, V> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<CopyBinding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit CopyBinding(std::map<K, V> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _pVal(new std::map<K, V>(val)), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~CopyBinding()
-        /// Destroys the CopyBinding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<V>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _pVal->size(); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<V>::bind(pos, _begin->second, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _pVal->begin();
-            _end = _pVal->end();
-        }
-
-    private:
-        ValPtr _pVal;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class K, class V>
-    class Binding<std::multimap<K, V>> : public AbstractBinding
-    /// Specialization for std::multimap.
-    {
-    public:
-        typedef std::multimap<K, V> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<Binding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit Binding(std::multimap<K, V> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _val(val), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~Binding()
-        /// Destroys the Binding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<V>::size(); }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_val.size()); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<V>::bind(pos, _begin->second, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _val.begin();
-            _end = _val.end();
-        }
-
-    private:
-        const ValType & _val;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    template <class K, class V>
-    class CopyBinding<std::multimap<K, V>> : public AbstractBinding
-    /// Specialization for std::multimap.
-    {
-    public:
-        typedef std::multimap<K, V> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef SharedPtr<CopyBinding<ValType>> Ptr;
-        typedef typename ValType::const_iterator Iterator;
-
-        explicit CopyBinding(std::multimap<K, V> & val, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction), _pVal(new std::multimap<K, V>(val)), _begin(), _end()
-        /// Creates the Binding.
-        {
-            if (PD_IN == direction && numOfRowsHandled() == 0)
-                throw BindingException("It is illegal to bind to an empty data collection");
-            reset();
-        }
-
-        ~CopyBinding()
-        /// Destroys the CopyBinding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<V>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _pVal->size(); }
-
-        bool canBind() const { return _begin != _end; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            poco_assert_dbg(canBind());
-            TypeHandler<V>::bind(pos, _begin->second, getBinder(), getDirection());
-            ++_begin;
-        }
-
-        void reset()
-        {
-            _begin = _pVal->begin();
-            _end = _pVal->end();
-        }
-
-    private:
-        ValPtr _pVal;
-        Iterator _begin;
-        Iterator _end;
-    };
-
-
-    namespace Keywords
-    {
-
-
-        template <typename T>
-        inline AbstractBinding::Ptr use(T & t, const std::string & name = "")
-        /// Convenience function for a more compact Binding creation.
-        {
-            // If this fails to compile, a const ref was passed to use().
-            // This can be resolved by either (a) using bind (which will copy the value),
-            // or (b) if the const ref is guaranteed to exist when execute is called
-            // (which can be much later!), by using the "useRef" keyword instead
-            poco_static_assert(!IsConst<T>::VALUE);
-            return new Binding<T>(t, name, AbstractBinding::PD_IN);
-        }
-
-
-        inline AbstractBinding::Ptr use(const NullData & t, const std::string & name = "")
-        /// NullData overload.
-        {
-            return new Binding<NullData>(const_cast<NullData &>(t), name, AbstractBinding::PD_IN);
-        }
-
-
-        template <typename T>
-        inline AbstractBinding::Ptr useRef(T & t, const std::string & name = "")
-        /// Convenience function for a more compact Binding creation.
-        {
-            return new Binding<T>(t, name, AbstractBinding::PD_IN);
-        }
-
-
-        template <typename T>
-        inline AbstractBinding::Ptr in(T & t, const std::string & name = "")
-        /// Convenience function for a more compact Binding creation.
-        {
-            return use(t, name);
-        }
-
-
-        inline AbstractBinding::Ptr in(const NullData & t, const std::string & name = "")
-        /// NullData overload.
-        {
-            return use(t, name);
-        }
-
-
-        template <typename T>
-        inline AbstractBinding::Ptr out(T & t)
-        /// Convenience function for a more compact Binding creation.
-        {
-            poco_static_assert(!IsConst<T>::VALUE);
-            return new Binding<T>(t, "", AbstractBinding::PD_OUT);
-        }
-
-
-        template <typename T>
-        inline AbstractBinding::Ptr io(T & t)
-        /// Convenience function for a more compact Binding creation.
-        {
-            poco_static_assert(!IsConst<T>::VALUE);
-            return new Binding<T>(t, "", AbstractBinding::PD_IN_OUT);
-        }
-
-
-        inline AbstractBindingVec & use(AbstractBindingVec & bv)
-        /// Convenience dummy function (for syntax purposes only).
-        {
-            return bv;
-        }
-
-
-        inline AbstractBindingVec & in(AbstractBindingVec & bv)
-        /// Convenience dummy function (for syntax purposes only).
-        {
-            return bv;
-        }
-
-
-        inline AbstractBindingVec & out(AbstractBindingVec & bv)
-        /// Convenience dummy function (for syntax purposes only).
-        {
-            return bv;
-        }
-
-
-        inline AbstractBindingVec & io(AbstractBindingVec & bv)
-        /// Convenience dummy function (for syntax purposes only).
-        {
-            return bv;
-        }
-
-
-        template <typename T>
-        inline AbstractBinding::Ptr bind(T t, const std::string & name)
-        /// Convenience function for a more compact Binding creation.
-        /// This function differs from use() in its value copy semantics.
-        {
-            return new CopyBinding<T>(t, name, AbstractBinding::PD_IN);
-        }
-
-
-        template <typename T>
-        inline AbstractBinding::Ptr bind(T t)
-        /// Convenience function for a more compact Binding creation.
-        /// This function differs from use() in its value copy semantics.
-        {
-            return Poco::Data::Keywords::bind(t, "");
-        }
-
-
-    } // namespace Keywords
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Binding_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Bulk.h b/contrib/poco/Data/include/Poco/Data/Bulk.h
deleted file mode 100644
index 7fc115d65..000000000
--- a/contrib/poco/Data/include/Poco/Data/Bulk.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// BulkExtraction.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Bulk
-//
-// Definition of the BulkExtraction class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Bulk_INCLUDED
-#define Data_Bulk_INCLUDED
-
-
-#include "Poco/Data/Limit.h"
-#include "Poco/Void.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API Bulk
-    {
-    public:
-        Bulk(const Limit & limit);
-        /// Creates the Bulk.
-
-        Bulk(Poco::UInt32 value);
-        /// Creates the Bulk.
-
-        ~Bulk();
-        /// Destroys the bulk.
-
-        const Limit & limit() const;
-        /// Returns the limit associated with this bulk object.
-
-        Poco::UInt32 size() const;
-        /// Returns the value of the limit associated with
-        /// this bulk object.
-
-    private:
-        Bulk();
-
-        Limit _limit;
-    };
-
-
-    ///
-    /// inlines
-    ///
-    inline const Limit & Bulk::limit() const
-    {
-        return _limit;
-    }
-
-
-    inline Poco::UInt32 Bulk::size() const
-    {
-        return _limit.value();
-    }
-
-
-    namespace Keywords
-    {
-
-
-        inline Bulk bulk(const Limit & limit = Limit(Limit::LIMIT_UNLIMITED, false, false))
-        /// Convenience function for creation of bulk.
-        {
-            return Bulk(limit);
-        }
-
-
-        inline void bulk(Void)
-        /// Dummy bulk function. Used for bulk binding creation
-        /// (see BulkBinding) and bulk extraction signalling to Statement.
-        {
-        }
-
-
-    } // namespace Keywords
-
-
-    typedef void (*BulkFnType)(Void);
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Bulk_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/BulkBinding.h b/contrib/poco/Data/include/Poco/Data/BulkBinding.h
deleted file mode 100644
index 67631cae1..000000000
--- a/contrib/poco/Data/include/Poco/Data/BulkBinding.h
+++ /dev/null
@@ -1,141 +0,0 @@
-//
-// BulkBinding.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  BulkBinding
-//
-// Definition of the BulkBinding class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_BulkBinding_INCLUDED
-#define Data_BulkBinding_INCLUDED
-
-
-#include <cstddef>
-#include <deque>
-#include <list>
-#include <vector>
-#include "Poco/Data/AbstractBinding.h"
-#include "Poco/Data/Bulk.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/DataException.h"
-#include "Poco/Data/TypeHandler.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    template <class T>
-    class BulkBinding : public AbstractBinding
-    /// A BulkBinding maps a value to a column.
-    /// Bulk binding support is provided only for std::vector.
-    {
-    public:
-        BulkBinding(const T & val, Poco::UInt32 bulkSize, const std::string & name = "", Direction direction = PD_IN)
-            : AbstractBinding(name, direction, bulkSize), _val(val), _bound(false)
-        /// Creates the BulkBinding.
-        {
-            if (0 == _val.size())
-                throw BindingException("Zero size containers not allowed.");
-        }
-
-        ~BulkBinding()
-        /// Destroys the BulkBinding.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return 1; }
-
-        std::size_t numOfRowsHandled() const { return _val.size(); }
-
-        bool canBind() const { return !_bound; }
-
-        void bind(std::size_t pos)
-        {
-            poco_assert_dbg(!getBinder().isNull());
-            TypeHandler<T>::bind(pos, _val, getBinder(), getDirection());
-            _bound = true;
-        }
-
-        void reset()
-        {
-            _bound = false;
-            getBinder()->reset();
-        }
-
-    private:
-        const T & _val;
-        bool _bound;
-    };
-
-
-    namespace Keywords
-    {
-
-
-        template <typename T>
-        AbstractBinding::Ptr use(const std::vector<T> & t, BulkFnType, const std::string & name = "")
-        /// Convenience function for a more compact BulkBinding creation for std::vector.
-        {
-            return new BulkBinding<std::vector<T>>(t, static_cast<Poco::UInt32>(t.size()), name);
-        }
-
-
-        template <typename T>
-        AbstractBinding::Ptr in(const std::vector<T> & t, BulkFnType, const std::string & name = "")
-        /// Convenience function for a more compact BulkBinding creation for std::vector.
-        {
-            return new BulkBinding<std::vector<T>>(t, static_cast<Poco::UInt32>(t.size()), name);
-        }
-
-
-        template <typename T>
-        AbstractBinding::Ptr use(const std::deque<T> & t, BulkFnType, const std::string & name = "")
-        /// Convenience function for a more compact BulkBinding creation for std::deque.
-        {
-            return new BulkBinding<std::deque<T>>(t, static_cast<Poco::UInt32>(t.size()), name);
-        }
-
-
-        template <typename T>
-        AbstractBinding::Ptr in(const std::deque<T> & t, BulkFnType, const std::string & name = "")
-        /// Convenience function for a more compact BulkBinding creation for std::deque.
-        {
-            return new BulkBinding<std::deque<T>>(t, static_cast<Poco::UInt32>(t.size()), name);
-        }
-
-
-        template <typename T>
-        AbstractBinding::Ptr use(const std::list<T> & t, BulkFnType, const std::string & name = "")
-        /// Convenience function for a more compact BulkBinding creation for std::list.
-        {
-            return new BulkBinding<std::list<T>>(t, static_cast<Poco::UInt32>(t.size()), name);
-        }
-
-
-        template <typename T>
-        AbstractBinding::Ptr in(const std::list<T> & t, BulkFnType, const std::string & name = "")
-        /// Convenience function for a more compact BulkBinding creation for std::list.
-        {
-            return new BulkBinding<std::list<T>>(t, static_cast<Poco::UInt32>(t.size()), name);
-        }
-
-
-    } // namespace Keywords
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_BulkBinding_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/BulkExtraction.h b/contrib/poco/Data/include/Poco/Data/BulkExtraction.h
deleted file mode 100644
index 8a716c459..000000000
--- a/contrib/poco/Data/include/Poco/Data/BulkExtraction.h
+++ /dev/null
@@ -1,253 +0,0 @@
-//
-// BulkExtraction.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  BulkExtraction
-//
-// Definition of the BulkExtraction class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_BulkExtraction_INCLUDED
-#define Data_BulkExtraction_INCLUDED
-
-
-#include <vector>
-#include "Poco/Data/AbstractExtraction.h"
-#include "Poco/Data/Bulk.h"
-#include "Poco/Data/Column.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Position.h"
-#include "Poco/Data/Preparation.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    template <class C>
-    class BulkExtraction : public AbstractExtraction
-    /// Specialization for bulk extraction of values from a query result set.
-    /// Bulk extraction support is provided only for following STL containers:
-    /// - std::vector
-    /// - std::deque
-    /// - std::list
-    {
-    public:
-        typedef C ValType;
-        typedef typename C::value_type CValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef BulkExtraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        BulkExtraction(C & result, Poco::UInt32 limit, const Position & pos = Position(0))
-            : AbstractExtraction(limit, pos.value(), true), _rResult(result), _default()
-        {
-            if (static_cast<Poco::UInt32>(result.size()) != limit)
-                result.resize(limit);
-        }
-
-        BulkExtraction(C & result, const CValType & def, Poco::UInt32 limit, const Position & pos = Position(0))
-            : AbstractExtraction(limit, pos.value(), true), _rResult(result), _default(def)
-        {
-            if (static_cast<Poco::UInt32>(result.size()) != limit)
-                result.resize(limit);
-        }
-
-        virtual ~BulkExtraction() { }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<C>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _rResult.size(); }
-
-        std::size_t numOfRowsAllowed() const { return getLimit(); }
-
-        bool isNull(std::size_t row) const
-        {
-            try
-            {
-                return _nulls.at(row);
-            }
-            catch (std::out_of_range & ex)
-            {
-                throw RangeException(ex.what());
-            }
-        }
-
-        std::size_t extract(std::size_t col)
-        {
-            AbstractExtractor::Ptr pExt = getExtractor();
-            TypeHandler<C>::extract(col, _rResult, _default, pExt);
-            typename C::iterator it = _rResult.begin();
-            typename C::iterator end = _rResult.end();
-            for (int row = 0; it != end; ++it, ++row)
-            {
-                _nulls.push_back(isValueNull(*it, pExt->isNull(col, row)));
-            }
-
-            return _rResult.size();
-        }
-
-        virtual void reset() { }
-
-        AbstractPreparation::Ptr createPreparation(AbstractPreparator::Ptr & pPrep, std::size_t col)
-        {
-            Poco::UInt32 limit = getLimit();
-            if (limit != _rResult.size())
-                _rResult.resize(limit);
-            pPrep->setLength(limit);
-            pPrep->setBulk(true);
-            return new Preparation<C>(pPrep, col, _rResult);
-        }
-
-    protected:
-        const C & result() const { return _rResult; }
-
-    private:
-        C & _rResult;
-        CValType _default;
-        std::deque<bool> _nulls;
-    };
-
-
-    template <class C>
-    class InternalBulkExtraction : public BulkExtraction<C>
-    /// Container Data Type specialization extension for extraction of values from a query result set.
-    ///
-    /// This class is intended for PocoData internal use - it is used by StatementImpl
-    /// to automatically create internal BulkExtraction in cases when statement returns data and no external storage
-    /// was supplied. It is later used by RecordSet to retrieve the fetched data after statement execution.
-    /// It takes ownership of the Column pointer supplied as constructor argument. Column object, in turn
-    /// owns the data container pointer.
-    ///
-    /// InternalBulkExtraction objects can not be copied or assigned.
-    {
-    public:
-        typedef C ValType;
-        typedef typename C::value_type CValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef InternalBulkExtraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        InternalBulkExtraction(C & result, Column<C> * pColumn, Poco::UInt32 limit, const Position & pos = Position(0))
-            : BulkExtraction<C>(result, CValType(), limit, pos), _pColumn(pColumn)
-        /// Creates InternalBulkExtraction.
-        {
-        }
-
-        ~InternalBulkExtraction()
-        /// Destroys InternalBulkExtraction.
-        {
-            delete _pColumn;
-        }
-
-        void reset() { _pColumn->reset(); }
-
-        const CValType & value(int index) const
-        {
-            try
-            {
-                return BulkExtraction<C>::result().at(index);
-            }
-            catch (std::out_of_range & ex)
-            {
-                throw RangeException(ex.what());
-            }
-        }
-
-        bool isNull(std::size_t row) const { return BulkExtraction<C>::isNull(row); }
-
-        const Column<C> & column() const { return *_pColumn; }
-
-    private:
-        InternalBulkExtraction();
-        InternalBulkExtraction(const InternalBulkExtraction &);
-        InternalBulkExtraction & operator=(const InternalBulkExtraction &);
-
-        Column<C> * _pColumn;
-    };
-
-
-    namespace Keywords
-    {
-
-
-        template <typename T>
-        AbstractExtraction::Ptr into(std::vector<T> & t, const Bulk & bulk, const Position & pos = Position(0))
-        /// Convenience function to allow for a more compact creation of an extraction object
-        /// with std::vector bulk extraction support.
-        {
-            return new BulkExtraction<std::vector<T>>(t, bulk.size(), pos);
-        }
-
-
-        template <typename T>
-        AbstractExtraction::Ptr into(std::vector<T> & t, BulkFnType, const Position & pos = Position(0))
-        /// Convenience function to allow for a more compact creation of an extraction object
-        /// with std::vector bulk extraction support.
-        {
-            Poco::UInt32 size = static_cast<Poco::UInt32>(t.size());
-            if (0 == size)
-                throw InvalidArgumentException("Zero length not allowed.");
-            return new BulkExtraction<std::vector<T>>(t, size, pos);
-        }
-
-
-        template <typename T>
-        AbstractExtraction::Ptr into(std::deque<T> & t, const Bulk & bulk, const Position & pos = Position(0))
-        /// Convenience function to allow for a more compact creation of an extraction object
-        /// with std::deque bulk extraction support.
-        {
-            return new BulkExtraction<std::deque<T>>(t, bulk.size(), pos);
-        }
-
-
-        template <typename T>
-        AbstractExtraction::Ptr into(std::deque<T> & t, BulkFnType, const Position & pos = Position(0))
-        /// Convenience function to allow for a more compact creation of an extraction object
-        /// with std::deque bulk extraction support.
-        {
-            Poco::UInt32 size = static_cast<Poco::UInt32>(t.size());
-            if (0 == size)
-                throw InvalidArgumentException("Zero length not allowed.");
-            return new BulkExtraction<std::deque<T>>(t, size, pos);
-        }
-
-
-        template <typename T>
-        AbstractExtraction::Ptr into(std::list<T> & t, const Bulk & bulk, const Position & pos = Position(0))
-        /// Convenience function to allow for a more compact creation of an extraction object
-        /// with std::list bulk extraction support.
-        {
-            return new BulkExtraction<std::list<T>>(t, bulk.size(), pos);
-        }
-
-
-        template <typename T>
-        AbstractExtraction::Ptr into(std::list<T> & t, BulkFnType, const Position & pos = Position(0))
-        /// Convenience function to allow for a more compact creation of an extraction object
-        /// with std::list bulk extraction support.
-        {
-            Poco::UInt32 size = static_cast<Poco::UInt32>(t.size());
-            if (0 == size)
-                throw InvalidArgumentException("Zero length not allowed.");
-            return new BulkExtraction<std::list<T>>(t, size, pos);
-        }
-
-
-    } // namespace Keywords
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_BulkExtraction_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Column.h b/contrib/poco/Data/include/Poco/Data/Column.h
deleted file mode 100644
index 7731e7017..000000000
--- a/contrib/poco/Data/include/Poco/Data/Column.h
+++ /dev/null
@@ -1,482 +0,0 @@
-//
-// Column.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Column
-//
-// Definition of the Column class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Column_INCLUDED
-#define Data_Column_INCLUDED
-
-
-#include <deque>
-#include <list>
-#include <vector>
-#include "Poco/Data/Data.h"
-#include "Poco/Data/MetaColumn.h"
-#include "Poco/RefCountedObject.h"
-#include "Poco/SharedPtr.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    template <class C>
-    class Column
-    /// Column class is column data container.
-    /// Data (a pointer to underlying STL container) is assigned to the class
-    /// at construction time. Construction with null pointer is not allowed.
-    /// This class owns the data assigned to it and deletes the storage on destruction.
-    {
-    public:
-        typedef C Container;
-        typedef Poco::SharedPtr<C> ContainerPtr;
-        typedef typename C::const_iterator Iterator;
-        typedef typename C::const_reverse_iterator RIterator;
-        typedef typename C::size_type Size;
-        typedef typename C::value_type Type;
-
-        Column(const MetaColumn & metaColumn, Container * pData) : _metaColumn(metaColumn), _pData(pData)
-        /// Creates the Column.
-        {
-            if (!_pData)
-                throw NullPointerException("Container pointer must point to valid storage.");
-        }
-
-        Column(const Column & col) : _metaColumn(col._metaColumn), _pData(col._pData)
-        /// Creates the Column.
-        {
-        }
-
-        ~Column()
-        /// Destroys the Column.
-        {
-        }
-
-        Column & operator=(const Column & col)
-        /// Assignment operator.
-        {
-            Column tmp(col);
-            swap(tmp);
-            return *this;
-        }
-
-        void swap(Column & other)
-        /// Swaps the column with another one.
-        {
-            using std::swap;
-            swap(_metaColumn, other._metaColumn);
-            swap(_pData, other._pData);
-        }
-
-        Container & data()
-        /// Returns reference to contained data.
-        {
-            return *_pData;
-        }
-
-        const Type & value(std::size_t row) const
-        /// Returns the field value in specified row.
-        {
-            try
-            {
-                return _pData->at(row);
-            }
-            catch (std::out_of_range & ex)
-            {
-                throw RangeException(ex.what());
-            }
-        }
-
-        const Type & operator[](std::size_t row) const
-        /// Returns the field value in specified row.
-        {
-            return value(row);
-        }
-
-        Size rowCount() const
-        /// Returns number of rows.
-        {
-            return _pData->size();
-        }
-
-        void reset()
-        /// Clears and shrinks the storage.
-        {
-            Container().swap(*_pData);
-        }
-
-        const std::string & name() const
-        /// Returns column name.
-        {
-            return _metaColumn.name();
-        }
-
-        std::size_t length() const
-        /// Returns column maximum length.
-        {
-            return _metaColumn.length();
-        }
-
-        std::size_t precision() const
-        /// Returns column precision.
-        /// Valid for floating point fields only (zero for other data types).
-        {
-            return _metaColumn.precision();
-        }
-
-        std::size_t position() const
-        /// Returns column position.
-        {
-            return _metaColumn.position();
-        }
-
-        MetaColumn::ColumnDataType type() const
-        /// Returns column type.
-        {
-            return _metaColumn.type();
-        }
-
-        Iterator begin() const
-        /// Returns iterator pointing to the beginning of data storage vector.
-        {
-            return _pData->begin();
-        }
-
-        Iterator end() const
-        /// Returns iterator pointing to the end of data storage vector.
-        {
-            return _pData->end();
-        }
-
-    private:
-        Column();
-
-        MetaColumn _metaColumn;
-        ContainerPtr _pData;
-    };
-
-
-    template <>
-    class Column<std::vector<bool>>
-    /// The std::vector<bool> specialization for the Column class.
-    ///
-    /// This specialization is necessary due to the nature of std::vector<bool>.
-    /// For details, see the standard library implementation of vector<bool>
-    /// or
-    /// S. Meyers: "Effective STL" (Copyright Addison-Wesley 2001),
-    /// Item 18: "Avoid using vector<bool>."
-    ///
-    /// The workaround employed here is using deque<bool> as an
-    /// internal "companion" container kept in sync with the vector<bool>
-    /// column data.
-    {
-    public:
-        typedef std::vector<bool> Container;
-        typedef Poco::SharedPtr<Container> ContainerPtr;
-        typedef Container::const_iterator Iterator;
-        typedef Container::const_reverse_iterator RIterator;
-        typedef Container::size_type Size;
-
-        Column(const MetaColumn & metaColumn, Container * pData) : _metaColumn(metaColumn), _pData(pData)
-        /// Creates the Column.
-        {
-            poco_check_ptr(_pData);
-            _deque.assign(_pData->begin(), _pData->end());
-        }
-
-        Column(const Column & col) : _metaColumn(col._metaColumn), _pData(col._pData)
-        /// Creates the Column.
-        {
-            _deque.assign(_pData->begin(), _pData->end());
-        }
-
-        ~Column()
-        /// Destroys the Column.
-        {
-        }
-
-        Column & operator=(const Column & col)
-        /// Assignment operator.
-        {
-            Column tmp(col);
-            swap(tmp);
-            return *this;
-        }
-
-        void swap(Column & other)
-        /// Swaps the column with another one.
-        {
-            using std::swap;
-            swap(_metaColumn, other._metaColumn);
-            swap(_pData, other._pData);
-            swap(_deque, other._deque);
-        }
-
-        Container & data()
-        /// Returns reference to contained data.
-        {
-            return *_pData;
-        }
-
-        const bool & value(std::size_t row) const
-        /// Returns the field value in specified row.
-        {
-            if (_deque.size() < _pData->size())
-                _deque.resize(_pData->size());
-
-            try
-            {
-                return _deque.at(row) = _pData->at(row);
-            }
-            catch (std::out_of_range & ex)
-            {
-                throw RangeException(ex.what());
-            }
-        }
-
-        const bool & operator[](std::size_t row) const
-        /// Returns the field value in specified row.
-        {
-            return value(row);
-        }
-
-        Size rowCount() const
-        /// Returns number of rows.
-        {
-            return _pData->size();
-        }
-
-        void reset()
-        /// Clears and shrinks the storage.
-        {
-            Container().swap(*_pData);
-            _deque.clear();
-        }
-
-        const std::string & name() const
-        /// Returns column name.
-        {
-            return _metaColumn.name();
-        }
-
-        std::size_t length() const
-        /// Returns column maximum length.
-        {
-            return _metaColumn.length();
-        }
-
-        std::size_t precision() const
-        /// Returns column precision.
-        /// Valid for floating point fields only (zero for other data types).
-        {
-            return _metaColumn.precision();
-        }
-
-        std::size_t position() const
-        /// Returns column position.
-        {
-            return _metaColumn.position();
-        }
-
-        MetaColumn::ColumnDataType type() const
-        /// Returns column type.
-        {
-            return _metaColumn.type();
-        }
-
-        Iterator begin() const
-        /// Returns iterator pointing to the beginning of data storage vector.
-        {
-            return _pData->begin();
-        }
-
-        Iterator end() const
-        /// Returns iterator pointing to the end of data storage vector.
-        {
-            return _pData->end();
-        }
-
-    private:
-        Column();
-
-        MetaColumn _metaColumn;
-        ContainerPtr _pData;
-        mutable std::deque<bool> _deque;
-    };
-
-
-    template <class T>
-    class Column<std::list<T>>
-    /// Column specialization for std::list
-    {
-    public:
-        typedef std::list<T> Container;
-        typedef Poco::SharedPtr<Container> ContainerPtr;
-        typedef typename Container::const_iterator Iterator;
-        typedef typename Container::const_reverse_iterator RIterator;
-        typedef typename Container::size_type Size;
-
-        Column(const MetaColumn & metaColumn, std::list<T> * pData) : _metaColumn(metaColumn), _pData(pData)
-        /// Creates the Column.
-        {
-            poco_check_ptr(_pData);
-        }
-
-        Column(const Column & col) : _metaColumn(col._metaColumn), _pData(col._pData)
-        /// Creates the Column.
-        {
-        }
-
-        ~Column()
-        /// Destroys the Column.
-        {
-        }
-
-        Column & operator=(const Column & col)
-        /// Assignment operator.
-        {
-            Column tmp(col);
-            swap(tmp);
-            return *this;
-        }
-
-        void swap(Column & other)
-        /// Swaps the column with another one.
-        {
-            using std::swap;
-            swap(_metaColumn, other._metaColumn);
-            swap(_pData, other._pData);
-        }
-
-        Container & data()
-        /// Returns reference to contained data.
-        {
-            return *_pData;
-        }
-
-        const T & value(std::size_t row) const
-        /// Returns the field value in specified row.
-        /// This is the std::list specialization and std::list
-        /// is not the optimal solution for cases where random
-        /// access is needed.
-        /// However, to allow for compatibility with other
-        /// containers, this functionality is provided here.
-        /// To alleviate the problem, an effort is made
-        /// to start iteration from beginning or end,
-        /// depending on the position requested.
-        {
-            if (row <= (std::size_t)(_pData->size() / 2))
-            {
-                Iterator it = _pData->begin();
-                Iterator end = _pData->end();
-                for (int i = 0; it != end; ++it, ++i)
-                    if (i == row)
-                        return *it;
-            }
-            else
-            {
-                row = _pData->size() - row;
-                RIterator it = _pData->rbegin();
-                RIterator end = _pData->rend();
-                for (int i = 1; it != end; ++it, ++i)
-                    if (i == row)
-                        return *it;
-            }
-
-            throw RangeException("Invalid row number.");
-        }
-
-        const T & operator[](std::size_t row) const
-        /// Returns the field value in specified row.
-        {
-            return value(row);
-        }
-
-        Size rowCount() const
-        /// Returns number of rows.
-        {
-            return _pData->size();
-        }
-
-        void reset()
-        /// Clears the storage.
-        {
-            _pData->clear();
-        }
-
-        const std::string & name() const
-        /// Returns column name.
-        {
-            return _metaColumn.name();
-        }
-
-        std::size_t length() const
-        /// Returns column maximum length.
-        {
-            return _metaColumn.length();
-        }
-
-        std::size_t precision() const
-        /// Returns column precision.
-        /// Valid for floating point fields only (zero for other data types).
-        {
-            return _metaColumn.precision();
-        }
-
-        std::size_t position() const
-        /// Returns column position.
-        {
-            return _metaColumn.position();
-        }
-
-        MetaColumn::ColumnDataType type() const
-        /// Returns column type.
-        {
-            return _metaColumn.type();
-        }
-
-        Iterator begin() const
-        /// Returns iterator pointing to the beginning of data storage vector.
-        {
-            return _pData->begin();
-        }
-
-        Iterator end() const
-        /// Returns iterator pointing to the end of data storage vector.
-        {
-            return _pData->end();
-        }
-
-    private:
-        Column();
-
-        MetaColumn _metaColumn;
-        ContainerPtr _pData;
-    };
-
-
-    template <typename C>
-    inline void swap(Column<C> & c1, Column<C> & c2)
-    {
-        c1.swap(c2);
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Column_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Connector.h b/contrib/poco/Data/include/Poco/Data/Connector.h
deleted file mode 100644
index d91ebf640..000000000
--- a/contrib/poco/Data/include/Poco/Data/Connector.h
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Connector.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Connector
-//
-// Definition of the Connector class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Connector_INCLUDED
-#define Data_Connector_INCLUDED
-
-
-#include "Poco/AutoPtr.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/SessionImpl.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API Connector
-    /// A Connector creates SessionImpl objects.
-    ///
-    /// Every connector library (like the SQLite or the ODBC connector)
-    /// provides a subclass of this class, an instance of which is
-    /// registered with the SessionFactory.
-    {
-    public:
-        Connector();
-        /// Creates the Connector.
-
-        virtual ~Connector();
-        /// Destroys the Connector.
-
-        virtual const std::string & name() const = 0;
-        /// Returns the name associated with this connector.
-
-        virtual Poco::AutoPtr<SessionImpl>
-        createSession(const std::string & connectionString, std::size_t timeout = SessionImpl::LOGIN_TIMEOUT_DEFAULT) = 0;
-        /// Create a SessionImpl object and initialize it with the given connectionString.
-    };
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Connector_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Constants.h b/contrib/poco/Data/include/Poco/Data/Constants.h
deleted file mode 100644
index 0835652be..000000000
--- a/contrib/poco/Data/include/Poco/Data/Constants.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Data.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Constants
-//
-// Constant definitions for the Poco Data library.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Constants_INCLUDED
-#define Data_Constants_INCLUDED
-
-
-#undef max
-#include <cstddef>
-#include <limits>
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    static const std::size_t POCO_DATA_INVALID_ROW = std::numeric_limits<std::size_t>::max();
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Constants_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Data.h b/contrib/poco/Data/include/Poco/Data/Data.h
deleted file mode 100644
index 3eec5de32..000000000
--- a/contrib/poco/Data/include/Poco/Data/Data.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Data.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Data
-//
-// Basic definitions for the Poco Data library.
-// This file must be the first file included by every other Data
-// header file.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Data_INCLUDED
-#define Data_Data_INCLUDED
-
-
-#include "Poco/Foundation.h"
-
-
-//
-// The following block is the standard way of creating macros which make exporting
-// from a DLL simpler. All files within this DLL are compiled with the Data_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see
-// Data_API functions as being imported from a DLL, whereas this DLL sees symbols
-// defined with this macro as being exported.
-//
-
-
-#if !defined(Data_API)
-#    if !defined(POCO_NO_GCC_API_ATTRIBUTE) && defined(__GNUC__) && (__GNUC__ >= 4)
-#        define Data_API __attribute__((visibility("default")))
-#    else
-#        define Data_API
-#    endif
-#endif
-
-
-//
-// Automatically link Data library.
-//
-
-
-#endif // Data_Data_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/DataException.h b/contrib/poco/Data/include/Poco/Data/DataException.h
deleted file mode 100644
index 1ba93af4b..000000000
--- a/contrib/poco/Data/include/Poco/Data/DataException.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// DataException.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  DataException
-//
-// Definition of the DataException class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_DataException_INCLUDED
-#define Data_DataException_INCLUDED
-
-
-#include "Poco/Data/Data.h"
-#include "Poco/Exception.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    POCO_DECLARE_EXCEPTION(Data_API, DataException, Poco::IOException)
-    POCO_DECLARE_EXCEPTION(Data_API, RowDataMissingException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, UnknownDataBaseException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, UnknownTypeException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, ExecutionException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, BindingException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, ExtractException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, LimitException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, NotSupportedException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, SessionUnavailableException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, SessionPoolExhaustedException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, SessionPoolExistsException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, NoDataException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, LengthExceededException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, ConnectionFailedException, DataException)
-    POCO_DECLARE_EXCEPTION(Data_API, NotConnectedException, DataException)
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_DataException_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Date.h b/contrib/poco/Data/include/Poco/Data/Date.h
deleted file mode 100644
index c76eba41f..000000000
--- a/contrib/poco/Data/include/Poco/Data/Date.h
+++ /dev/null
@@ -1,211 +0,0 @@
-//
-// Date.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Date
-//
-// Definition of the Date class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Date_INCLUDED
-#define Data_Date_INCLUDED
-
-
-#include "Poco/Data/Data.h"
-#include "Poco/Dynamic/VarHolder.h"
-#include "Poco/Exception.h"
-
-
-namespace Poco
-{
-
-class DateTime;
-
-namespace Dynamic
-{
-
-    class Var;
-
-}
-
-namespace Data
-{
-
-
-    class Time;
-
-
-    class Data_API Date
-    /// Date class wraps a DateTime and exposes date related interface.
-    /// The purpose of this class is binding/extraction support for date fields.
-    {
-    public:
-        Date();
-        /// Creates the Date
-
-        Date(int year, int month, int day);
-        /// Creates the Date
-
-        Date(const DateTime & dt);
-        /// Creates the Date from DateTime
-
-        ~Date();
-        /// Destroys the Date.
-
-        int year() const;
-        /// Returns the year.
-
-        int month() const;
-        /// Returns the month.
-
-        int day() const;
-        /// Returns the day.
-
-        void assign(int year, int month, int day);
-        /// Assigns date.
-
-        Date & operator=(const Date & d);
-        /// Assignment operator for Date.
-
-        Date & operator=(const DateTime & dt);
-        /// Assignment operator for DateTime.
-
-        Date & operator=(const Poco::Dynamic::Var & var);
-        /// Assignment operator for Var.
-
-        bool operator==(const Date & date) const;
-        /// Equality operator.
-
-        bool operator!=(const Date & date) const;
-        /// Inequality operator.
-
-        bool operator<(const Date & date) const;
-        /// Less then operator.
-
-        bool operator>(const Date & date) const;
-        /// Greater then operator.
-
-    private:
-        int _year;
-        int _month;
-        int _day;
-    };
-
-
-    //
-    // inlines
-    //
-    inline int Date::year() const
-    {
-        return _year;
-    }
-
-
-    inline int Date::month() const
-    {
-        return _month;
-    }
-
-
-    inline int Date::day() const
-    {
-        return _day;
-    }
-
-
-    inline Date & Date::operator=(const Date & d)
-    {
-        assign(d.year(), d.month(), d.day());
-        return *this;
-    }
-
-
-    inline Date & Date::operator=(const DateTime & dt)
-    {
-        assign(dt.year(), dt.month(), dt.day());
-        return *this;
-    }
-
-
-    inline bool Date::operator==(const Date & date) const
-    {
-        return _year == date.year() && _month == date.month() && _day == date.day();
-    }
-
-
-    inline bool Date::operator!=(const Date & date) const
-    {
-        return !(*this == date);
-    }
-
-
-    inline bool Date::operator>(const Date & date) const
-    {
-        return !(*this == date) && !(*this < date);
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-//
-// VarHolderImpl<Date>
-//
-
-
-namespace Poco
-{
-namespace Dynamic
-{
-
-
-    template <>
-    class VarHolderImpl<Poco::Data::Date> : public VarHolder
-    {
-    public:
-        VarHolderImpl(const Poco::Data::Date & val) : _val(val) { }
-
-        ~VarHolderImpl() { }
-
-        const std::type_info & type() const { return typeid(Poco::Data::Date); }
-
-        void convert(Poco::Timestamp & val) const
-        {
-            DateTime dt;
-            dt.assign(_val.year(), _val.month(), _val.day());
-            val = dt.timestamp();
-        }
-
-        void convert(Poco::DateTime & val) const { val.assign(_val.year(), _val.month(), _val.day()); }
-
-        void convert(Poco::LocalDateTime & val) const { val.assign(_val.year(), _val.month(), _val.day()); }
-
-        void convert(std::string & val) const
-        {
-            DateTime dt(_val.year(), _val.month(), _val.day());
-            val = DateTimeFormatter::format(dt, "%Y/%m/%d");
-        }
-
-        VarHolder * clone(Placeholder<VarHolder> * pVarHolder = 0) const { return cloneHolder(pVarHolder, _val); }
-
-        const Poco::Data::Date & value() const { return _val; }
-
-    private:
-        VarHolderImpl();
-        Poco::Data::Date _val;
-    };
-
-
-}
-} // namespace Poco::Dynamic
-
-
-#endif // Data_Date_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/DynamicDateTime.h b/contrib/poco/Data/include/Poco/Data/DynamicDateTime.h
deleted file mode 100644
index 8fd0fe0fb..000000000
--- a/contrib/poco/Data/include/Poco/Data/DynamicDateTime.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// DynamicDateTime.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  DynamicDateTime
-//
-// Definition of the Date and Time cast operators for Poco::Dynamic::Var.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_DynamicDateTime_INCLUDED
-#define Data_DynamicDateTime_INCLUDED
-
-
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Date.h"
-#include "Poco/Data/Time.h"
-#include "Poco/Dynamic/Var.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-    class Date;
-    class Time;
-
-}
-} // namespace Poco::Data
-
-
-namespace Poco
-{
-namespace Dynamic
-{
-
-
-    template <>
-    Data_API Var::operator Poco::Data::Date() const;
-    template <>
-    Data_API Var::operator Poco::Data::Time() const;
-
-
-}
-} // namespace Poco::Dynamic
-
-
-#endif // Data_DynamicDateTime_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Extraction.h b/contrib/poco/Data/include/Poco/Data/Extraction.h
deleted file mode 100644
index 9f309ab77..000000000
--- a/contrib/poco/Data/include/Poco/Data/Extraction.h
+++ /dev/null
@@ -1,692 +0,0 @@
-//
-// Extraction.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Extraction
-//
-// Definition of the Extraction class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Extraction_INCLUDED
-#define Data_Extraction_INCLUDED
-
-
-#include <cstddef>
-#include <deque>
-#include <list>
-#include <map>
-#include <set>
-#include <vector>
-#include "Poco/Data/AbstractExtraction.h"
-#include "Poco/Data/Column.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/DataException.h"
-#include "Poco/Data/Position.h"
-#include "Poco/Data/Preparation.h"
-#include "Poco/Data/TypeHandler.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    template <class T>
-    class Extraction : public AbstractExtraction
-    /// Concrete Data Type specific extraction of values from a query result set.
-    {
-    public:
-        typedef T ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Extraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        Extraction(T & result, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default(), _extracted(false), _null(false)
-        /// Creates an Extraction object at specified position.
-        /// Uses an empty object T as default value.
-        {
-        }
-
-        Extraction(T & result, const T & def, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default(def), _extracted(false), _null(false)
-        /// Creates an Extraction object at specified position.
-        /// Uses the provided def object as default value.
-        {
-        }
-
-        ~Extraction()
-        /// Destroys the Extraction object.
-        {
-        }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _extracted ? 1u : 0; }
-
-        std::size_t numOfRowsAllowed() const { return 1u; }
-
-        bool isNull(std::size_t row = 0) const { return _null; }
-
-        std::size_t extract(std::size_t pos)
-        {
-            if (_extracted)
-                throw ExtractException("value already extracted");
-            _extracted = true;
-            AbstractExtractor::Ptr pExt = getExtractor();
-            TypeHandler<T>::extract(pos, _rResult, _default, pExt);
-            _null = isValueNull<T>(_rResult, pExt->isNull(pos));
-
-            return 1u;
-        }
-
-        void reset() { _extracted = false; }
-
-        bool canExtract() const { return !_extracted; }
-
-        AbstractPreparation::Ptr createPreparation(AbstractPreparator::Ptr & pPrep, std::size_t pos)
-        {
-            return new Preparation<T>(pPrep, pos, _rResult);
-        }
-
-    private:
-        T & _rResult;
-        T _default;
-        bool _extracted;
-        bool _null;
-    };
-
-
-    template <class T>
-    class Extraction<std::vector<T>> : public AbstractExtraction
-    /// Vector Data Type specialization for extraction of values from a query result set.
-    {
-    public:
-        typedef std::vector<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Extraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        Extraction(std::vector<T> & result, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default()
-        {
-            _rResult.clear();
-        }
-
-        Extraction(std::vector<T> & result, const T & def, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default(def)
-        {
-            _rResult.clear();
-        }
-
-        virtual ~Extraction() { }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_rResult.size()); }
-
-        std::size_t numOfRowsAllowed() const { return getLimit(); }
-
-        bool isNull(std::size_t row) const
-        {
-            try
-            {
-                return _nulls.at(row);
-            }
-            catch (std::out_of_range & ex)
-            {
-                throw RangeException(ex.what());
-            }
-        }
-
-        std::size_t extract(std::size_t pos)
-        {
-            AbstractExtractor::Ptr pExt = getExtractor();
-            _rResult.push_back(_default);
-            TypeHandler<T>::extract(pos, _rResult.back(), _default, pExt);
-            _nulls.push_back(isValueNull(_rResult.back(), pExt->isNull(pos)));
-            return 1u;
-        }
-
-        AbstractPreparation::Ptr createPreparation(AbstractPreparator::Ptr & pPrep, std::size_t pos)
-        {
-            return new Preparation<T>(pPrep, pos, _default);
-        }
-
-        void reset() { _nulls.clear(); }
-
-    protected:
-        const std::vector<T> & result() const { return _rResult; }
-
-    private:
-        std::vector<T> & _rResult;
-        T _default;
-        std::deque<bool> _nulls;
-    };
-
-
-    template <>
-    class Extraction<std::vector<bool>> : public AbstractExtraction
-    /// Vector bool specialization for extraction of values from a query result set.
-    {
-    public:
-        typedef std::vector<bool> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Extraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        Extraction(std::vector<bool> & result, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default()
-        {
-            _rResult.clear();
-        }
-
-        Extraction(std::vector<bool> & result, const bool & def, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default(def)
-        {
-            _rResult.clear();
-        }
-
-        virtual ~Extraction() { }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<bool>::size(); }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_rResult.size()); }
-
-        std::size_t numOfRowsAllowed() const { return getLimit(); }
-
-        bool isNull(std::size_t row) const
-        {
-            try
-            {
-                return _nulls.at(row);
-            }
-            catch (std::out_of_range & ex)
-            {
-                throw RangeException(ex.what());
-            }
-        }
-
-        std::size_t extract(std::size_t pos)
-        {
-            AbstractExtractor::Ptr pExt = getExtractor();
-
-            bool tmp = _default;
-            TypeHandler<bool>::extract(pos, tmp, _default, pExt);
-            _rResult.push_back(tmp);
-            _nulls.push_back(pExt->isNull(pos));
-            return 1u;
-        }
-
-        AbstractPreparation::Ptr createPreparation(AbstractPreparator::Ptr & pPrep, std::size_t pos)
-        {
-            return new Preparation<bool>(pPrep, pos, _default);
-        }
-
-        void reset() { _nulls.clear(); }
-
-    protected:
-        const std::vector<bool> & result() const { return _rResult; }
-
-    private:
-        std::vector<bool> & _rResult;
-        bool _default;
-        std::deque<bool> _nulls;
-    };
-
-
-    template <class T>
-    class Extraction<std::list<T>> : public AbstractExtraction
-    /// List Data Type specialization for extraction of values from a query result set.
-    {
-    public:
-        typedef std::list<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Extraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        Extraction(std::list<T> & result, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default()
-        {
-            _rResult.clear();
-        }
-
-        Extraction(std::list<T> & result, const T & def, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default(def)
-        {
-            _rResult.clear();
-        }
-
-        virtual ~Extraction() { }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _rResult.size(); }
-
-        std::size_t numOfRowsAllowed() const { return getLimit(); }
-
-        bool isNull(std::size_t row) const
-        {
-            try
-            {
-                return _nulls.at(row);
-            }
-            catch (std::out_of_range & ex)
-            {
-                throw RangeException(ex.what());
-            }
-        }
-
-        std::size_t extract(std::size_t pos)
-        {
-            AbstractExtractor::Ptr pExt = getExtractor();
-            _rResult.push_back(_default);
-            TypeHandler<T>::extract(pos, _rResult.back(), _default, pExt);
-            _nulls.push_back(isValueNull(_rResult.back(), pExt->isNull(pos)));
-            return 1u;
-        }
-
-        AbstractPreparation::Ptr createPreparation(AbstractPreparator::Ptr & pPrep, std::size_t pos)
-        {
-            return new Preparation<T>(pPrep, pos, _default);
-        }
-
-        void reset() { _nulls.clear(); }
-
-    protected:
-        const std::list<T> & result() const { return _rResult; }
-
-    private:
-        std::list<T> & _rResult;
-        T _default;
-        std::deque<bool> _nulls;
-    };
-
-
-    template <class T>
-    class Extraction<std::deque<T>> : public AbstractExtraction
-    /// Deque Data Type specialization for extraction of values from a query result set.
-    {
-    public:
-        typedef std::deque<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Extraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        Extraction(std::deque<T> & result, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default()
-        {
-            _rResult.clear();
-        }
-
-        Extraction(std::deque<T> & result, const T & def, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default(def)
-        {
-            _rResult.clear();
-        }
-
-        virtual ~Extraction() { }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return _rResult.size(); }
-
-        std::size_t numOfRowsAllowed() const { return getLimit(); }
-
-        bool isNull(std::size_t row) const
-        {
-            try
-            {
-                return _nulls.at(row);
-            }
-            catch (std::out_of_range & ex)
-            {
-                throw RangeException(ex.what());
-            }
-        }
-
-        std::size_t extract(std::size_t pos)
-        {
-            AbstractExtractor::Ptr pExt = getExtractor();
-            _rResult.push_back(_default);
-            TypeHandler<T>::extract(pos, _rResult.back(), _default, pExt);
-            _nulls.push_back(isValueNull(_rResult.back(), pExt->isNull(pos)));
-            return 1u;
-        }
-
-        AbstractPreparation::Ptr createPreparation(AbstractPreparator::Ptr & pPrep, std::size_t pos)
-        {
-            return new Preparation<T>(pPrep, pos, _default);
-        }
-
-        void reset() { _nulls.clear(); }
-
-    protected:
-        const std::deque<T> & result() const { return _rResult; }
-
-    private:
-        std::deque<T> & _rResult;
-        T _default;
-        std::deque<bool> _nulls;
-    };
-
-
-    template <class C>
-    class InternalExtraction : public Extraction<C>
-    /// Container Data Type specialization extension for extraction of values from a query result set.
-    ///
-    /// This class is intended for PocoData internal use - it is used by StatementImpl
-    /// to automatically create internal Extraction in cases when statement returns data and no external storage
-    /// was supplied. It is later used by RecordSet to retrieve the fetched data after statement execution.
-    /// It takes ownership of the Column pointer supplied as constructor argument. Column object, in turn
-    /// owns the data container pointer.
-    ///
-    /// InternalExtraction objects can not be copied or assigned.
-    {
-    public:
-        typedef typename C::value_type ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Extraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-
-        InternalExtraction(C & result, Column<C> * pColumn, const Position & pos = Position(0))
-            : Extraction<C>(result, ValType(), pos), _pColumn(pColumn)
-        /// Creates InternalExtraction.
-        {
-        }
-
-        ~InternalExtraction()
-        /// Destroys InternalExtraction.
-        {
-            delete _pColumn;
-        }
-
-        void reset()
-        {
-            Extraction<C>::reset();
-            _pColumn->reset();
-        }
-
-        const ValType & value(int index) const
-        {
-            try
-            {
-                return Extraction<C>::result().at(index);
-            }
-            catch (std::out_of_range & ex)
-            {
-                throw RangeException(ex.what());
-            }
-        }
-
-        bool isNull(std::size_t row) const { return Extraction<C>::isNull(row); }
-
-        const Column<C> & column() const { return *_pColumn; }
-
-    private:
-        InternalExtraction();
-        InternalExtraction(const InternalExtraction &);
-        InternalExtraction & operator=(const InternalExtraction &);
-
-        Column<C> * _pColumn;
-    };
-
-
-    template <class T>
-    class Extraction<std::set<T>> : public AbstractExtraction
-    /// Set Data Type specialization for extraction of values from a query result set.
-    {
-    public:
-        typedef std::set<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Extraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-        typedef typename ValType::iterator Iterator;
-
-        Extraction(std::set<T> & result, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default()
-        {
-            _rResult.clear();
-        }
-
-        Extraction(std::set<T> & result, const T & def, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default(def)
-        {
-            _rResult.clear();
-        }
-
-        ~Extraction() { }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_rResult.size()); }
-
-        std::size_t numOfRowsAllowed() const { return getLimit(); }
-
-        std::size_t extract(std::size_t pos)
-        {
-            T tmp;
-            TypeHandler<T>::extract(pos, tmp, _default, getExtractor());
-            _rResult.insert(tmp);
-            return 1u;
-        }
-
-        AbstractPreparation::Ptr createPreparation(AbstractPreparator::Ptr & pPrep, std::size_t pos)
-        {
-            return new Preparation<T>(pPrep, pos, _default);
-        }
-
-    private:
-        std::set<T> & _rResult;
-        T _default;
-    };
-
-
-    template <class T>
-    class Extraction<std::multiset<T>> : public AbstractExtraction
-    /// Multiset Data Type specialization for extraction of values from a query result set.
-    {
-    public:
-        typedef std::multiset<T> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Extraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        Extraction(std::multiset<T> & result, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default()
-        {
-            _rResult.clear();
-        }
-
-        Extraction(std::multiset<T> & result, const T & def, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default(def)
-        {
-            _rResult.clear();
-        }
-
-        ~Extraction() { }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<T>::size(); }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_rResult.size()); }
-
-        std::size_t numOfRowsAllowed() const { return getLimit(); }
-
-        std::size_t extract(std::size_t pos)
-        {
-            T tmp;
-            TypeHandler<T>::extract(pos, tmp, _default, getExtractor());
-            _rResult.insert(tmp);
-            return 1u;
-        }
-
-        AbstractPreparation::Ptr createPreparation(AbstractPreparator::Ptr & pPrep, std::size_t pos)
-        {
-            return new Preparation<T>(pPrep, pos, _default);
-        }
-
-    private:
-        std::multiset<T> & _rResult;
-        T _default;
-    };
-
-
-    template <class K, class V>
-    class Extraction<std::map<K, V>> : public AbstractExtraction
-    /// Map Data Type specialization for extraction of values from a query result set.
-    {
-    public:
-        typedef std::map<K, V> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Extraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        Extraction(std::map<K, V> & result, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default()
-        {
-            _rResult.clear();
-        }
-
-        Extraction(std::map<K, V> & result, const V & def, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default(def)
-        {
-            _rResult.clear();
-        }
-
-        ~Extraction() { }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<V>::size(); }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_rResult.size()); }
-
-        std::size_t numOfRowsAllowed() const { return getLimit(); }
-
-        std::size_t extract(std::size_t pos)
-        {
-            V tmp;
-            TypeHandler<V>::extract(pos, tmp, _default, getExtractor());
-            _rResult.insert(std::make_pair(tmp(), tmp));
-            return 1u;
-        }
-
-        AbstractPreparation::Ptr createPreparation(AbstractPreparator::Ptr & pPrep, std::size_t pos)
-        {
-            return new Preparation<V>(pPrep, pos, _default);
-        }
-
-    private:
-        std::map<K, V> & _rResult;
-        V _default;
-    };
-
-
-    template <class K, class V>
-    class Extraction<std::multimap<K, V>> : public AbstractExtraction
-    /// Multimap Data Type specialization for extraction of values from a query result set.
-    {
-    public:
-        typedef std::multimap<K, V> ValType;
-        typedef SharedPtr<ValType> ValPtr;
-        typedef Extraction<ValType> Type;
-        typedef SharedPtr<Type> Ptr;
-
-        Extraction(std::multimap<K, V> & result, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default()
-        {
-            _rResult.clear();
-        }
-
-        Extraction(std::multimap<K, V> & result, const V & def, const Position & pos = Position(0))
-            : AbstractExtraction(Limit::LIMIT_UNLIMITED, pos.value()), _rResult(result), _default(def)
-        {
-            _rResult.clear();
-        }
-
-        ~Extraction() { }
-
-        std::size_t numOfColumnsHandled() const { return TypeHandler<V>::size(); }
-
-        std::size_t numOfRowsHandled() const { return static_cast<std::size_t>(_rResult.size()); }
-
-        std::size_t numOfRowsAllowed() const { return getLimit(); }
-
-        std::size_t extract(std::size_t pos)
-        {
-            V tmp;
-            TypeHandler<V>::extract(pos, tmp, _default, getExtractor());
-            _rResult.insert(std::make_pair(tmp(), tmp));
-            return 1u;
-        }
-
-        AbstractPreparation::Ptr createPreparation(AbstractPreparator::Ptr & pPrep, std::size_t pos)
-        {
-            return new Preparation<V>(pPrep, pos, _default);
-        }
-
-    private:
-        std::multimap<K, V> & _rResult;
-        V _default;
-    };
-
-
-    namespace Keywords
-    {
-
-
-        template <typename T>
-        inline AbstractExtraction::Ptr into(T & t)
-        /// Convenience function to allow for a more compact creation of an extraction object.
-        {
-            return new Extraction<T>(t);
-        }
-
-
-        template <typename T>
-        inline AbstractExtraction::Ptr into(T & t, const Position & pos)
-        /// Convenience function to allow for a more compact creation of an extraction object
-        /// with multiple recordset support.
-        {
-            return new Extraction<T>(t, pos);
-        }
-
-
-        template <typename T>
-        inline AbstractExtraction::Ptr into(T & t, const Position & pos, const T & def)
-        /// Convenience function to allow for a more compact creation of an extraction object
-        /// with multiple recordset support and the given default
-        {
-            return new Extraction<T>(t, def, pos);
-        }
-
-
-        inline AbstractExtractionVecVec & into(AbstractExtractionVecVec & evv)
-        /// Convenience dummy function (for syntax purposes only).
-        {
-            return evv;
-        }
-
-
-        inline AbstractExtractionVec & into(AbstractExtractionVec & ev)
-        /// Convenience dummy function (for syntax purposes only).
-        {
-            return ev;
-        }
-
-
-    } // namespace Keywords
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Extraction_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/LOB.h b/contrib/poco/Data/include/Poco/Data/LOB.h
deleted file mode 100644
index 51489dd7f..000000000
--- a/contrib/poco/Data/include/Poco/Data/LOB.h
+++ /dev/null
@@ -1,273 +0,0 @@
-//
-// LOB.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  LOB
-//
-// Definition of the LOB class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_LOB_INCLUDED
-#define Data_LOB_INCLUDED
-
-
-#include <algorithm>
-#include <vector>
-#include "Poco/Data/Data.h"
-#include "Poco/Dynamic/VarHolder.h"
-#include "Poco/Exception.h"
-#include "Poco/SharedPtr.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    template <typename T>
-    class LOB
-    /// Representation of a Large OBject.
-    ///
-    /// A LOB can hold arbitrary data.
-    /// The maximum size depends on the underlying database.
-    ///
-    /// The LOBInputStream and LOBOutputStream classes provide
-    /// a convenient way to access the data in a LOB.
-    {
-    public:
-        typedef typename std::vector<T>::const_iterator Iterator;
-        typedef T ValueType;
-        typedef typename std::vector<T> Container;
-        typedef Poco::SharedPtr<Container> ContentPtr;
-
-        LOB() : _pContent(new std::vector<T>())
-        /// Creates an empty LOB.
-        {
-        }
-
-        LOB(const std::vector<T> & content) : _pContent(new std::vector<T>(content))
-        /// Creates the LOB, content is deep-copied.
-        {
-        }
-
-        LOB(const T * const pContent, std::size_t size) : _pContent(new std::vector<T>(pContent, pContent + size))
-        /// Creates the LOB by deep-copying pContent.
-        {
-        }
-
-        LOB(const std::basic_string<T> & content) : _pContent(new std::vector<T>(content.begin(), content.end()))
-        /// Creates a LOB from a string.
-        {
-        }
-
-        LOB(const LOB & other) : _pContent(other._pContent)
-        /// Creates a LOB by copying another one.
-        {
-        }
-
-        ~LOB()
-        /// Destroys the LOB.
-        {
-        }
-
-        LOB & operator=(const LOB & other)
-        /// Assignment operator.
-        {
-            LOB tmp(other);
-            swap(tmp);
-            return *this;
-        }
-
-        bool operator==(const LOB & other) const
-        /// Compares for equality LOB by value.
-        {
-            return *_pContent == *other._pContent;
-        }
-
-        bool operator!=(const LOB & other) const
-        /// Compares for inequality LOB by value.
-        {
-            return *_pContent != *other._pContent;
-        }
-
-        void swap(LOB & other)
-        /// Swaps the LOB with another one.
-        {
-            using std::swap;
-            swap(_pContent, other._pContent);
-        }
-
-        const std::vector<T> & content() const
-        /// Returns the content.
-        {
-            return *_pContent;
-        }
-
-        const T * rawContent() const
-        /// Returns the raw content.
-        ///
-        /// If the LOB is empty, returns NULL.
-        {
-            if (_pContent->empty())
-                return 0;
-            else
-                return &(*_pContent)[0];
-        }
-
-        void assignVal(std::size_t count, const T & val)
-        /// Assigns raw content to internal storage.
-        {
-            ContentPtr tmp = new Container(count, val);
-            _pContent.swap(tmp);
-        }
-
-        void assignRaw(const T * ptr, std::size_t count)
-        /// Assigns raw content to internal storage.
-        {
-            poco_assert_dbg(ptr);
-            LOB tmp(ptr, count);
-            swap(tmp);
-        }
-
-        void appendRaw(const T * pChar, std::size_t count)
-        /// Assigns raw content to internal storage.
-        {
-            poco_assert_dbg(pChar);
-            _pContent->insert(_pContent->end(), pChar, pChar + count);
-        }
-
-        void clear(bool doCompact = false)
-        /// Clears the content of the blob.
-        /// If doCompact is true, trims the excess capacity.
-        {
-            _pContent->clear();
-            if (doCompact)
-                compact();
-        }
-
-        void compact()
-        /// Trims the internal storage excess capacity.
-        {
-            std::vector<T>(*_pContent).swap(*_pContent);
-        }
-
-        Iterator begin() const { return _pContent->begin(); }
-
-        Iterator end() const { return _pContent->end(); }
-
-        std::size_t size() const
-        /// Returns the size of the LOB in bytes.
-        {
-            return static_cast<std::size_t>(_pContent->size());
-        }
-
-    private:
-        ContentPtr _pContent;
-    };
-
-
-    typedef LOB<unsigned char> BLOB;
-    typedef LOB<char> CLOB;
-
-
-    //
-    // inlines
-    //
-
-    template <typename T>
-    inline void swap(LOB<T> & b1, LOB<T> & b2)
-    {
-        b1.swap(b2);
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-namespace std
-{
-template <>
-inline void swap<Poco::Data::BLOB>(Poco::Data::BLOB & b1, Poco::Data::BLOB & b2)
-/// Full template specalization of std:::swap for BLOB
-{
-    b1.swap(b2);
-}
-
-template <>
-inline void swap<Poco::Data::CLOB>(Poco::Data::CLOB & c1, Poco::Data::CLOB & c2)
-/// Full template specalization of std:::swap for CLOB
-{
-    c1.swap(c2);
-}
-}
-
-
-//
-// VarHolderImpl<LOB>
-//
-
-
-namespace Poco
-{
-namespace Dynamic
-{
-
-
-    template <>
-    class VarHolderImpl<Poco::Data::BLOB> : public VarHolder
-    {
-    public:
-        VarHolderImpl(const Poco::Data::BLOB & val) : _val(val) { }
-
-        ~VarHolderImpl() { }
-
-        const std::type_info & type() const { return typeid(Poco::Data::BLOB); }
-
-        void convert(std::string & val) const { val.assign(_val.begin(), _val.end()); }
-
-        VarHolder * clone(Placeholder<VarHolder> * pVarHolder = 0) const { return cloneHolder(pVarHolder, _val); }
-
-        const Poco::Data::BLOB & value() const { return _val; }
-
-    private:
-        VarHolderImpl();
-        Poco::Data::BLOB _val;
-    };
-
-
-    template <>
-    class VarHolderImpl<Poco::Data::CLOB> : public VarHolder
-    {
-    public:
-        VarHolderImpl(const Poco::Data::CLOB & val) : _val(val) { }
-
-        ~VarHolderImpl() { }
-
-        const std::type_info & type() const { return typeid(Poco::Data::CLOB); }
-
-        void convert(std::string & val) const { val.assign(_val.begin(), _val.end()); }
-
-        VarHolder * clone(Placeholder<VarHolder> * pVarHolder = 0) const { return cloneHolder(pVarHolder, _val); }
-
-        const Poco::Data::CLOB & value() const { return _val; }
-
-    private:
-        VarHolderImpl();
-        Poco::Data::CLOB _val;
-    };
-
-
-}
-} // namespace Poco::Dynamic
-
-
-#endif // Data_LOB_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Limit.h b/contrib/poco/Data/include/Poco/Data/Limit.h
deleted file mode 100644
index 4375d54c7..000000000
--- a/contrib/poco/Data/include/Poco/Data/Limit.h
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Limit.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Limit
-//
-// Definition of the Limit class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Limit_INCLUDED
-#define Data_Limit_INCLUDED
-
-
-#include "Poco/Data/Data.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API Limit
-    /// Limit stores information how many rows a query should return.
-    {
-    public:
-        typedef Poco::UInt32 SizeT;
-
-        enum Type
-        {
-            LIMIT_UNLIMITED = ~((SizeT)0)
-        };
-
-        Limit(SizeT value, bool hardLimit = false, bool isLowerLimit = false);
-        /// Creates the Limit.
-        ///
-        /// Value contains the upper row hint, if hardLimit is set to true, the limit acts as a hard
-        /// border, ie. every query must return exactly value rows, returning more than value objects will throw an exception!
-        /// LowerLimits always act as hard-limits!
-        ///
-        /// A value of LIMIT_UNLIMITED disables the limit.
-
-        ~Limit();
-        /// Destroys the Limit.
-
-        SizeT value() const;
-        /// Returns the value of the limit
-
-        bool isHardLimit() const;
-        /// Returns true if the limit is a hard limit.
-
-        bool isLowerLimit() const;
-        /// Returns true if the limit is a lower limit, otherwise it is an upperLimit
-
-        bool operator==(const Limit & other) const;
-        /// Equality operator.
-
-        bool operator!=(const Limit & other) const;
-        /// Inequality operator.
-
-    private:
-        SizeT _value;
-        bool _hardLimit;
-        bool _isLowerLimit;
-    };
-
-
-    //
-    // inlines
-    //
-    inline Poco::UInt32 Limit::value() const
-    {
-        return _value;
-    }
-
-
-    inline bool Limit::isHardLimit() const
-    {
-        return _hardLimit;
-    }
-
-
-    inline bool Limit::isLowerLimit() const
-    {
-        return _isLowerLimit;
-    }
-
-
-    inline bool Limit::operator==(const Limit & other) const
-    {
-        return other._value == _value && other._hardLimit == _hardLimit && other._isLowerLimit == _isLowerLimit;
-    }
-
-
-    inline bool Limit::operator!=(const Limit & other) const
-    {
-        return other._value != _value || other._hardLimit != _hardLimit || other._isLowerLimit != _isLowerLimit;
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Limit_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/MetaColumn.h b/contrib/poco/Data/include/Poco/Data/MetaColumn.h
deleted file mode 100644
index 7f203ddb1..000000000
--- a/contrib/poco/Data/include/Poco/Data/MetaColumn.h
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// MetaColumn.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  MetaColumn
-//
-// Definition of the MetaColumn class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_MetaColumn_INCLUDED
-#define Data_MetaColumn_INCLUDED
-
-
-#include <cstddef>
-#include "Poco/Data/Data.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API MetaColumn
-    /// MetaColumn class contains column metadata information.
-    {
-    public:
-        enum ColumnDataType
-        {
-            FDT_BOOL,
-            FDT_INT8,
-            FDT_UINT8,
-            FDT_INT16,
-            FDT_UINT16,
-            FDT_INT32,
-            FDT_UINT32,
-            FDT_INT64,
-            FDT_UINT64,
-            FDT_FLOAT,
-            FDT_DOUBLE,
-            FDT_STRING,
-            FDT_WSTRING,
-            FDT_BLOB,
-            FDT_CLOB,
-            FDT_DATE,
-            FDT_TIME,
-            FDT_TIMESTAMP,
-            FDT_UNKNOWN
-        };
-
-        MetaColumn();
-        /// Creates the MetaColumn.
-
-        explicit MetaColumn(
-            std::size_t position,
-            const std::string & name = "",
-            ColumnDataType type = FDT_UNKNOWN,
-            std::size_t length = 0,
-            std::size_t precision = 0,
-            bool nullable = false);
-        /// Creates the MetaColumn.
-
-        virtual ~MetaColumn();
-        /// Destroys the MetaColumn.
-
-        const std::string & name() const;
-        /// Returns column name.
-
-        std::size_t length() const;
-        /// Returns column maximum length.
-
-        std::size_t precision() const;
-        /// Returns column precision.
-        /// Valid for floating point fields only
-        /// (zero for other data types).
-
-        std::size_t position() const;
-        /// Returns column position.
-
-        ColumnDataType type() const;
-        /// Returns column type.
-
-        bool isNullable() const;
-        /// Returns true if column allows null values, false otherwise.
-
-    protected:
-        void setName(const std::string & name);
-        /// Sets the column name.
-
-        void setLength(std::size_t length);
-        /// Sets the column length.
-
-        void setPrecision(std::size_t precision);
-        /// Sets the column precision.
-
-        void setType(ColumnDataType type);
-        /// Sets the column data type.
-
-        void setNullable(bool nullable);
-        /// Sets the column nullability.
-
-    private:
-        std::string _name;
-        std::size_t _length;
-        std::size_t _precision;
-        std::size_t _position;
-        ColumnDataType _type;
-        bool _nullable;
-    };
-
-
-    ///
-    /// inlines
-    ///
-    inline const std::string & MetaColumn::name() const
-    {
-        return _name;
-    }
-
-
-    inline std::size_t MetaColumn::length() const
-    {
-        return _length;
-    }
-
-
-    inline std::size_t MetaColumn::precision() const
-    {
-        return _precision;
-    }
-
-
-    inline std::size_t MetaColumn::position() const
-    {
-        return _position;
-    }
-
-
-    inline MetaColumn::ColumnDataType MetaColumn::type() const
-    {
-        return _type;
-    }
-
-
-    inline bool MetaColumn::isNullable() const
-    {
-        return _nullable;
-    }
-
-
-    inline void MetaColumn::setName(const std::string & name)
-    {
-        _name = name;
-    }
-
-
-    inline void MetaColumn::setLength(std::size_t length)
-    {
-        _length = length;
-    }
-
-
-    inline void MetaColumn::setPrecision(std::size_t precision)
-    {
-        _precision = precision;
-    }
-
-
-    inline void MetaColumn::setType(ColumnDataType type)
-    {
-        _type = type;
-    }
-
-
-    inline void MetaColumn::setNullable(bool nullable)
-    {
-        _nullable = nullable;
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_MetaColumn_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/PooledSessionHolder.h b/contrib/poco/Data/include/Poco/Data/PooledSessionHolder.h
deleted file mode 100644
index 3cc88ba9f..000000000
--- a/contrib/poco/Data/include/Poco/Data/PooledSessionHolder.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// PooledSessionHolder.h
-//
-// Library: Data
-// Package: SessionPooling
-// Module:  PooledSessionHolder
-//
-// Definition of the PooledSessionHolder class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_PooledSessionHolder_INCLUDED
-#define Data_PooledSessionHolder_INCLUDED
-
-
-#include "Poco/AutoPtr.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/SessionImpl.h"
-#include "Poco/Mutex.h"
-#include "Poco/Timestamp.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class SessionPool;
-
-
-    class Data_API PooledSessionHolder : public Poco::RefCountedObject
-    /// This class is used by SessionPool to manage SessionImpl objects.
-    {
-    public:
-        PooledSessionHolder(SessionPool & owner, SessionImpl * pSessionImpl);
-        /// Creates the PooledSessionHolder.
-
-        ~PooledSessionHolder();
-        /// Destroys the PooledSessionHolder.
-
-        SessionImpl * session();
-        /// Returns a pointer to the SessionImpl.
-
-        SessionPool & owner();
-        /// Returns a reference to the SessionHolder's owner.
-
-        void access();
-        /// Updates the last access timestamp.
-
-        int idle() const;
-        /// Returns the number of seconds the session has not been used.
-
-    private:
-        SessionPool & _owner;
-        Poco::AutoPtr<SessionImpl> _pImpl;
-        Poco::Timestamp _lastUsed;
-        mutable Poco::FastMutex _mutex;
-    };
-
-
-    //
-    // inlines
-    //
-    inline SessionImpl * PooledSessionHolder::session()
-    {
-        return _pImpl;
-    }
-
-
-    inline SessionPool & PooledSessionHolder::owner()
-    {
-        return _owner;
-    }
-
-
-    inline void PooledSessionHolder::access()
-    {
-        Poco::FastMutex::ScopedLock lock(_mutex);
-
-        _lastUsed.update();
-    }
-
-
-    inline int PooledSessionHolder::idle() const
-    {
-        Poco::FastMutex::ScopedLock lock(_mutex);
-
-        return (int)(_lastUsed.elapsed() / Poco::Timestamp::resolution());
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_PooledSessionHolder_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/PooledSessionImpl.h b/contrib/poco/Data/include/Poco/Data/PooledSessionImpl.h
deleted file mode 100644
index fc33c9a89..000000000
--- a/contrib/poco/Data/include/Poco/Data/PooledSessionImpl.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// PooledSessionImpl.h
-//
-// Library: Data
-// Package: SessionPooling
-// Module:  PooledSessionImpl
-//
-// Definition of the PooledSessionImpl class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_PooledSessionImpl_INCLUDED
-#define Data_PooledSessionImpl_INCLUDED
-
-
-#include "Poco/AutoPtr.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/PooledSessionHolder.h"
-#include "Poco/Data/SessionImpl.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class SessionPool;
-
-
-    class Data_API PooledSessionImpl : public SessionImpl
-    /// PooledSessionImpl is a decorator created by
-    /// SessionPool that adds session pool
-    /// management to SessionImpl objects.
-    {
-    public:
-        PooledSessionImpl(PooledSessionHolder * pHolder);
-        /// Creates the PooledSessionImpl.
-
-        ~PooledSessionImpl();
-        /// Destroys the PooledSessionImpl.
-
-        // SessionImpl
-        StatementImpl * createStatementImpl();
-        void begin();
-        void commit();
-        void rollback();
-        void open(const std::string & connect = "");
-        void close();
-        bool isConnected();
-        void setConnectionTimeout(std::size_t timeout);
-        std::size_t getConnectionTimeout();
-        bool canTransact();
-        bool isTransaction();
-        void setTransactionIsolation(Poco::UInt32);
-        Poco::UInt32 getTransactionIsolation();
-        bool hasTransactionIsolation(Poco::UInt32);
-        bool isTransactionIsolation(Poco::UInt32);
-        const std::string & connectorName() const;
-        void setFeature(const std::string & name, bool state);
-        bool getFeature(const std::string & name);
-        void setProperty(const std::string & name, const Poco::Any & value);
-        Poco::Any getProperty(const std::string & name);
-
-    protected:
-        SessionImpl * access() const;
-        /// Updates the last access timestamp,
-        /// verifies validity of the session
-        /// and returns the session if it is valid.
-        ///
-        /// Throws an SessionUnavailableException if the
-        /// session is no longer valid.
-
-        SessionImpl * impl() const;
-        /// Returns a pointer to the SessionImpl.
-
-    private:
-        mutable Poco::AutoPtr<PooledSessionHolder> _pHolder;
-    };
-
-
-    //
-    // inlines
-    //
-    inline SessionImpl * PooledSessionImpl::impl() const
-    {
-        return _pHolder->session();
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_PooledSessionImpl_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Position.h b/contrib/poco/Data/include/Poco/Data/Position.h
deleted file mode 100644
index f01ea059c..000000000
--- a/contrib/poco/Data/include/Poco/Data/Position.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// PositionExtraction.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Position
-//
-// Definition of the PositionExtraction class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Position_INCLUDED
-#define Data_Position_INCLUDED
-
-
-#include "Poco/Data/Limit.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API Position
-    /// Utility class wrapping unsigned integer. Used to
-    /// indicate the recordset position in batch SQL statements.
-    {
-    public:
-        Position(Poco::UInt32 value);
-        /// Creates the Position.
-
-        ~Position();
-        /// Destroys the Position.
-
-        Poco::UInt32 value() const;
-        /// Returns the position value.
-
-    private:
-        Position();
-
-        Poco::UInt32 _value;
-    };
-
-
-    ///
-    /// inlines
-    ///
-    inline Poco::UInt32 Position::value() const
-    {
-        return _value;
-    }
-
-
-    namespace Keywords
-    {
-
-
-        template <typename T>
-        inline Position from(const T & value)
-        /// Convenience function for creation of position.
-        {
-            return Position(value);
-        }
-
-
-    } // namespace Keywords
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Position_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Preparation.h b/contrib/poco/Data/include/Poco/Data/Preparation.h
deleted file mode 100644
index c4227d5e5..000000000
--- a/contrib/poco/Data/include/Poco/Data/Preparation.h
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-// Preparation.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Preparation
-//
-// Definition of the Preparation class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Preparation_INCLUDED
-#define Data_Preparation_INCLUDED
-
-
-#include <cstddef>
-#include <vector>
-#include "Poco/Data/AbstractPreparation.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/TypeHandler.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    template <typename T>
-    class Preparation : public AbstractPreparation
-    /// Class for calling the appropriate AbstractPreparator method.
-    {
-    public:
-        Preparation(AbstractPreparator::Ptr & pPreparator, std::size_t pos, T & val)
-            : AbstractPreparation(pPreparator), _pos(pos), _val(val)
-        /// Creates the Preparation.
-        {
-        }
-
-        ~Preparation()
-        /// Destroys the Preparation.
-        {
-        }
-
-        void prepare()
-        /// Prepares data.
-        {
-            TypeHandler<T>::prepare(_pos, _val, preparation());
-        }
-
-    private:
-        std::size_t _pos;
-        T & _val;
-    };
-
-
-    template <typename T>
-    class Preparation<std::vector<T>> : public AbstractPreparation
-    /// Preparation specialization for std::vector.
-    /// This specialization is needed for bulk operations to enforce
-    /// the whole vector preparation, rather than only individual contained values.
-    {
-    public:
-        Preparation(AbstractPreparator::Ptr pPreparator, std::size_t pos, std::vector<T> & val = std::vector<T>())
-            : AbstractPreparation(pPreparator), _pos(pos), _val(val)
-        /// Creates the Preparation.
-        {
-        }
-
-        ~Preparation()
-        /// Destroys the Preparation.
-        {
-        }
-
-        void prepare()
-        /// Prepares data.
-        {
-            TypeHandler<std::vector<T>>::prepare(_pos, _val, preparation());
-        }
-
-    private:
-        std::size_t _pos;
-        std::vector<T> & _val;
-    };
-
-
-    template <typename T>
-    class Preparation<std::deque<T>> : public AbstractPreparation
-    /// Preparation specialization for std::deque.
-    /// This specialization is needed for bulk operations to enforce
-    /// the whole deque preparation, rather than only individual contained values.
-    {
-    public:
-        Preparation(AbstractPreparator::Ptr pPreparator, std::size_t pos, std::deque<T> & val = std::deque<T>())
-            : AbstractPreparation(pPreparator), _pos(pos), _val(val)
-        /// Creates the Preparation.
-        {
-        }
-
-        ~Preparation()
-        /// Destroys the Preparation.
-        {
-        }
-
-        void prepare()
-        /// Prepares data.
-        {
-            TypeHandler<std::deque<T>>::prepare(_pos, _val, preparation());
-        }
-
-    private:
-        std::size_t _pos;
-        std::deque<T> & _val;
-    };
-
-
-    template <typename T>
-    class Preparation<std::list<T>> : public AbstractPreparation
-    /// Preparation specialization for std::list.
-    /// This specialization is needed for bulk operations to enforce
-    /// the whole list preparation, rather than only individual contained values.
-    {
-    public:
-        Preparation(AbstractPreparator::Ptr pPreparator, std::size_t pos, std::list<T> & val = std::list<T>())
-            : AbstractPreparation(pPreparator), _pos(pos), _val(val)
-        /// Creates the Preparation.
-        {
-        }
-
-        ~Preparation()
-        /// Destroys the Preparation.
-        {
-        }
-
-        void prepare()
-        /// Prepares data.
-        {
-            TypeHandler<std::list<T>>::prepare(_pos, _val, preparation());
-        }
-
-    private:
-        std::size_t _pos;
-        std::list<T> & _val;
-    };
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Preparation_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Range.h b/contrib/poco/Data/include/Poco/Data/Range.h
deleted file mode 100644
index 6fcee3a8b..000000000
--- a/contrib/poco/Data/include/Poco/Data/Range.h
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// Range.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Range
-//
-// Definition of the Range class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Range_INCLUDED
-#define Data_Range_INCLUDED
-
-
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Limit.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API Range
-    /// Range stores information how many rows a query should return.
-    {
-    public:
-        Range(Limit::SizeT lowValue, Limit::SizeT upValue, bool hardLimit);
-        /// Creates the Range. lowValue must be smaller equal than upValue
-
-        ~Range();
-        /// Destroys the Limit.
-
-        const Limit & lower() const;
-        /// Returns the lower limit
-
-        const Limit & upper() const;
-        /// Returns the upper limit
-
-    private:
-        Limit _lower;
-        Limit _upper;
-    };
-
-
-    //
-    // inlines
-    //
-    inline const Limit & Range::lower() const
-    {
-        return _lower;
-    }
-
-
-    inline const Limit & Range::upper() const
-    {
-        return _upper;
-    }
-
-
-    namespace Keywords
-    {
-
-
-        template <typename T>
-        Limit limit(T lim, bool hard = false)
-        /// Creates an upperLimit
-        {
-            return Limit(static_cast<Limit::SizeT>(lim), hard, false);
-        }
-
-
-        template <typename T>
-        Limit upperLimit(T lim, bool hard = false)
-        {
-            return limit(lim, hard);
-        }
-
-
-        template <typename T>
-        Limit lowerLimit(T lim)
-        {
-            return Limit(static_cast<Limit::SizeT>(lim), true, true);
-        }
-
-
-        template <typename T>
-        Range range(T low, T upp, bool hard = false)
-        {
-            return Range(static_cast<Limit::SizeT>(low), static_cast<Limit::SizeT>(upp), hard);
-        }
-
-
-    } // namespace Keywords
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Range_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/RecordSet.h b/contrib/poco/Data/include/Poco/Data/RecordSet.h
deleted file mode 100644
index 6d561f6dc..000000000
--- a/contrib/poco/Data/include/Poco/Data/RecordSet.h
+++ /dev/null
@@ -1,640 +0,0 @@
-//
-// RecordSet.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  RecordSet
-//
-// Definition of the RecordSet class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_RecordSet_INCLUDED
-#define Data_RecordSet_INCLUDED
-
-
-#include <limits>
-#include <ostream>
-#include "Poco/AutoPtr.h"
-#include "Poco/Data/BulkExtraction.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Extraction.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/Data/RowFilter.h"
-#include "Poco/Data/RowIterator.h"
-#include "Poco/Data/Session.h"
-#include "Poco/Data/Statement.h"
-#include "Poco/Dynamic/Var.h"
-#include "Poco/Exception.h"
-#include "Poco/String.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class RowFilter;
-
-
-    class Data_API RecordSet : private Statement
-    /// RecordSet provides access to data returned from a query.
-    /// Data access indices (row and column) are 0-based, as usual in C++.
-    ///
-    /// Recordset provides navigation methods to iterate through the
-    /// recordset, retrieval methods to extract data, and methods
-    /// to get metadata (type, etc.) about columns.
-    ///
-    /// To work with a RecordSet, first create a Statement, execute it, and
-    /// create the RecordSet from the Statement, as follows:
-    ///
-    ///     Statement select(session);
-    ///     select << "SELECT * FROM Person";
-    ///     select.execute();
-    ///     RecordSet rs(select);
-    ///
-    /// The shorter way to do the above is following:
-    ///
-    ///     RecordSet rs(session, "SELECT * FROM Person"[, new SimpleRowFormatter]);
-    ///
-    /// The third (optional) argument passed to the Recordset constructor is a RowFormatter
-    /// implementation. The formatter is used in conjunction with << operator for recordset
-    /// data formatting.
-    ///
-    /// The number of rows in the RecordSet can be limited by specifying
-    /// a limit for the Statement.
-    {
-    public:
-        typedef std::map<std::size_t, Row *> RowMap;
-        typedef const RowIterator ConstIterator;
-        typedef RowIterator Iterator;
-
-        using Statement::isNull;
-        using Statement::subTotalRowCount;
-
-        static const std::size_t UNKNOWN_TOTAL_ROW_COUNT;
-
-        explicit RecordSet(const Statement & rStatement, RowFormatter::Ptr pRowFormatter = 0);
-        /// Creates the RecordSet.
-
-        RecordSet(Session & rSession, const std::string & query, RowFormatter::Ptr pRowFormatter = 0);
-        /// Creates the RecordSet.
-
-        RecordSet(Session & rSession, const std::string & query, const RowFormatter & rowFormatter);
-        /// Creates the RecordSet.
-
-        template <class RF>
-        RecordSet(Session & rSession, const std::string & query, const RF & rowFormatter)
-            : Statement((rSession << query, Keywords::now))
-            , _currentRow(0)
-            , _pBegin(new RowIterator(this, 0 == rowsExtracted()))
-            , _pEnd(new RowIterator(this, true))
-            , _totalRowCount(UNKNOWN_TOTAL_ROW_COUNT)
-        /// Creates the RecordSet.
-        {
-            setRowFormatter(Keywords::format(rowFormatter));
-        }
-
-        RecordSet(const RecordSet & other);
-        /// Copy-creates the recordset.
-
-        ~RecordSet();
-        /// Destroys the RecordSet.
-
-        void setRowFormatter(RowFormatter::Ptr pRowFormatter);
-        /// Assigns the row formatter to the statement and all recordset rows.
-
-        Statement & operator=(const Statement & stmt);
-        /// Assignment operator.
-
-        std::size_t rowCount() const;
-        /// Returns the number of rows in the RecordSet.
-        /// The number of rows reported is dependent on filtering.
-        /// Due to the need for filter conditions checking,
-        /// this function may suffer significant performance penalty
-        /// for large recordsets, so it should be used judiciously.
-        /// Use totalRowCount() to obtain the total number of rows.
-
-        std::size_t extractedRowCount() const;
-        /// Returns the number of rows extracted during the last statement
-        /// execution.
-        /// The number of rows reported is independent of filtering.
-
-        std::size_t totalRowCount() const;
-        //@ deprecated
-        /// Replaced with subTotalRowCount() and getTotalRowCount().
-
-        std::size_t getTotalRowCount() const;
-        /// Returns the total number of rows in the RecordSet.
-        /// The number of rows reported is independent of filtering.
-        /// If the total row count has not been set externally
-        /// (either explicitly or implicitly through SQL), the value
-        /// returned shall only be accurate if the statement limit
-        /// is less or equal to the total row count.
-
-        void setTotalRowCount(std::size_t totalRowCount);
-        /// Explicitly sets the total row count.
-
-        void setTotalRowCount(const std::string & sql);
-        /// Implicitly sets the total row count.
-        /// The supplied sql must return exactly one column
-        /// and one row. The returned value must be an unsigned
-        /// integer. The value is set as the total number of rows.
-
-        std::size_t columnCount() const;
-        /// Returns the number of columns in the recordset.
-
-        template <class C>
-        const Column<C> & column(const std::string & name) const
-        /// Returns the reference to the first Column with the specified name.
-        {
-            if (isBulkExtraction())
-            {
-                typedef InternalBulkExtraction<C> E;
-                return columnImpl<C, E>(name);
-            }
-            else
-            {
-                typedef InternalExtraction<C> E;
-                return columnImpl<C, E>(name);
-            }
-        }
-
-        template <class C>
-        const Column<C> & column(std::size_t pos) const
-        /// Returns the reference to column at specified position.
-        {
-            if (isBulkExtraction())
-            {
-                typedef InternalBulkExtraction<C> E;
-                return columnImpl<C, E>(pos);
-            }
-            else
-            {
-                typedef InternalExtraction<C> E;
-                return columnImpl<C, E>(pos);
-            }
-        }
-
-        Row & row(std::size_t pos);
-        /// Returns reference to row at position pos.
-        /// Rows are lazy-created and cached.
-
-        template <class T>
-        const T & value(std::size_t col, std::size_t row, bool useFilter = true) const
-        /// Returns the reference to data value at [col, row] location.
-        {
-            if (useFilter && isFiltered() && !isAllowed(row))
-                throw InvalidAccessException("Row not allowed");
-
-            switch (storage())
-            {
-                case STORAGE_VECTOR: {
-                    typedef typename std::vector<T> C;
-                    return column<C>(col).value(row);
-                }
-                case STORAGE_LIST: {
-                    typedef typename std::list<T> C;
-                    return column<C>(col).value(row);
-                }
-                case STORAGE_DEQUE:
-                case STORAGE_UNKNOWN: {
-                    typedef typename std::deque<T> C;
-                    return column<C>(col).value(row);
-                }
-                default:
-                    throw IllegalStateException("Invalid storage setting.");
-            }
-        }
-
-        template <class T>
-        const T & value(const std::string & name, std::size_t row, bool useFilter = true) const
-        /// Returns the reference to data value at named column, row location.
-        {
-            if (useFilter && isFiltered() && !isAllowed(row))
-                throw InvalidAccessException("Row not allowed");
-
-            switch (storage())
-            {
-                case STORAGE_VECTOR: {
-                    typedef typename std::vector<T> C;
-                    return column<C>(name).value(row);
-                }
-                case STORAGE_LIST: {
-                    typedef typename std::list<T> C;
-                    return column<C>(name).value(row);
-                }
-                case STORAGE_DEQUE:
-                case STORAGE_UNKNOWN: {
-                    typedef typename std::deque<T> C;
-                    return column<C>(name).value(row);
-                }
-                default:
-                    throw IllegalStateException("Invalid storage setting.");
-            }
-        }
-
-        Poco::Dynamic::Var value(std::size_t col, std::size_t row, bool checkFiltering = true) const;
-        /// Returns the data value at column, row location.
-
-        Poco::Dynamic::Var value(const std::string & name, std::size_t row, bool checkFiltering = true) const;
-        /// Returns the data value at named column, row location.
-
-        template <typename T>
-        Poco::Dynamic::Var nvl(const std::string & name, const T & deflt = T()) const
-        /// Returns the value in the named column of the current row
-        /// if the value is not NULL, or deflt otherwise.
-        {
-            if (isNull(name))
-                return Poco::Dynamic::Var(deflt);
-            else
-                return value(name, _currentRow);
-        }
-
-        template <typename T>
-        Poco::Dynamic::Var nvl(std::size_t index, const T & deflt = T()) const
-        /// Returns the value in the given column of the current row
-        /// if the value is not NULL, or deflt otherwise.
-        {
-            if (isNull(index, _currentRow))
-                return Poco::Dynamic::Var(deflt);
-            else
-                return value(index, _currentRow);
-        }
-
-        ConstIterator & begin() const;
-        /// Returns the const row iterator.
-
-        ConstIterator & end() const;
-        /// Returns the const row iterator.
-
-        Iterator begin();
-        /// Returns the row iterator.
-
-        Iterator end();
-        /// Returns the row iterator.
-
-        bool moveFirst();
-        /// Moves the row cursor to the first row.
-        ///
-        /// Returns true if there is at least one row in the RecordSet,
-        /// false otherwise.
-
-        bool moveNext();
-        /// Moves the row cursor to the next row.
-        ///
-        /// Returns true if the row is available, or false
-        /// if the end of the record set has been reached and
-        /// no more rows are available.
-
-        bool movePrevious();
-        /// Moves the row cursor to the previous row.
-        ///
-        /// Returns true if the row is available, or false
-        /// if there are no more rows available.
-
-        bool moveLast();
-        /// Moves the row cursor to the last row.
-        ///
-        /// Returns true if there is at least one row in the RecordSet,
-        /// false otherwise.
-
-        using Statement::reset;
-        /// Don't hide base class method.
-
-        void reset(const Statement & stmt);
-        /// Resets the RecordSet and assigns a new statement.
-        /// Should be called after the given statement has been reset,
-        /// assigned a new SQL statement, and executed.
-        ///
-        /// Does not remove the associated RowFilter or RowFormatter.
-
-        Poco::Dynamic::Var value(const std::string & name);
-        /// Returns the value in the named column of the current row.
-
-        Poco::Dynamic::Var value(std::size_t index);
-        /// Returns the value in the given column of the current row.
-
-        Poco::Dynamic::Var operator[](const std::string & name);
-        /// Returns the value in the named column of the current row.
-
-        Poco::Dynamic::Var operator[](std::size_t index);
-        /// Returns the value in the named column of the current row.
-
-        MetaColumn::ColumnDataType columnType(std::size_t pos) const;
-        /// Returns the type for the column at specified position.
-
-        MetaColumn::ColumnDataType columnType(const std::string & name) const;
-        /// Returns the type for the column with specified name.
-
-        const std::string & columnName(std::size_t pos) const;
-        /// Returns column name for the column at specified position.
-
-        std::size_t columnLength(std::size_t pos) const;
-        /// Returns column maximum length for the column at specified position.
-
-        std::size_t columnLength(const std::string & name) const;
-        /// Returns column maximum length for the column with specified name.
-
-        std::size_t columnPrecision(std::size_t pos) const;
-        /// Returns column precision for the column at specified position.
-        /// Valid for floating point fields only (zero for other data types).
-
-        std::size_t columnPrecision(const std::string & name) const;
-        /// Returns column precision for the column with specified name.
-        /// Valid for floating point fields only (zero for other data types).
-
-        bool isNull(const std::string & name) const;
-        /// Returns true if column value of the current row is null.
-
-        std::ostream & copyNames(std::ostream & os) const;
-        /// Copies the column names to the target output stream.
-        /// Copied string is formatted by the current RowFormatter.
-
-        void formatNames() const;
-        /// Formats names using the current RowFormatter.
-
-        std::ostream & copyValues(std::ostream & os, std::size_t offset = 0, std::size_t length = RowIterator::POSITION_END) const;
-        /// Copies the data values to the supplied output stream.
-        /// The data set to be copied is starting at the specified offset
-        /// from the recordset beginning. The number of rows to be copied
-        /// is specified by length argument.
-        /// An invalid combination of offset/length arguments shall
-        /// cause RangeException to be thrown.
-        /// Copied string is formatted by the current RowFormatter.
-
-        void formatValues(std::size_t offset, std::size_t length) const;
-        /// Formats values using the current RowFormatter.
-        /// The data set to be formatted is starting at the specified offset
-        /// from the recordset beginning. The number of rows to be copied
-        /// is specified by length argument.
-        /// An invalid combination of offset/length arguments shall
-        /// cause RangeException to be thrown.
-
-        std::ostream & copy(std::ostream & os, std::size_t offset = 0, std::size_t length = RowIterator::POSITION_END) const;
-        /// Copies the column names and values to the target output stream.
-        /// Copied strings are formatted by the current RowFormatter.
-
-        bool isFiltered() const;
-        /// Returns true if recordset is filtered.
-
-    private:
-        RecordSet();
-
-        template <class C, class E>
-        std::size_t columnPosition(const std::string & name) const
-        /// Returns the position of the column with specified name.
-        {
-            typedef typename C::value_type T;
-            typedef const E * ExtractionVecPtr;
-
-            bool typeFound = false;
-
-            const AbstractExtractionVec & rExtractions = extractions();
-            AbstractExtractionVec::const_iterator it = rExtractions.begin();
-            AbstractExtractionVec::const_iterator end = rExtractions.end();
-
-            for (; it != end; ++it)
-            {
-                ExtractionVecPtr pExtraction = dynamic_cast<ExtractionVecPtr>(it->get());
-
-                if (pExtraction)
-                {
-                    typeFound = true;
-                    const Column<C> & col = pExtraction->column();
-                    if (0 == Poco::icompare(name, col.name()))
-                        return col.position();
-                }
-            }
-
-            if (typeFound)
-                throw NotFoundException(Poco::format("Column name: %s", name));
-            else
-                throw NotFoundException(Poco::format("Column type: %s, name: %s", std::string(typeid(T).name()), name));
-        }
-
-        template <class C, class E>
-        const Column<C> & columnImpl(const std::string & name) const
-        /// Returns the reference to the first Column with the specified name.
-        {
-            return columnImpl<C, E>(columnPosition<C, E>(name));
-        }
-
-        template <class C, class E>
-        const Column<C> & columnImpl(std::size_t pos) const
-        /// Returns the reference to column at specified position.
-        {
-            typedef typename C::value_type T;
-            typedef const E * ExtractionVecPtr;
-
-            const AbstractExtractionVec & rExtractions = extractions();
-
-            std::size_t s = rExtractions.size();
-            if (0 == s || pos >= s)
-                throw RangeException(Poco::format("Invalid column index: %z", pos));
-
-            ExtractionVecPtr pExtraction = dynamic_cast<ExtractionVecPtr>(rExtractions[pos].get());
-
-            if (pExtraction)
-            {
-                return pExtraction->column();
-            }
-            else
-            {
-                throw Poco::BadCastException(
-                    Poco::format("Type cast failed!\nColumn: %z\nTarget type:\t%s", pos, std::string(typeid(T).name())));
-            }
-        }
-
-        bool isAllowed(std::size_t row) const;
-        /// Returns true if the specified row is allowed by the
-        /// currently active filter.
-
-        void filter(const Poco::AutoPtr<RowFilter> & pFilter);
-        /// Sets the filter for the RecordSet.
-
-        const Poco::AutoPtr<RowFilter> & getFilter() const;
-        /// Returns the filter associated with the RecordSet.
-
-        std::size_t _currentRow;
-        RowIterator * _pBegin;
-        RowIterator * _pEnd;
-        RowMap _rowMap;
-        Poco::AutoPtr<RowFilter> _pFilter;
-        std::size_t _totalRowCount;
-
-        friend class RowIterator;
-        friend class RowFilter;
-    };
-
-
-    ///
-    /// inlines
-    ///
-
-
-    inline Data_API std::ostream & operator<<(std::ostream & os, const RecordSet & rs)
-    {
-        return rs.copy(os);
-    }
-
-
-    inline std::size_t RecordSet::getTotalRowCount() const
-    {
-        if (UNKNOWN_TOTAL_ROW_COUNT == _totalRowCount)
-            return subTotalRowCount();
-        else
-            return _totalRowCount;
-    }
-
-
-    inline std::size_t RecordSet::totalRowCount() const
-    {
-        return getTotalRowCount();
-    }
-
-
-    inline void RecordSet::setTotalRowCount(std::size_t totalRowCount)
-    {
-        _totalRowCount = totalRowCount;
-    }
-
-
-    inline std::size_t RecordSet::extractedRowCount() const
-    {
-        return rowsExtracted();
-    }
-
-
-    inline std::size_t RecordSet::columnCount() const
-    {
-        return static_cast<std::size_t>(extractions().size());
-    }
-
-
-    inline Statement & RecordSet::operator=(const Statement & stmt)
-    {
-        reset(stmt);
-        return *this;
-    }
-
-
-    inline Poco::Dynamic::Var RecordSet::value(const std::string & name)
-    {
-        return value(name, _currentRow);
-    }
-
-
-    inline Poco::Dynamic::Var RecordSet::value(std::size_t index)
-    {
-        return value(index, _currentRow);
-    }
-
-
-    inline Poco::Dynamic::Var RecordSet::operator[](const std::string & name)
-    {
-        return value(name, _currentRow);
-    }
-
-
-    inline Poco::Dynamic::Var RecordSet::operator[](std::size_t index)
-    {
-        return value(index, _currentRow);
-    }
-
-
-    inline MetaColumn::ColumnDataType RecordSet::columnType(std::size_t pos) const
-    {
-        return metaColumn(static_cast<UInt32>(pos)).type();
-    }
-
-
-    inline MetaColumn::ColumnDataType RecordSet::columnType(const std::string & name) const
-    {
-        return metaColumn(name).type();
-    }
-
-
-    inline const std::string & RecordSet::columnName(std::size_t pos) const
-    {
-        return metaColumn(static_cast<UInt32>(pos)).name();
-    }
-
-
-    inline std::size_t RecordSet::columnLength(std::size_t pos) const
-    {
-        return metaColumn(static_cast<UInt32>(pos)).length();
-    }
-
-
-    inline std::size_t RecordSet::columnLength(const std::string & name) const
-    {
-        return metaColumn(name).length();
-    }
-
-
-    inline std::size_t RecordSet::columnPrecision(std::size_t pos) const
-    {
-        return metaColumn(static_cast<UInt32>(pos)).precision();
-    }
-
-
-    inline std::size_t RecordSet::columnPrecision(const std::string & name) const
-    {
-        return metaColumn(name).precision();
-    }
-
-
-    inline bool RecordSet::isNull(const std::string & name) const
-    {
-        return isNull(metaColumn(name).position(), _currentRow);
-    }
-
-
-    inline RecordSet::ConstIterator & RecordSet::begin() const
-    {
-        return *_pBegin;
-    }
-
-
-    inline RecordSet::ConstIterator & RecordSet::end() const
-    {
-        return *_pEnd;
-    }
-
-
-    inline RecordSet::Iterator RecordSet::begin()
-    {
-        return *_pBegin;
-    }
-
-
-    inline RecordSet::Iterator RecordSet::end()
-    {
-        return *_pEnd;
-    }
-
-
-    inline const Poco::AutoPtr<RowFilter> & RecordSet::getFilter() const
-    {
-        return _pFilter;
-    }
-
-
-    inline void RecordSet::formatNames() const
-    {
-        (*_pBegin)->formatNames();
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_RecordSet_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Row.h b/contrib/poco/Data/include/Poco/Data/Row.h
deleted file mode 100644
index 17ff70357..000000000
--- a/contrib/poco/Data/include/Poco/Data/Row.h
+++ /dev/null
@@ -1,314 +0,0 @@
-//
-// Row.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Row
-//
-// Definition of the Row class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Row_INCLUDED
-#define Data_Row_INCLUDED
-
-
-#include <ostream>
-#include <string>
-#include <vector>
-#include "Poco/Data/Data.h"
-#include "Poco/Data/RowFormatter.h"
-#include "Poco/Dynamic/Var.h"
-#include "Poco/SharedPtr.h"
-#include "Poco/Tuple.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class RecordSet;
-
-
-    class Data_API Row
-    /// Row class provides a data type for RecordSet iteration purposes.
-    /// Dereferencing a RowIterator returns Row.
-    /// Rows are sortable. The sortability is maintained at all times (i.e. there
-    /// is always at least one column specified as a sorting criteria) .
-    /// The default and minimal sorting criteria is the first field (position 0).
-    /// The default sorting criteria can be replaced with any other field by
-    /// calling replaceSortField() member function.
-    /// Additional fields can be added to sorting criteria, in which case the
-    /// field precedence corresponds to addition order (i.e. later added fields
-    /// have lower sorting precedence).
-    /// These features make Row suitable for use with standard sorted
-    /// containers and algorithms. The main constraint is that all the rows from
-    /// a set that is being sorted must have the same sorting criteria (i.e., the same
-    /// set of fields must be in sorting criteria in the same order). Since rows don't
-    /// know about each other, it is the programmer's responsibility to ensure this
-    /// constraint is satisfied.
-    /// Field names are a shared pointer to a vector of strings. For efficiency sake,
-    /// a constructor taking a shared pointer to names vector argument is provided.
-    /// The stream operator is provided for Row data type as a free-standing function.
-    {
-    public:
-        typedef RowFormatter::NameVec NameVec;
-        typedef RowFormatter::NameVecPtr NameVecPtr;
-        typedef RowFormatter::ValueVec ValueVec;
-
-        enum ComparisonType
-        {
-            COMPARE_AS_EMPTY,
-            COMPARE_AS_INTEGER,
-            COMPARE_AS_FLOAT,
-            COMPARE_AS_STRING
-        };
-
-        typedef Tuple<std::size_t, ComparisonType> SortTuple;
-        typedef std::vector<SortTuple> SortMap;
-        /// The type for map holding fields used for sorting criteria.
-        /// Fields are added sequentially and have precedence that
-        /// corresponds to field adding sequence order (rather than field's
-        /// position in the row).
-        /// This requirement rules out use of std::map due to its sorted nature.
-        typedef SharedPtr<SortMap> SortMapPtr;
-
-        Row();
-        /// Creates the Row.
-
-        Row(NameVecPtr pNames, const RowFormatter::Ptr & pFormatter = 0);
-        /// Creates the Row.
-
-        Row(NameVecPtr pNames, const SortMapPtr & pSortMap, const RowFormatter::Ptr & pFormatter = 0);
-        /// Creates the Row.
-
-        ~Row();
-        /// Destroys the Row.
-
-        Poco::Dynamic::Var & get(std::size_t col);
-        /// Returns the reference to data value at column location.
-
-        Poco::Dynamic::Var & operator[](std::size_t col);
-        /// Returns the reference to data value at column location.
-
-        Poco::Dynamic::Var & operator[](const std::string & name);
-        /// Returns the reference to data value at named column location.
-
-        template <typename T>
-        void append(const std::string & name, const T & val)
-        /// Appends the value to the row.
-        {
-            if (!_pNames)
-                _pNames = new NameVec;
-            _values.push_back(val);
-            _pNames->push_back(name);
-            if (1 == _values.size())
-                addSortField(0);
-        }
-
-        template <typename T>
-        void set(std::size_t pos, const T & val)
-        /// Assigns the value to the row.
-        {
-            try
-            {
-                _values.at(pos) = val;
-            }
-            catch (std::out_of_range &)
-            {
-                throw RangeException("Invalid column number.");
-            }
-        }
-
-        template <typename T>
-        void set(const std::string & name, const T & val)
-        /// Assigns the value to the row.
-        {
-            NameVec::iterator it = _pNames->begin();
-            NameVec::iterator end = _pNames->end();
-            for (int i = 0; it != end; ++it, ++i)
-            {
-                if (*it == name)
-                    return set(i, val);
-            }
-
-            std::ostringstream os;
-            os << "Column with name " << name << " not found.";
-            throw NotFoundException(os.str());
-        }
-
-        std::size_t fieldCount() const;
-        /// Returns the number of fields in this row.
-
-        void reset();
-        /// Resets the row by clearing all field names and values.
-
-        void separator(const std::string & sep);
-        /// Sets the separator.
-
-        void addSortField(std::size_t pos);
-        /// Adds the field used for sorting.
-
-        void addSortField(const std::string & name);
-        /// Adds the field used for sorting.
-
-        void removeSortField(std::size_t pos);
-        /// Removes the field used for sorting.
-
-        void removeSortField(const std::string & name);
-        /// Removes the field used for sorting.
-
-        void replaceSortField(std::size_t oldPos, std::size_t newPos);
-        /// Replaces the field used for sorting.
-
-        void replaceSortField(const std::string & oldName, const std::string & newName);
-        /// Replaces the field used for sorting.
-
-        void resetSort();
-        /// Resets the sorting criteria to field 0 only.
-
-        const std::string & namesToString() const;
-        /// Converts the column names to string.
-
-        void formatNames() const;
-        /// Formats the column names.
-
-        const std::string & valuesToString() const;
-        /// Converts the row values to string and returns the formatted string.
-
-        void formatValues() const;
-        /// Formats the row values.
-
-        bool operator==(const Row & other) const;
-        /// Equality operator.
-
-        bool operator!=(const Row & other) const;
-        /// Inequality operator.
-
-        bool operator<(const Row & other) const;
-        /// Less-than operator.
-
-        const NameVecPtr names() const;
-        /// Returns the shared pointer to names vector.
-
-        const ValueVec & values() const;
-        /// Returns the const reference to values vector.
-
-        void setFormatter(const RowFormatter::Ptr & pFormatter = 0);
-        /// Sets the formatter for this row and takes the
-        /// shared ownership of it.
-
-        const RowFormatter & getFormatter() const;
-        /// Returns the reference to the formatter.
-
-        void setSortMap(const SortMapPtr & pSortMap = 0);
-        /// Adds the sorting fields entry and takes the
-        /// shared ownership of it.
-
-        const SortMapPtr & getSortMap() const;
-        /// Returns the reference to the sorting fields.
-
-    private:
-        void init(const SortMapPtr & pSortMap, const RowFormatter::Ptr & pFormatter);
-
-        ValueVec & values();
-        /// Returns the reference to values vector.
-
-        std::size_t getPosition(const std::string & name);
-        bool isEqualSize(const Row & other) const;
-        bool isEqualType(const Row & other) const;
-
-        NameVecPtr _pNames;
-        ValueVec _values;
-        SortMapPtr _pSortMap;
-        mutable RowFormatter::Ptr _pFormatter;
-        mutable std::string _nameStr;
-        mutable std::string _valueStr;
-    };
-
-
-    Data_API std::ostream & operator<<(std::ostream & os, const Row & row);
-
-
-    ///
-    /// inlines
-    ///
-    inline std::size_t Row::fieldCount() const
-    {
-        return static_cast<std::size_t>(_values.size());
-    }
-
-
-    inline void Row::reset()
-    {
-        _pNames->clear();
-        _values.clear();
-    }
-
-
-    inline const Row::NameVecPtr Row::names() const
-    {
-        return _pNames;
-    }
-
-
-    inline const Row::ValueVec & Row::values() const
-    {
-        return _values;
-    }
-
-
-    inline Row::ValueVec & Row::values()
-    {
-        return _values;
-    }
-
-
-    inline Poco::Dynamic::Var & Row::operator[](std::size_t col)
-    {
-        return get(col);
-    }
-
-
-    inline Poco::Dynamic::Var & Row::operator[](const std::string & name)
-    {
-        return get(getPosition(name));
-    }
-
-
-    inline const RowFormatter & Row::getFormatter() const
-    {
-        return *_pFormatter;
-    }
-
-
-    inline const Row::SortMapPtr & Row::getSortMap() const
-    {
-        return _pSortMap;
-    }
-
-
-    inline const std::string & Row::valuesToString() const
-    {
-        return _pFormatter->formatValues(values(), _valueStr);
-    }
-
-
-    inline void Row::formatValues() const
-    {
-        return _pFormatter->formatValues(values());
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Row_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/RowFilter.h b/contrib/poco/Data/include/Poco/Data/RowFilter.h
deleted file mode 100644
index bfaf3ca20..000000000
--- a/contrib/poco/Data/include/Poco/Data/RowFilter.h
+++ /dev/null
@@ -1,275 +0,0 @@
-//
-// RowFilter.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  RowFilter
-//
-// Definition of the RowFilter class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_RowFilter_INCLUDED
-#define Data_RowFilter_INCLUDED
-
-
-#include <list>
-#include <map>
-#include <utility>
-#include "Poco/AutoPtr.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Dynamic/Var.h"
-#include "Poco/RefCountedObject.h"
-#include "Poco/String.h"
-#include "Poco/Tuple.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class RecordSet;
-
-
-    class Data_API RowFilter : public RefCountedObject
-    /// RowFilter class provides row filtering functionality.
-    /// A filter contains a set of criteria (field name, value and
-    /// logical operation) for row filtering.
-    /// Additionally, a row filter contains a map of pointers to other
-    /// filters with related logical operations between filters.
-    /// RowFilter is typically added to recordset in order to filter
-    /// its content. Since the recordset own iteration is dependent upon
-    /// filtering, whenever the filtering criteria is changed,
-    /// the filter automatically notifies all associated recordsets
-    /// by rewinding them to the first position.
-    {
-    public:
-        enum Comparison
-        {
-            VALUE_LESS_THAN,
-            VALUE_LESS_THAN_OR_EQUAL,
-            VALUE_EQUAL,
-            VALUE_GREATER_THAN,
-            VALUE_GREATER_THAN_OR_EQUAL,
-            VALUE_NOT_EQUAL,
-            VALUE_IS_NULL
-        };
-
-        enum LogicOperator
-        {
-            OP_AND,
-            OP_OR,
-            OP_NOT
-        };
-
-        typedef bool (*CompT)(const Poco::Dynamic::Var &, const Poco::Dynamic::Var &);
-        typedef AutoPtr<RowFilter> Ptr;
-        typedef std::map<std::string, Comparison> Comparisons;
-        typedef Tuple<Poco::Dynamic::Var, Comparison, LogicOperator> ComparisonEntry;
-        typedef std::multimap<std::string, ComparisonEntry> ComparisonMap;
-        typedef std::map<AutoPtr<RowFilter>, LogicOperator> FilterMap;
-
-        RowFilter(RecordSet * pRecordSet);
-        /// Creates the top-level RowFilter and associates it with the recordset.
-
-        RowFilter(Ptr pParent, LogicOperator op = OP_OR);
-        /// Creates child RowFilter and associates it with the parent filter.
-
-        ~RowFilter();
-        /// Destroys the RowFilter.
-
-        void addFilter(Ptr pFilter, LogicOperator comparison);
-        /// Appends another filter to this one.
-
-        void removeFilter(Ptr pFilter);
-        /// Removes filter from this filter.
-
-        bool has(Ptr pFilter) const;
-        /// Returns true if this filter is parent of pFilter;
-
-        template <typename T>
-        void add(const std::string & name, Comparison comparison, const T & value, LogicOperator op = OP_OR)
-        /// Adds value to the filter.
-        {
-            rewindRecordSet();
-            _comparisonMap.insert(ComparisonMap::value_type(toUpper(name), ComparisonEntry(value, comparison, op)));
-        }
-
-        template <typename T>
-        void add(const std::string & name, const std::string & comp, const T & value, LogicOperator op = OP_OR)
-        /// Adds value to the filter.
-        {
-            add(name, getComparison(comp), value, op);
-        }
-
-        template <typename T>
-        void addAnd(const std::string & name, const std::string & comp, const T & value)
-        /// Adds logically AND-ed value to the filter.
-        {
-            add(name, getComparison(comp), value, OP_AND);
-        }
-
-        template <typename T>
-        void addOr(const std::string & name, const std::string & comp, const T & value)
-        /// Adds logically OR-ed value to the filter.
-        {
-            add(name, getComparison(comp), value, OP_OR);
-        }
-
-        int remove(const std::string & name);
-        /// Removes named comparisons from the filter.
-        /// All comparisons with specified name are removed.
-        /// Returns the number of comparisons removed.
-
-        void toggleNot();
-        /// Togless the NOT operator for this filter;
-
-        bool isNot() const;
-        /// Returns true if filter is NOT-ed, false otherwise.
-
-        bool isEmpty() const;
-        /// Returns true if there is not filtering criteria specified.
-
-        bool isAllowed(std::size_t row) const;
-        /// Returns true if name and value are allowed.
-
-        bool exists(const std::string & name) const;
-        /// Returns true if name is known to this row filter.
-
-    private:
-        RowFilter();
-        RowFilter(const RowFilter &);
-        RowFilter & operator=(const RowFilter &);
-
-        void init();
-
-        static bool equal(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2);
-        static bool notEqual(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2);
-        static bool less(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2);
-        static bool greater(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2);
-        static bool lessOrEqual(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2);
-        static bool greaterOrEqual(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2);
-        static bool logicalAnd(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2);
-        static bool logicalOr(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2);
-        static bool isNull(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var &);
-
-        static void doCompare(Poco::Dynamic::Var & ret, Poco::Dynamic::Var & val, CompT comp, const ComparisonEntry & ce);
-
-        RecordSet & recordSet() const;
-
-        Comparison getComparison(const std::string & comp) const;
-
-        void rewindRecordSet();
-
-        Comparisons _comparisons;
-        ComparisonMap _comparisonMap;
-        mutable RecordSet * _pRecordSet;
-        Ptr _pParent;
-        FilterMap _filterMap;
-        bool _not;
-
-        friend class RecordSet;
-    };
-
-
-    ///
-    /// inlines
-    ///
-
-
-    inline bool RowFilter::has(Ptr pFilter) const
-    {
-        return _filterMap.find(pFilter) != _filterMap.end();
-    }
-
-
-    inline bool RowFilter::isEmpty() const
-    {
-        return _comparisonMap.size() == 0;
-    }
-
-
-    inline bool RowFilter::exists(const std::string & name) const
-    {
-        return _comparisonMap.find(name) != _comparisonMap.end();
-    }
-
-
-    inline void RowFilter::toggleNot()
-    {
-        _not = !_not;
-    }
-
-
-    inline bool RowFilter::isNot() const
-    {
-        return _not;
-    }
-
-
-    inline bool RowFilter::equal(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2)
-    {
-        return p1 == p2;
-    }
-
-
-    inline bool RowFilter::notEqual(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2)
-    {
-        return p1 != p2;
-    }
-
-
-    inline bool RowFilter::less(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2)
-    {
-        return p1 < p2;
-    }
-
-
-    inline bool RowFilter::greater(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2)
-    {
-        return p1 > p2;
-    }
-
-
-    inline bool RowFilter::lessOrEqual(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2)
-    {
-        return p1 <= p2;
-    }
-
-
-    inline bool RowFilter::greaterOrEqual(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2)
-    {
-        return p1 >= p2;
-    }
-
-
-    inline bool RowFilter::logicalAnd(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2)
-    {
-        return p1 && p2;
-    }
-
-
-    inline bool RowFilter::logicalOr(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var & p2)
-    {
-        return p1 || p2;
-    }
-
-
-    inline bool RowFilter::isNull(const Poco::Dynamic::Var & p1, const Poco::Dynamic::Var &)
-    {
-        return p1.isEmpty();
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_RowFilter_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/RowFormatter.h b/contrib/poco/Data/include/Poco/Data/RowFormatter.h
deleted file mode 100644
index 0756bc478..000000000
--- a/contrib/poco/Data/include/Poco/Data/RowFormatter.h
+++ /dev/null
@@ -1,231 +0,0 @@
-//
-// RowFormatter.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  RowFormatter
-//
-// Definition of the RowFormatter class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_RowFormatter_INCLUDED
-#define Data_RowFormatter_INCLUDED
-
-
-#include <sstream>
-#include <vector>
-#include "Poco/Data/Data.h"
-#include "Poco/Dynamic/Var.h"
-#include "Poco/RefCountedObject.h"
-#include "Poco/SharedPtr.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API RowFormatter
-    /// Row formatter is an abstract class providing definition for row formatting functionality.
-    /// For custom formatting strategies, inherit from this class and override formatNames()
-    /// and formatValues() member functions.
-    ///
-    /// Row formatter can be either passed to the RecordSet at construction time,
-    /// like in the following example:
-    ///
-    /// RecordSet rs(session. "SELECT * FROM Table", new MyRowFormater);
-    ///
-    /// or it can be supplied to the statement as in the following example:
-    ///
-    /// MyRowFormatter rf
-    /// session << "SELECT * FROM Table", format(rf);
-    ///
-    /// If no formatter is externally supplied to the statement, the SimpleRowFormatter is used.
-    /// Statement always has the ownership of the row formatter and shares
-    /// it with rows through RecordSet.
-    ///
-    /// To accommodate for various formatting needs, a formatter can operate in two modes:
-    ///
-    ///	  - progressive: formatted individual row strings are gemerated and returned from each
-    ///     call to formatValues;
-    ///     std::string& formatNames(const NameVecPtr, std::string&) and
-    ///     std::string& formatValues(const ValueVec&, std::string&) member calls should be
-    ///     used in this case; this is the default mode
-    ///
-    ///   - bulk: formatted resulting string is accumulated internally and obtained at
-    ///     the end of iteration via toString() member function;
-    ///     void formatNames(const NameVecPtr) and
-    ///     void formatValues(const ValueVec&) member calls should be used in this case
-    ///
-    /// When formatter is used in conjunction with Row/RecordSet, the formatting members corresponding
-    /// to the formatter mode are expected to be implemented. If a call is propagated to this parent
-    /// class, the functions do nothing or silently return empty string respectively.
-    ///
-    {
-    public:
-        typedef SharedPtr<RowFormatter> Ptr;
-        typedef std::vector<std::string> NameVec;
-        typedef SharedPtr<std::vector<std::string>> NameVecPtr;
-        typedef std::vector<Poco::Dynamic::Var> ValueVec;
-
-        static const int INVALID_ROW_COUNT = -1;
-
-        enum Mode
-        {
-            FORMAT_PROGRESSIVE,
-            FORMAT_BULK
-        };
-
-        RowFormatter(const std::string & prefix = "", const std::string & postfix = "", Mode mode = FORMAT_PROGRESSIVE);
-        /// Creates the RowFormatter and sets the prefix and postfix to specified values.
-
-        virtual ~RowFormatter();
-        /// Destroys the RowFormatter.
-
-        virtual std::string & formatNames(const NameVecPtr pNames, std::string & formattedNames);
-        /// Should be implemented to format the row fields names and return the formatted string.
-        /// The default implementation clears the names string and returns it.
-
-        virtual void formatNames(const NameVecPtr pNames);
-        /// Should be implemented to format the row fields names.
-        /// The default implementation does nothing.
-
-        virtual std::string & formatValues(const ValueVec & vals, std::string & formattedValues);
-        /// Should be implemented to format the row fields values and return the formatted string.
-        /// The default implementation clears the values string and returns it.
-
-        virtual void formatValues(const ValueVec & vals);
-        /// Should be implemented to format the row fields values.
-        /// The default implementation does nothing.
-
-        virtual const std::string & toString();
-        /// Throws NotImplementedException. Formatters operating in bulk mode should
-        /// implement this member function to return valid pointer to the formatted result.
-
-        virtual int rowCount() const;
-        /// Returns INVALID_ROW_COUNT. Must be implemented by inheriting classes
-        /// which maintain count of processed rows.
-
-        int getTotalRowCount() const;
-        /// Returns zero. Must be implemented by inheriting classes.
-        /// Typically, total row count shall be set up front through
-        /// setTotalRowCount() call.
-
-        void setTotalRowCount(int count);
-        /// Sets total row count.
-
-        virtual const std::string & prefix() const;
-        /// Returns prefix string;
-
-        virtual const std::string & postfix() const;
-        /// Returns postfix string;
-
-        void reset();
-        /// Resets the formatter by setting prefix and postfix
-        /// to empty strings and row count to INVALID_ROW_COUNT.
-
-        Mode getMode() const;
-        /// Returns the formatter mo
-
-        void setMode(Mode mode);
-        /// Sets the fromatter mode.
-
-    protected:
-        void setPrefix(const std::string & prefix);
-        /// Sets the prefix for the formatter.
-
-        void setPostfix(const std::string & postfix);
-        /// Sets the postfix for the formatter
-
-    private:
-        mutable std::string _prefix;
-        mutable std::string _postfix;
-        Mode _mode;
-        int _totalRowCount;
-    };
-
-
-    ///
-    /// inlines
-    ///
-    inline int RowFormatter::rowCount() const
-    {
-        return INVALID_ROW_COUNT;
-    }
-
-
-    inline int RowFormatter::getTotalRowCount() const
-    {
-        return _totalRowCount;
-    }
-
-
-    inline void RowFormatter::setTotalRowCount(int count)
-    {
-        _totalRowCount = count;
-    }
-
-
-    inline void RowFormatter::setPrefix(const std::string & prefix)
-    {
-        _prefix = prefix;
-    }
-
-
-    inline void RowFormatter::setPostfix(const std::string & postfix)
-    {
-        _postfix = postfix;
-    }
-
-
-    inline const std::string & RowFormatter::prefix() const
-    {
-        return _prefix;
-    }
-
-
-    inline const std::string & RowFormatter::postfix() const
-    {
-        return _postfix;
-    }
-
-
-    inline RowFormatter::Mode RowFormatter::getMode() const
-    {
-        return _mode;
-    }
-
-
-    inline void RowFormatter::setMode(Mode mode)
-    {
-        _mode = mode;
-    }
-
-
-    namespace Keywords
-    {
-
-
-        template <typename T>
-        inline RowFormatter::Ptr format(const T & formatter)
-        /// Utility function used to pass formatter to the statement.
-        {
-            return new T(formatter);
-        }
-
-
-    } // namespace Keywords
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_RowFormatter_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/RowIterator.h b/contrib/poco/Data/include/Poco/Data/RowIterator.h
deleted file mode 100644
index 0ba293f79..000000000
--- a/contrib/poco/Data/include/Poco/Data/RowIterator.h
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// RowIterator.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  RowIterator
-//
-// Definition of the RowIterator class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_RowIterator_INCLUDED
-#define Data_RowIterator_INCLUDED
-
-
-#include <algorithm>
-#include <iterator>
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Row.h"
-#include "Poco/Dynamic/Var.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class RecordSet;
-
-
-    class Data_API RowIterator
-    /// RowIterator class.
-    {
-    public:
-        typedef std::bidirectional_iterator_tag iterator_category;
-        typedef Row value_type;
-        typedef std::ptrdiff_t difference_type;
-        typedef Row * pointer;
-        typedef Row & reference;
-
-        static const std::size_t POSITION_END;
-        /// End position indicator.
-
-        RowIterator(RecordSet * pRecordSet, bool positionEnd);
-        /// Creates the RowIterator and positions it at the end of
-        /// the recordset if positionEnd is true. Otherwise, it is
-        /// positioned at the beginning.
-
-        RowIterator(const RowIterator & other);
-        /// Creates a copy of other RowIterator.
-
-        ~RowIterator();
-        /// Destroys the RowIterator.
-
-        RowIterator & operator=(const RowIterator & other);
-        /// Assigns the other RowIterator.
-
-        bool operator==(const RowIterator & other) const;
-        /// Equality operator.
-
-        bool operator!=(const RowIterator & other) const;
-        /// Inequality operator.
-
-        Row & operator*() const;
-        /// Returns reference to the current row.
-
-        Row * operator->() const;
-        /// Returns pointer to the current row.
-
-        const RowIterator & operator++() const;
-        /// Advances by one position and returns current position.
-
-        RowIterator operator++(int) const;
-        /// Advances by one position and returns copy of the iterator with
-        /// previous current position.
-
-        const RowIterator & operator--() const;
-        /// Goes back by one position and returns copy of the iterator with
-        /// previous current position.
-
-        RowIterator operator--(int) const;
-        /// Goes back by one position and returns previous current position.
-
-        RowIterator operator+(std::size_t diff) const;
-        /// Returns a copy the RowIterator advanced by diff positions.
-
-        RowIterator operator-(std::size_t diff) const;
-        /// Returns a copy the RowIterator backed by diff positions.
-        /// Throws RangeException if diff is larger than current position.
-
-        void swap(RowIterator & other);
-        /// Swaps the RowIterator with another one.
-
-    private:
-        RowIterator();
-
-        void increment() const;
-        /// Increments the iterator position by one.
-        /// Throws RangeException if position is out of range.
-
-        void decrement() const;
-        /// Decrements the iterator position by one.
-        /// Throws RangeException if position is out of range.
-
-        void setPosition(std::size_t pos) const;
-        /// Sets the iterator position.
-        /// Throws RangeException if position is out of range.
-
-        RecordSet * _pRecordSet;
-        mutable std::size_t _position;
-    };
-
-
-    ///
-    /// inlines
-    ///
-
-
-    inline bool RowIterator::operator==(const RowIterator & other) const
-    {
-        return _pRecordSet == other._pRecordSet && _position == other._position;
-    }
-
-
-    inline bool RowIterator::operator!=(const RowIterator & other) const
-    {
-        return _pRecordSet != other._pRecordSet || _position != other._position;
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-namespace std
-{
-template <>
-inline void swap<Poco::Data::RowIterator>(Poco::Data::RowIterator & s1, Poco::Data::RowIterator & s2)
-/// Full template specalization of std:::swap for RowIterator
-{
-    s1.swap(s2);
-}
-}
-
-
-#endif // Data_RowIterator_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/SQLChannel.h b/contrib/poco/Data/include/Poco/Data/SQLChannel.h
deleted file mode 100644
index 60f1e8561..000000000
--- a/contrib/poco/Data/include/Poco/Data/SQLChannel.h
+++ /dev/null
@@ -1,216 +0,0 @@
-//
-// SQLChannel.h
-//
-// Library: Data
-// Package: Logging
-// Module:  SQLChannel
-//
-// Definition of the SQLChannel class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_SQLChannel_INCLUDED
-#define Data_SQLChannel_INCLUDED
-
-
-#include "Poco/AutoPtr.h"
-#include "Poco/Channel.h"
-#include "Poco/Data/ArchiveStrategy.h"
-#include "Poco/Data/Connector.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Session.h"
-#include "Poco/Data/Statement.h"
-#include "Poco/Message.h"
-#include "Poco/String.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API SQLChannel : public Poco::Channel
-    /// This Channel implements logging to a SQL database.
-    /// The channel is dependent on the schema. The DDL for
-    /// table creation (subject to target DDL dialect dependent
-    /// modifications) is:
-    ///
-    /// "CREATE TABLE T_POCO_LOG (Source VARCHAR,
-    ///		Name VARCHAR,
-    ///		ProcessId INTEGER,
-    ///		Thread VARCHAR,
-    ///		ThreadId INTEGER,
-    ///		Priority INTEGER,
-    ///		Text VARCHAR,
-    ///		DateTime DATE)"
-    ///
-    /// The table name is configurable through "table" property.
-    /// Other than DateTime filed name used for optiona time-based archiving purposes, currently the
-    /// field names are not mandated. However, it is recommended to use names as specified above.
-    ///
-    /// To provide as non-intrusive operation as possible, the log entries are cached and
-    /// inserted into the target database asynchronously by default . The blocking, however, will occur
-    /// before the next entry insertion with default timeout of 1 second. The default settings can be
-    /// overridden (see async, timeout and throw properties for details).
-    /// If throw property is false, insertion timeouts are ignored, otherwise a TimeoutException is thrown.
-    /// To force insertion of every entry, set timeout to 0. This setting, however, introduces
-    /// a risk of long blocking periods in case of remote server communication delays.
-    {
-    public:
-        SQLChannel();
-        /// Creates SQLChannel.
-
-        SQLChannel(const std::string & connector, const std::string & connect, const std::string & name = "-");
-        /// Creates a SQLChannel with the given connector, connect string, timeout, table and name.
-        /// The connector must be already registered.
-
-        void open();
-        /// Opens the SQLChannel.
-
-        void close();
-        /// Closes the SQLChannel.
-
-        void log(const Message & msg);
-        /// Sends the message's text to the syslog service.
-
-        void setProperty(const std::string & name, const std::string & value);
-        /// Sets the property with the given value.
-        ///
-        /// The following properties are supported:
-        ///     * name:      The name used to identify the source of log messages.
-        ///                  Defaults to "-".
-        ///
-        ///     * target:    The target data storage type ("SQLite", "ODBC", ...).
-        ///
-        ///     * connector: The target data storage connector name.
-        ///
-        ///     * connect:   The target data storage connection string.
-        ///
-        ///     * table:     Destination log table name. Defaults to "T_POCO_LOG".
-        ///                  Table must exist in the target database.
-        ///
-        ///     * keep:      Max row age for the log table. To disable archiving,
-        ///                  set this property to empty string or "forever".
-        ///
-        ///     * archive:   Archive table name. Defaults to "T_POCO_LOG_ARCHIVE".
-        ///                  Table must exist in the target database. To disable archiving,
-        ///                  set this property to empty string.
-        ///
-        ///     * async:     Indicates asynchronous execution. When executing asynchronously,
-        ///                  messages are sent to the target using asynchronous execution.
-        ///                  However, prior to the next message being processed and sent to
-        ///                  the target, the previous operation must have been either completed
-        ///                  or timed out (see timeout and throw properties for details on
-        ///                  how abnormal conditos are handled).
-        ///
-        ///     * timeout:   Timeout (ms) to wait for previous log operation completion.
-        ///                  Values "0" and "" mean no timeout. Only valid when logging
-        ///                  is asynchronous, otherwise ignored.
-        ///
-        ///     * throw:     Boolean value indicating whether to throw in case of timeout.
-        ///                  Setting this property to false may result in log entries being lost.
-        ///                  True values are (case insensitive) "true", "t", "yes", "y".
-        ///                  Anything else yields false.
-
-        std::string getProperty(const std::string & name) const;
-        /// Returns the value of the property with the given name.
-
-        std::size_t wait();
-        /// Waits for the completion of the previous operation and returns
-        /// the result. If channel is in synchronous mode, returns 0 immediately.
-
-        static void registerChannel();
-        /// Registers the channel with the global LoggingFactory.
-
-        static const std::string PROP_CONNECT;
-        static const std::string PROP_CONNECTOR;
-        static const std::string PROP_NAME;
-        static const std::string PROP_TABLE;
-        static const std::string PROP_ARCHIVE_TABLE;
-        static const std::string PROP_MAX_AGE;
-        static const std::string PROP_ASYNC;
-        static const std::string PROP_TIMEOUT;
-        static const std::string PROP_THROW;
-
-    protected:
-        ~SQLChannel();
-
-    private:
-        typedef Poco::SharedPtr<Session> SessionPtr;
-        typedef Poco::SharedPtr<Statement> StatementPtr;
-        typedef Poco::Message::Priority Priority;
-        typedef Poco::SharedPtr<ArchiveStrategy> StrategyPtr;
-
-        void initLogStatement();
-        /// Initiallizes the log statement.
-
-        void initArchiveStatements();
-        /// Initiallizes the archive statement.
-
-        void logAsync(const Message & msg);
-        /// Waits for previous operation completion and
-        /// calls logSync(). If the previous operation times out,
-        /// and _throw is true, TimeoutException is thrown, otherwise
-        /// the timeout is ignored and log entry is lost.
-
-        void logSync(const Message & msg);
-        /// Inserts the message in the target database.
-
-        bool isTrue(const std::string & value) const;
-        /// Returns true is value is "true", "t", "yes" or "y".
-        /// Case insensitive.
-
-        std::string _connector;
-        std::string _connect;
-        SessionPtr _pSession;
-        StatementPtr _pLogStatement;
-        std::string _name;
-        std::string _table;
-        int _timeout;
-        bool _throw;
-        bool _async;
-
-        // members for log entry cache (needed for async mode)
-        std::string _source;
-        long _pid;
-        std::string _thread;
-        long _tid;
-        int _priority;
-        std::string _text;
-        DateTime _dateTime;
-
-        StrategyPtr _pArchiveStrategy;
-    };
-
-
-    //
-    // inlines
-    //
-
-    inline std::size_t SQLChannel::wait()
-    {
-        if (_async && _pLogStatement)
-            return _pLogStatement->wait(_timeout);
-
-        return 0;
-    }
-
-
-    inline bool SQLChannel::isTrue(const std::string & value) const
-    {
-        return (
-            (0 == icompare(value, "true")) || (0 == icompare(value, "t")) || (0 == icompare(value, "yes")) || (0 == icompare(value, "y")));
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_SQLChannel_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Session.h b/contrib/poco/Data/include/Poco/Data/Session.h
deleted file mode 100644
index cf18eab33..000000000
--- a/contrib/poco/Data/include/Poco/Data/Session.h
+++ /dev/null
@@ -1,491 +0,0 @@
-//
-// Session.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Session
-//
-// Definition of the Session class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Session_INCLUDED
-#define Data_Session_INCLUDED
-
-
-#include <algorithm>
-#include "Poco/Any.h"
-#include "Poco/AutoPtr.h"
-#include "Poco/Data/Binding.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/SessionImpl.h"
-#include "Poco/Data/Statement.h"
-#include "Poco/Data/StatementCreator.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class StatementImpl;
-
-
-    class Data_API Session
-    /// A Session holds a connection to a Database and creates Statement objects.
-    ///
-    /// Sessions are always created via the SessionFactory:
-    ///
-    ///     Session ses(SessionFactory::instance().create(connectorKey, connectionString));
-    ///
-    /// where the first param presents the type of session one wants to create (e.g., for SQLite one would choose "SQLite",
-    /// for ODBC the key is "ODBC") and the second param is the connection string that the session implementation
-    /// requires to connect to the database. The format of the connection string is specific to the actual connector.
-    ///
-    /// A simpler form to create the session is to pass the connector key and connection string directly to
-    /// the Session constructor.
-    ///
-    /// A concrete example to open an SQLite database stored in the file "dummy.db" would be
-    ///
-    ///     Session ses("SQLite", "dummy.db");
-    ///
-    /// Via a Session one can create two different types of statements. First, statements that should only be executed once and immediately, and
-    /// second, statements that should be executed multiple times, using a separate execute() call.
-    /// The simple one is immediate execution:
-    ///
-    ///     ses << "CREATE TABLE Dummy (data INTEGER(10))", now;
-    ///
-    /// The now at the end of the statement is required, otherwise the statement
-    /// would not be executed.
-    ///
-    /// If one wants to reuse a Statement (and avoid the overhead of repeatedly parsing an SQL statement)
-    /// one uses an explicit Statement object and its execute() method:
-    ///
-    ///     int i = 0;
-    ///     Statement stmt = (ses << "INSERT INTO Dummy VALUES(:data)", use(i));
-    ///
-    ///     for (i = 0; i < 100; ++i)
-    ///     {
-    ///         stmt.execute();
-    ///     }
-    ///
-    /// The above example assigns the variable i to the ":data" placeholder in the SQL query. The query is parsed and compiled exactly
-    /// once, but executed 100 times. At the end the values 0 to 99 will be present in the Table "DUMMY".
-    ///
-    /// A faster implementation of the above code will simply create a vector of int
-    /// and use the vector as parameter to the use clause (you could also use set or multiset instead):
-    ///
-    ///     std::vector<int> data;
-    ///     for (int i = 0; i < 100; ++i)
-    ///     {
-    ///         data.push_back(i);
-    ///     }
-    ///     ses << "INSERT INTO Dummy VALUES(:data)", use(data);
-    ///
-    /// NEVER try to bind to an empty collection. This will give a BindingException at run-time!
-    ///
-    /// Retrieving data from a database works similar, you could use simple data types, vectors, sets or multiset as your targets:
-    ///
-    ///     std::set<int> retData;
-    ///     ses << "SELECT * FROM Dummy", into(retData));
-    ///
-    /// Due to the blocking nature of the above call it is possible to partition the data retrieval into chunks by setting a limit to
-    /// the maximum number of rows retrieved from the database:
-    ///
-    ///     std::set<int> retData;
-    ///     Statement stmt = (ses << "SELECT * FROM Dummy", into(retData), limit(50));
-    ///     while (!stmt.done())
-    ///     {
-    ///         stmt.execute();
-    ///     }
-    ///
-    /// The "into" keyword is used to inform the statement where output results should be placed. The limit value ensures
-    /// that during each run at most 50 rows are retrieved. Assuming Dummy contains 100 rows, retData will contain 50
-    /// elements after the first run and 100 after the second run, i.e.
-    /// the collection is not cleared between consecutive runs. After the second execute stmt.done() will return true.
-    ///
-    /// A prepared Statement will behave exactly the same but a further call to execute() will simply reset the Statement,
-    /// execute it again and append more data to the result set.
-    ///
-    /// Note that it is possible to append several "bind" or "into" clauses to the statement. Theoretically, one could also have several
-    /// limit clauses but only the last one that was added will be effective.
-    /// Also several preconditions must be met concerning binds and intos.
-    /// Take the following example:
-    ///
-    ///     ses << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3))";
-    ///     std::vector<std::string> nameVec; // [...] add some elements
-    ///     std::vector<int> ageVec; // [...] add some elements
-    ///     ses << "INSERT INTO Person (LastName, Age) VALUES(:ln, :age)", use(nameVec), use(ageVec);
-    ///
-    /// The size of all use parameters MUST be the same, otherwise an exception is thrown. Furthermore,
-    /// the amount of use clauses must match the number of wildcards in the query (to be more precise:
-    /// each binding has a numberOfColumnsHandled() value which defaults to 1. The sum of all these values
-    /// must match the wildcard count in the query.
-    /// However, this is only important if you have written your own TypeHandler specializations.
-    /// If you plan to map complex object types to tables see the TypeHandler documentation.
-    /// For now, we simply assume we have written one TypeHandler for Person objects. Instead of having n different vectors,
-    /// we have one collection:
-    ///
-    ///     std::vector<Person> people; // [...] add some elements
-    ///     ses << "INSERT INTO Person (LastName, FirstName, Age) VALUES(:ln, :fn, :age)", use(people);
-    ///
-    /// which will insert all Person objects from the people vector to the database (and again, you can use set, multiset too,
-    /// even map and multimap if Person provides an operator() which returns the key for the map).
-    /// The same works for a SELECT statement with "into" clauses:
-    ///
-    ///     std::vector<Person> people;
-    ///     ses << "SELECT * FROM PERSON", into(people);
-    ///
-    /// Mixing constants or variables with manipulators is allowed provided there are corresponding placeholders for the constants provided in
-    /// the SQL string, such as in following example:
-    ///
-    ///     std::vector<Person> people;
-    ///     ses << "SELECT * FROM %s", into(people), "PERSON";
-    ///
-    /// Formatting only kicks in if there are values to be injected into the SQL string, otherwise it is skipped.
-    /// If the formatting will occur and the percent sign is part of the query itself, it can be passed to the query by entering it twice (%%).
-    /// However, if no formatting is used, one percent sign is sufficient as the string will be passed unaltered.
-    /// For complete list of supported data types with their respective specifications, see the documentation for format in Foundation.
-    {
-    public:
-        static const std::size_t LOGIN_TIMEOUT_DEFAULT = SessionImpl::LOGIN_TIMEOUT_DEFAULT;
-        static const Poco::UInt32 TRANSACTION_READ_UNCOMMITTED = 0x00000001L;
-        static const Poco::UInt32 TRANSACTION_READ_COMMITTED = 0x00000002L;
-        static const Poco::UInt32 TRANSACTION_REPEATABLE_READ = 0x00000004L;
-        static const Poco::UInt32 TRANSACTION_SERIALIZABLE = 0x00000008L;
-
-        Session(Poco::AutoPtr<SessionImpl> ptrImpl);
-        /// Creates the Session.
-
-        Session(const std::string & connector, const std::string & connectionString, std::size_t timeout = LOGIN_TIMEOUT_DEFAULT);
-        /// Creates a new session, using the given connector (which must have
-        /// been registered), and connectionString.
-
-        Session(const std::string & connection, std::size_t timeout = LOGIN_TIMEOUT_DEFAULT);
-        /// Creates a new session, using the given connection (must be in
-        /// "connection:///connectionString" format).
-
-        Session(const Session &);
-        /// Creates a session by copying another one.
-
-        Session & operator=(const Session &);
-        /// Assignment operator.
-
-        ~Session();
-        /// Destroys the Session.
-
-        void swap(Session & other);
-        /// Swaps the session with another one.
-
-        template <typename T>
-        Statement operator<<(const T & t)
-        /// Creates a Statement with the given data as SQLContent
-        {
-            return _statementCreator << t;
-        }
-
-        StatementImpl * createStatementImpl();
-        /// Creates a StatementImpl.
-
-        void open(const std::string & connect = "");
-        /// Opens the session using the supplied string.
-        /// Can also be used with default empty string to
-        /// reconnect a disconnected session.
-        /// If the connection is not established,
-        /// a ConnectionFailedException is thrown.
-        /// Zero timeout means indefinite
-
-        void close();
-        /// Closes the session.
-
-        bool isConnected();
-        /// Returns true iff session is connected, false otherwise.
-
-        void reconnect();
-        /// Closes the session and opens it.
-
-        void setLoginTimeout(std::size_t timeout);
-        /// Sets the session login timeout value.
-
-        std::size_t getLoginTimeout() const;
-        /// Returns the session login timeout value.
-
-        void setConnectionTimeout(std::size_t timeout);
-        /// Sets the session connection timeout value.
-
-        std::size_t getConnectionTimeout();
-        /// Returns the session connection timeout value.
-
-        void begin();
-        /// Starts a transaction.
-
-        void commit();
-        /// Commits and ends a transaction.
-
-        void rollback();
-        /// Rolls back and ends a transaction.
-
-        bool canTransact();
-        /// Returns true if session has transaction capabilities.
-
-        bool isTransaction();
-        /// Returns true iff a transaction is in progress, false otherwise.
-
-        void setTransactionIsolation(Poco::UInt32);
-        /// Sets the transaction isolation level.
-
-        Poco::UInt32 getTransactionIsolation();
-        /// Returns the transaction isolation level.
-
-        bool hasTransactionIsolation(Poco::UInt32 ti);
-        /// Returns true iff the transaction isolation level corresponding
-        /// to the supplied bitmask is supported.
-
-        bool isTransactionIsolation(Poco::UInt32 ti);
-        /// Returns true iff the transaction isolation level corresponds
-        /// to the supplied bitmask.
-
-        std::string connector() const;
-        /// Returns the connector name for this session.
-
-        std::string uri() const;
-        /// Returns the URI for this session.
-
-        static std::string uri(const std::string & connector, const std::string & connectionString);
-        /// Utility function that teturns the URI formatted from supplied
-        /// arguments as "connector:///connectionString".
-
-        void setFeature(const std::string & name, bool state);
-        /// Set the state of a feature.
-        ///
-        /// Features are a generic extension mechanism for session implementations.
-        /// and are defined by the underlying SessionImpl instance.
-        ///
-        /// Throws a NotSupportedException if the requested feature is
-        /// not supported by the underlying implementation.
-
-        bool getFeature(const std::string & name) const;
-        /// Look up the state of a feature.
-        ///
-        /// Features are a generic extension mechanism for session implementations.
-        /// and are defined by the underlying SessionImpl instance.
-        ///
-        /// Throws a NotSupportedException if the requested feature is
-        /// not supported by the underlying implementation.
-
-        void setProperty(const std::string & name, const Poco::Any & value);
-        /// Set the value of a property.
-        ///
-        /// Properties are a generic extension mechanism for session implementations.
-        /// and are defined by the underlying SessionImpl instance.
-        ///
-        /// Throws a NotSupportedException if the requested property is
-        /// not supported by the underlying implementation.
-
-        Poco::Any getProperty(const std::string & name) const;
-        /// Look up the value of a property.
-        ///
-        /// Properties are a generic extension mechanism for session implementations.
-        /// and are defined by the underlying SessionImpl instance.
-        ///
-        /// Throws a NotSupportedException if the requested property is
-        /// not supported by the underlying implementation.
-
-        SessionImpl * impl();
-        /// Returns a pointer to the underlying SessionImpl.
-
-    private:
-        Session();
-
-        Poco::AutoPtr<SessionImpl> _pImpl;
-        StatementCreator _statementCreator;
-    };
-
-
-    //
-    // inlines
-    //
-    inline StatementImpl * Session::createStatementImpl()
-    {
-        return _pImpl->createStatementImpl();
-    }
-
-
-    inline void Session::open(const std::string & connect)
-    {
-        _pImpl->open(connect);
-    }
-
-
-    inline void Session::close()
-    {
-        _pImpl->close();
-    }
-
-
-    inline bool Session::isConnected()
-    {
-        return _pImpl->isConnected();
-    }
-
-
-    inline void Session::reconnect()
-    {
-        _pImpl->reconnect();
-    }
-
-
-    inline void Session::setLoginTimeout(std::size_t timeout)
-    {
-        _pImpl->setLoginTimeout(timeout);
-    }
-
-
-    inline std::size_t Session::getLoginTimeout() const
-    {
-        return _pImpl->getLoginTimeout();
-    }
-
-
-    inline void Session::setConnectionTimeout(std::size_t timeout)
-    {
-        _pImpl->setConnectionTimeout(timeout);
-    }
-
-
-    inline std::size_t Session::getConnectionTimeout()
-    {
-        return _pImpl->getConnectionTimeout();
-    }
-
-
-    inline void Session::begin()
-    {
-        return _pImpl->begin();
-    }
-
-
-    inline void Session::commit()
-    {
-        return _pImpl->commit();
-    }
-
-
-    inline void Session::rollback()
-    {
-        return _pImpl->rollback();
-    }
-
-
-    inline bool Session::canTransact()
-    {
-        return _pImpl->canTransact();
-    }
-
-
-    inline bool Session::isTransaction()
-    {
-        return _pImpl->isTransaction();
-    }
-
-
-    inline void Session::setTransactionIsolation(Poco::UInt32 ti)
-    {
-        _pImpl->setTransactionIsolation(ti);
-    }
-
-
-    inline Poco::UInt32 Session::getTransactionIsolation()
-    {
-        return _pImpl->getTransactionIsolation();
-    }
-
-
-    inline bool Session::hasTransactionIsolation(Poco::UInt32 ti)
-    {
-        return _pImpl->hasTransactionIsolation(ti);
-    }
-
-
-    inline bool Session::isTransactionIsolation(Poco::UInt32 ti)
-    {
-        return _pImpl->isTransactionIsolation(ti);
-    }
-
-
-    inline std::string Session::connector() const
-    {
-        return _pImpl->connectorName();
-    }
-
-
-    inline std::string Session::uri(const std::string & connector, const std::string & connectionString)
-    {
-        return SessionImpl::uri(connector, connectionString);
-    }
-
-
-    inline std::string Session::uri() const
-    {
-        return _pImpl->uri();
-    }
-
-
-    inline void Session::setFeature(const std::string & name, bool state)
-    {
-        _pImpl->setFeature(name, state);
-    }
-
-
-    inline bool Session::getFeature(const std::string & name) const
-    {
-        return const_cast<SessionImpl *>(_pImpl.get())->getFeature(name);
-    }
-
-
-    inline void Session::setProperty(const std::string & name, const Poco::Any & value)
-    {
-        _pImpl->setProperty(name, value);
-    }
-
-
-    inline Poco::Any Session::getProperty(const std::string & name) const
-    {
-        return const_cast<SessionImpl *>(_pImpl.get())->getProperty(name);
-    }
-
-
-    inline SessionImpl * Session::impl()
-    {
-        return _pImpl;
-    }
-
-
-    inline void swap(Session & s1, Session & s2)
-    {
-        s1.swap(s2);
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-namespace std
-{
-template <>
-inline void swap<Poco::Data::Session>(Poco::Data::Session & s1, Poco::Data::Session & s2)
-/// Full template specalization of std:::swap for Session
-{
-    s1.swap(s2);
-}
-}
-
-
-#endif // Data_Session_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/SessionFactory.h b/contrib/poco/Data/include/Poco/Data/SessionFactory.h
deleted file mode 100644
index 50b842062..000000000
--- a/contrib/poco/Data/include/Poco/Data/SessionFactory.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// SessionFactory.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  SessionFactory
-//
-// Definition of the SessionFactory class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_SessionFactory_INCLUDED
-#define Data_SessionFactory_INCLUDED
-
-
-#include <map>
-#include "Poco/Data/Connector.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Session.h"
-#include "Poco/Mutex.h"
-#include "Poco/SharedPtr.h"
-#include "Poco/String.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API SessionFactory
-    /// A SessionFactory is a singleton class that stores Connectors and allows to
-    /// create Sessions of the required type:
-    ///
-    ///     Session ses(SessionFactory::instance().create(connector, connectionString));
-    ///
-    /// where the first param presents the type of session one wants to create (e.g. for SQLite one would choose "SQLite")
-    /// and the second param is the connection string that the connector requires to connect to the database.
-    ///
-    /// A concrete example to open an SQLite database stored in the file "dummy.db" would be
-    ///
-    ///     Session ses(SessionFactory::instance().create(SQLite::Connector::KEY, "dummy.db"));
-    ///
-    /// An even simpler way to create a session is to use the two argument constructor of Session, which
-    /// automatically invokes the SessionFactory:
-    ///
-    ///      Session ses("SQLite", "dummy.db");
-    {
-    public:
-        static SessionFactory & instance();
-        /// returns the static instance of the singleton.
-
-        void add(Connector * pIn);
-        /// Registers a Connector under its key at the factory. If a registration for that
-        /// key is already active, the first registration will be kept, only its reference count will be increased.
-        /// Always takes ownership of parameter pIn.
-
-        void remove(const std::string & key);
-        /// Lowers the reference count for the Connector registered under that key. If the count reaches zero,
-        /// the object is removed.
-
-        Session create(const std::string & key, const std::string & connectionString, std::size_t timeout = Session::LOGIN_TIMEOUT_DEFAULT);
-        /// Creates a Session for the given key with the connectionString. Throws an Poco:Data::UnknownDataBaseException
-        /// if no Connector is registered for that key.
-
-        Session create(const std::string & uri, std::size_t timeout = Session::LOGIN_TIMEOUT_DEFAULT);
-        /// Creates a Session for the given URI (must be in key:///connectionString format).
-        /// Throws a Poco:Data::UnknownDataBaseException if no Connector is registered for the key.
-
-    private:
-        SessionFactory();
-        ~SessionFactory();
-        SessionFactory(const SessionFactory &);
-        SessionFactory & operator=(const SessionFactory &);
-
-        struct SessionInfo
-        {
-            int cnt;
-            Poco::SharedPtr<Connector> ptrSI;
-            SessionInfo(Connector * pSI);
-        };
-
-        typedef std::map<std::string, SessionInfo, Poco::CILess> Connectors;
-        Connectors _connectors;
-        Poco::FastMutex _mutex;
-    };
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_SessionFactory_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/SessionImpl.h b/contrib/poco/Data/include/Poco/Data/SessionImpl.h
deleted file mode 100644
index b81f1892c..000000000
--- a/contrib/poco/Data/include/Poco/Data/SessionImpl.h
+++ /dev/null
@@ -1,222 +0,0 @@
-//
-// SessionImpl.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  SessionImpl
-//
-// Definition of the SessionImpl class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_SessionImpl_INCLUDED
-#define Data_SessionImpl_INCLUDED
-
-
-#include "Poco/Any.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Format.h"
-#include "Poco/RefCountedObject.h"
-#include "Poco/String.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class StatementImpl;
-
-
-    class Data_API SessionImpl : public Poco::RefCountedObject
-    /// Interface for Session functionality that subclasses must extend.
-    /// SessionImpl objects are noncopyable.
-    {
-    public:
-        static const std::size_t LOGIN_TIMEOUT_INFINITE = 0;
-        /// Infinite connection/login timeout.
-
-        static const std::size_t LOGIN_TIMEOUT_DEFAULT = 60;
-        /// Default connection/login timeout in seconds.
-
-        static const std::size_t CONNECTION_TIMEOUT_INFINITE = 0;
-        /// Infinite connection/login timeout.
-
-        static const std::size_t CONNECTION_TIMEOUT_DEFAULT = CONNECTION_TIMEOUT_INFINITE;
-        /// Default connection/login timeout in seconds.
-
-        SessionImpl(const std::string & connectionString, std::size_t timeout = LOGIN_TIMEOUT_DEFAULT);
-        /// Creates the SessionImpl.
-
-        virtual ~SessionImpl();
-        /// Destroys the SessionImpl.
-
-        virtual StatementImpl * createStatementImpl() = 0;
-        /// Creates a StatementImpl.
-
-        virtual void open(const std::string & connectionString = "") = 0;
-        /// Opens the session using the supplied string.
-        /// Can also be used with default empty string to reconnect
-        /// a disconnected session.
-        /// If the connection is not established within requested timeout
-        /// (specified in seconds), a ConnectionFailedException is thrown.
-        /// Zero timeout means indefinite
-
-        virtual void close() = 0;
-        /// Closes the connection.
-
-        virtual bool isConnected() = 0;
-        /// Returns true if session is connected, false otherwise.
-
-        void setLoginTimeout(std::size_t timeout);
-        /// Sets the session login timeout value.
-
-        std::size_t getLoginTimeout() const;
-        /// Returns the session login timeout value.
-
-        virtual void setConnectionTimeout(std::size_t timeout) = 0;
-        /// Sets the session connection timeout value.
-
-        virtual std::size_t getConnectionTimeout() = 0;
-        /// Returns the session connection timeout value.
-
-        void reconnect();
-        /// Closes the connection and opens it again.
-
-        virtual void begin() = 0;
-        /// Starts a transaction.
-
-        virtual void commit() = 0;
-        /// Commits and ends a transaction.
-
-        virtual void rollback() = 0;
-        /// Aborts a transaction.
-
-        virtual bool canTransact() = 0;
-        /// Returns true if session has transaction capabilities.
-
-        virtual bool isTransaction() = 0;
-        /// Returns true iff a transaction is a transaction is in progress, false otherwise.
-
-        virtual void setTransactionIsolation(Poco::UInt32) = 0;
-        /// Sets the transaction isolation level.
-
-        virtual Poco::UInt32 getTransactionIsolation() = 0;
-        /// Returns the transaction isolation level.
-
-        virtual bool hasTransactionIsolation(Poco::UInt32) = 0;
-        /// Returns true iff the transaction isolation level corresponding
-        /// to the supplied bitmask is supported.
-
-        virtual bool isTransactionIsolation(Poco::UInt32) = 0;
-        /// Returns true iff the transaction isolation level corresponds
-        /// to the supplied bitmask.
-
-        virtual const std::string & connectorName() const = 0;
-        /// Returns the name of the connector.
-
-        const std::string & connectionString() const;
-        /// Returns the connection string.
-
-        static std::string uri(const std::string & connector, const std::string & connectionString);
-        /// Returns formatted URI.
-
-        std::string uri() const;
-        /// Returns the URI for this session.
-
-        virtual void setFeature(const std::string & name, bool state) = 0;
-        /// Set the state of a feature.
-        ///
-        /// Features are a generic extension mechanism for session implementations.
-        /// and are defined by the underlying SessionImpl instance.
-        ///
-        /// Throws a NotSupportedException if the requested feature is
-        /// not supported by the underlying implementation.
-
-        virtual bool getFeature(const std::string & name) = 0;
-        /// Look up the state of a feature.
-        ///
-        /// Features are a generic extension mechanism for session implementations.
-        /// and are defined by the underlying SessionImpl instance.
-        ///
-        /// Throws a NotSupportedException if the requested feature is
-        /// not supported by the underlying implementation.
-
-        virtual void setProperty(const std::string & name, const Poco::Any & value) = 0;
-        /// Set the value of a property.
-        ///
-        /// Properties are a generic extension mechanism for session implementations.
-        /// and are defined by the underlying SessionImpl instance.
-        ///
-        /// Throws a NotSupportedException if the requested property is
-        /// not supported by the underlying implementation.
-
-        virtual Poco::Any getProperty(const std::string & name) = 0;
-        /// Look up the value of a property.
-        ///
-        /// Properties are a generic extension mechanism for session implementations.
-        /// and are defined by the underlying SessionImpl instance.
-        ///
-        /// Throws a NotSupportedException if the requested property is
-        /// not supported by the underlying implementation.
-
-    protected:
-        void setConnectionString(const std::string & connectionString);
-        /// Sets the connection string. Should only be called on
-        /// disconnetced sessions. Throws InvalidAccessException when called on
-        /// a connected session.
-
-    private:
-        SessionImpl();
-        SessionImpl(const SessionImpl &);
-        SessionImpl & operator=(const SessionImpl &);
-
-        std::string _connectionString;
-        std::size_t _loginTimeout;
-    };
-
-
-    //
-    // inlines
-    //
-    inline const std::string & SessionImpl::connectionString() const
-    {
-        return _connectionString;
-    }
-
-
-    inline void SessionImpl::setLoginTimeout(std::size_t timeout)
-    {
-        _loginTimeout = timeout;
-    }
-
-
-    inline std::size_t SessionImpl::getLoginTimeout() const
-    {
-        return _loginTimeout;
-    }
-
-
-    inline std::string SessionImpl::uri(const std::string & connector, const std::string & connectionString)
-    {
-        return format("%s:///%s", connector, connectionString);
-    }
-
-
-    inline std::string SessionImpl::uri() const
-    {
-        return uri(connectorName(), connectionString());
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_SessionImpl_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/SessionPool.h b/contrib/poco/Data/include/Poco/Data/SessionPool.h
deleted file mode 100644
index 9c95f9ea4..000000000
--- a/contrib/poco/Data/include/Poco/Data/SessionPool.h
+++ /dev/null
@@ -1,233 +0,0 @@
-//
-// SessionPool.h
-//
-// Library: Data
-// Package: SessionPooling
-// Module:  SessionPool
-//
-// Definition of the SessionPool class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_SessionPool_INCLUDED
-#define Data_SessionPool_INCLUDED
-
-
-#include <list>
-#include "Poco/Any.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/PooledSessionHolder.h"
-#include "Poco/Data/PooledSessionImpl.h"
-#include "Poco/Data/Session.h"
-#include "Poco/HashMap.h"
-#include "Poco/Mutex.h"
-#include "Poco/Timer.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API SessionPool : public RefCountedObject
-    /// This class implements session pooling for POCO Data.
-    ///
-    /// Creating a connection to a database is often a time consuming
-    /// operation. Therefore it makes sense to reuse a session object
-    /// once it is no longer needed.
-    ///
-    /// A SessionPool manages a collection of SessionImpl objects
-    /// (decorated with a PooledSessionImpl).
-    ///
-    /// When a SessionImpl object is requested, the SessionPool first
-    /// looks in its set of already initialized SessionImpl for an
-    /// available object. If one is found, it is returned to the
-    /// client and marked as "in-use". If no SessionImpl is available,
-    /// the SessionPool attempts to create a new one for the client.
-    /// To avoid excessive creation of SessionImpl objects, a limit
-    /// can be set on the maximum number of objects.
-    /// Sessions found not to be connected to the database are purged
-    /// from the pool whenever one of the following events occurs:
-    ///
-    ///   - JanitorTimer event
-    ///   - get() request
-    ///   - putBack() request
-    ///
-    /// Not connected idle sessions can not exist.
-    ///
-    /// Usage example:
-    ///
-    ///     SessionPool pool("ODBC", "...");
-    ///     ...
-    ///     Session sess(pool.get());
-    ///     ...
-    {
-    public:
-        SessionPool(
-            const std::string & connector,
-            const std::string & connectionString,
-            int minSessions = 1,
-            int maxSessions = 32,
-            int idleTime = 60);
-        /// Creates the SessionPool for sessions with the given connector
-        /// and connectionString.
-        ///
-        /// The pool allows for at most maxSessions sessions to be created.
-        /// If a session has been idle for more than idleTime seconds, and more than
-        /// minSessions sessions are in the pool, the session is automatically destroyed.
-
-        ~SessionPool();
-        /// Destroys the SessionPool.
-
-        Session get();
-        /// Returns a Session.
-        ///
-        /// If there are unused sessions available, one of the
-        /// unused sessions is recycled. Otherwise, a new session
-        /// is created.
-        ///
-        /// If the maximum number of sessions for this pool has
-        /// already been created, a SessionPoolExhaustedException
-        /// is thrown.
-
-        template <typename T>
-        Session get(const std::string & name, const T & value)
-        /// Returns a Session with requested property set.
-        /// The property can be different from the default pool
-        /// value, in which case it is reset back to the pool
-        /// value when the session is reclaimed by the pool.
-        {
-            Session s = get();
-            _addPropertyMap.insert(AddPropertyMap::value_type(s.impl(), std::make_pair(name, s.getProperty(name))));
-            s.setProperty(name, value);
-
-            return s;
-        }
-
-        Session get(const std::string & name, bool value);
-        /// Returns a Session with requested feature set.
-        /// The feature can be different from the default pool
-        /// value, in which case it is reset back to the pool
-        /// value when the session is reclaimed by the pool.
-
-        int capacity() const;
-        /// Returns the maximum number of sessions the SessionPool will manage.
-
-        int used() const;
-        /// Returns the number of sessions currently in use.
-
-        int idle() const;
-        /// Returns the number of idle sessions.
-
-        int dead();
-        /// Returns the number of not connected active sessions.
-
-        int allocated() const;
-        /// Returns the number of allocated sessions.
-
-        int available() const;
-        /// Returns the number of available (idle + remaining capacity) sessions.
-
-        std::string name() const;
-        /// Returns the name for this pool.
-
-        static std::string name(const std::string & connector, const std::string & connectionString);
-        /// Returns the name formatted from supplied arguments as "connector:///connectionString".
-
-        void setFeature(const std::string & name, bool state);
-        /// Sets feature for all the sessions.
-
-        bool getFeature(const std::string & name);
-        /// Returns the requested feature.
-
-        void setProperty(const std::string & name, const Poco::Any & value);
-        /// Sets property for all sessions.
-
-        Poco::Any getProperty(const std::string & name);
-        /// Returns the requested property.
-
-        void shutdown();
-        /// Shuts down the session pool.
-
-        bool isActive() const;
-        /// Returns true if session pool is active (not shut down).
-
-    protected:
-        virtual void customizeSession(Session & session);
-        /// Can be overridden by subclass to perform custom initialization
-        /// of a newly created database session.
-        ///
-        /// The default implementation does nothing.
-
-        typedef Poco::AutoPtr<PooledSessionHolder> PooledSessionHolderPtr;
-        typedef Poco::AutoPtr<PooledSessionImpl> PooledSessionImplPtr;
-        typedef std::list<PooledSessionHolderPtr> SessionList;
-        typedef Poco::HashMap<std::string, bool> FeatureMap;
-        typedef Poco::HashMap<std::string, Poco::Any> PropertyMap;
-
-        void purgeDeadSessions();
-        int deadImpl(SessionList & rSessions);
-        void applySettings(SessionImpl * pImpl);
-        void putBack(PooledSessionHolderPtr pHolder);
-        void onJanitorTimer(Poco::Timer &);
-
-    private:
-        typedef std::pair<std::string, Poco::Any> PropertyPair;
-        typedef std::pair<std::string, bool> FeaturePair;
-        typedef std::map<SessionImpl *, PropertyPair> AddPropertyMap;
-        typedef std::map<SessionImpl *, FeaturePair> AddFeatureMap;
-
-        SessionPool(const SessionPool &);
-        SessionPool & operator=(const SessionPool &);
-
-        void closeAll(SessionList & sessionList);
-
-        std::string _connector;
-        std::string _connectionString;
-        int _minSessions;
-        int _maxSessions;
-        int _idleTime;
-        int _nSessions;
-        SessionList _idleSessions;
-        SessionList _activeSessions;
-        Poco::Timer _janitorTimer;
-        FeatureMap _featureMap;
-        PropertyMap _propertyMap;
-        bool _shutdown;
-        AddPropertyMap _addPropertyMap;
-        AddFeatureMap _addFeatureMap;
-        mutable Poco::Mutex _mutex;
-
-        friend class PooledSessionImpl;
-    };
-
-
-    inline std::string SessionPool::name(const std::string & connector, const std::string & connectionString)
-    {
-        return Session::uri(connector, connectionString);
-    }
-
-
-    inline std::string SessionPool::name() const
-    {
-        return name(_connector, _connectionString);
-    }
-
-
-    inline bool SessionPool::isActive() const
-    {
-        return !_shutdown;
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_SessionPool_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/SessionPoolContainer.h b/contrib/poco/Data/include/Poco/Data/SessionPoolContainer.h
deleted file mode 100644
index 7f22eb7f1..000000000
--- a/contrib/poco/Data/include/Poco/Data/SessionPoolContainer.h
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// SessionPoolContainer.h
-//
-// Library: Data
-// Package: SessionPooling
-// Module:  SessionPoolContainer
-//
-// Definition of the SessionPoolContainer class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_SessionPoolContainer_INCLUDED
-#define Data_SessionPoolContainer_INCLUDED
-
-
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Session.h"
-#include "Poco/Data/SessionPool.h"
-#include "Poco/Mutex.h"
-#include "Poco/String.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API SessionPoolContainer
-    /// This class implements container of session pools.
-    {
-    public:
-        SessionPoolContainer();
-        /// Creates the SessionPoolContainer for sessions with the given session parameters.
-
-        ~SessionPoolContainer();
-        /// Destroys the SessionPoolContainer.
-
-        void add(SessionPool * pPool);
-        /// Adds existing session pool to the container.
-        /// Throws SessionPoolExistsException if pool already exists.
-
-        Session
-        add(const std::string & sessionKey,
-            const std::string & connectionString,
-            int minSessions = 1,
-            int maxSessions = 32,
-            int idleTime = 60);
-        /// Adds a new session pool to the container and returns a Session from
-        /// newly created pool. If pool already exists, request to add is silently
-        /// ignored and session is returned from the existing pool.
-
-        bool has(const std::string & name) const;
-        /// Returns true if the requested name exists, false otherwise.
-
-        bool isActive(const std::string & sessionKey, const std::string & connectionString = "") const;
-        /// Returns true if the session is active (i.e. not shut down).
-        /// If connectionString is empty string, sessionKey must be a
-        /// fully qualified session name as registered with the pool
-        /// container.
-
-        Session get(const std::string & name);
-        /// Returns the requested Session.
-        /// Throws NotFoundException if session is not found.
-
-        SessionPool & getPool(const std::string & name);
-        /// Returns a SessionPool reference.
-        /// Throws NotFoundException if session is not found.
-
-        void remove(const std::string & name);
-        /// Removes a SessionPool.
-
-        int count() const;
-        /// Returns the number of session pols in the container.
-
-        void shutdown();
-        /// Shuts down all the held pools.
-
-    private:
-        typedef std::map<std::string, AutoPtr<SessionPool>, Poco::CILess> SessionPoolMap;
-
-        SessionPoolContainer(const SessionPoolContainer &);
-        SessionPoolContainer & operator=(const SessionPoolContainer &);
-
-        SessionPoolMap _sessionPools;
-        Poco::FastMutex _mutex;
-    };
-
-
-    inline bool SessionPoolContainer::has(const std::string & name) const
-    {
-        return _sessionPools.find(name) != _sessionPools.end();
-    }
-
-
-    inline void SessionPoolContainer::remove(const std::string & name)
-    {
-        _sessionPools.erase(name);
-    }
-
-
-    inline int SessionPoolContainer::count() const
-    {
-        return static_cast<int>(_sessionPools.size());
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_SessionPoolContainer_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/SimpleRowFormatter.h b/contrib/poco/Data/include/Poco/Data/SimpleRowFormatter.h
deleted file mode 100644
index 9d7956c14..000000000
--- a/contrib/poco/Data/include/Poco/Data/SimpleRowFormatter.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// RowFormatter.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  SimpleRowFormatter
-//
-// Definition of the RowFormatter class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_SimpleRowFormatter_INCLUDED
-#define Data_SimpleRowFormatter_INCLUDED
-
-
-#include "Poco/Data/Data.h"
-#include "Poco/Data/RowFormatter.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API SimpleRowFormatter : public RowFormatter
-    /// A simple row formatting class.
-    {
-    public:
-        //typedef RowFormatter::NameVec    NameVec;
-        //typedef RowFormatter::NameVecPtr NameVecPtr;
-        //typedef RowFormatter::ValueVec   ValueVec;
-
-        static const int DEFAULT_COLUMN_WIDTH = 16;
-        static const int DEFAULT_SPACING = 1;
-
-        SimpleRowFormatter(std::streamsize columnWidth = DEFAULT_COLUMN_WIDTH, std::streamsize spacing = DEFAULT_SPACING);
-        /// Creates the SimpleRowFormatter and sets the column width to specified value.
-
-        SimpleRowFormatter(const SimpleRowFormatter & other);
-        /// Creates the copy of the supplied SimpleRowFormatter.
-
-        SimpleRowFormatter & operator=(const SimpleRowFormatter & row);
-        /// Assignment operator.
-
-        ~SimpleRowFormatter();
-        /// Destroys the SimpleRowFormatter.
-
-        void swap(SimpleRowFormatter & other);
-        /// Swaps the row formatter with another one.
-
-        std::string & formatNames(const NameVecPtr pNames, std::string & formattedNames);
-        /// Formats the row field names.
-
-        std::string & formatValues(const ValueVec & vals, std::string & formattedValues);
-        /// Formats the row values.
-
-        int rowCount() const;
-        /// Returns row count.
-
-        void setColumnWidth(std::streamsize width);
-        /// Sets the column width.
-
-        std::streamsize getColumnWidth() const;
-        /// Returns the column width.
-
-        std::streamsize getSpacing() const;
-        /// Returns the spacing.
-
-    private:
-        std::streamsize _colWidth;
-        std::streamsize _spacing;
-        int _rowCount;
-    };
-
-
-    ///
-    /// inlines
-    ///
-    inline int SimpleRowFormatter::rowCount() const
-    {
-        return _rowCount;
-    }
-
-
-    inline void SimpleRowFormatter::setColumnWidth(std::streamsize columnWidth)
-    {
-        _colWidth = columnWidth;
-    }
-
-
-    inline std::streamsize SimpleRowFormatter::getColumnWidth() const
-    {
-        return _colWidth;
-    }
-
-
-    inline std::streamsize SimpleRowFormatter::getSpacing() const
-    {
-        return _spacing;
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-namespace std
-{
-template <>
-inline void swap<Poco::Data::SimpleRowFormatter>(Poco::Data::SimpleRowFormatter & s1, Poco::Data::SimpleRowFormatter & s2)
-/// Full template specalization of std:::swap for SimpleRowFormatter
-{
-    s1.swap(s2);
-}
-}
-
-
-#endif // Data_SimpleRowFormatter_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Statement.h b/contrib/poco/Data/include/Poco/Data/Statement.h
deleted file mode 100644
index 87da201a6..000000000
--- a/contrib/poco/Data/include/Poco/Data/Statement.h
+++ /dev/null
@@ -1,830 +0,0 @@
-//
-// Statement.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Statement
-//
-// Definition of the Statement class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Statement_INCLUDED
-#define Data_Statement_INCLUDED
-
-
-#include <algorithm>
-#include "Poco/ActiveMethod.h"
-#include "Poco/ActiveResult.h"
-#include "Poco/Data/Binding.h"
-#include "Poco/Data/Bulk.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Range.h"
-#include "Poco/Data/Row.h"
-#include "Poco/Data/SimpleRowFormatter.h"
-#include "Poco/Data/StatementImpl.h"
-#include "Poco/Format.h"
-#include "Poco/Mutex.h"
-#include "Poco/SharedPtr.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class AbstractBinding;
-    class AbstractExtraction;
-    class Session;
-    class Limit;
-
-
-    class Data_API Statement
-    /// A Statement is used to execute SQL statements.
-    /// It does not contain code of its own.
-    /// Its main purpose is to forward calls to the concrete StatementImpl stored inside.
-    /// Statement execution can be synchronous or asynchronous.
-    /// Synchronous ececution is achieved through execute() call, while asynchronous is
-    /// achieved through executeAsync() method call.
-    /// An asynchronously executing statement should not be copied during the execution.
-    ///
-    /// Note:
-    ///
-    /// Once set as asynchronous through 'async' manipulator, statement remains
-    /// asynchronous for all subsequent execution calls, both execute() and executeAsync().
-    /// However, calling executAsync() on a synchronous statement shall execute
-    /// asynchronously but without altering the underlying statement's synchronous nature.
-    ///
-    /// Once asynchronous, a statement can be reverted back to synchronous state in two ways:
-    ///
-    ///   1) By calling setAsync(false)
-    ///   2) By means of 'sync' or 'reset' manipulators
-    ///
-    /// See individual functions documentation for more details.
-    ///
-    /// Statement owns the RowFormatter, which can be provided externally through setFormatter()
-    /// member function.
-    /// If no formatter is externally supplied to the statement, the SimpleRowFormatter is lazy
-    /// created and used.
-    {
-    public:
-        typedef void (*Manipulator)(Statement &);
-
-        typedef ActiveResult<std::size_t> Result;
-        typedef SharedPtr<Result> ResultPtr;
-        typedef ActiveMethod<std::size_t, bool, StatementImpl> AsyncExecMethod;
-        typedef SharedPtr<AsyncExecMethod> AsyncExecMethodPtr;
-
-        static const int WAIT_FOREVER = -1;
-
-        enum Storage
-        {
-            STORAGE_DEQUE = StatementImpl::STORAGE_DEQUE_IMPL,
-            STORAGE_VECTOR = StatementImpl::STORAGE_VECTOR_IMPL,
-            STORAGE_LIST = StatementImpl::STORAGE_LIST_IMPL,
-            STORAGE_UNKNOWN = StatementImpl::STORAGE_UNKNOWN_IMPL
-        };
-
-        Statement(StatementImpl::Ptr pImpl);
-        /// Creates the Statement.
-
-        explicit Statement(Session & session);
-        /// Creates the Statement for the given Session.
-        ///
-        /// The following:
-        ///
-        ///     Statement stmt(sess);
-        ///     stmt << "SELECT * FROM Table", ...
-        ///
-        /// is equivalent to:
-        ///
-        ///     Statement stmt(sess << "SELECT * FROM Table", ...);
-        ///
-        /// but in some cases better readable.
-
-        ~Statement();
-        /// Destroys the Statement.
-
-        Statement(const Statement & stmt);
-        /// Copy constructor.
-        /// If the statement has been executed asynchronously and has not been
-        /// synchronized prior to copy operation (i.e. is copied while executing),
-        /// this constructor shall synchronize it.
-
-        Statement & operator=(const Statement & stmt);
-        /// Assignment operator.
-
-        void swap(Statement & other);
-        /// Swaps the statement with another one.
-
-        template <typename T>
-        Statement & operator<<(const T & t)
-        /// Concatenates data with the SQL statement string.
-        {
-            _pImpl->add(t);
-            return *this;
-        }
-
-        Statement & operator,(Manipulator manip);
-        /// Handles manipulators, such as now, async, etc.
-
-        Statement & operator,(AbstractBinding::Ptr pBind);
-        /// Registers the Binding with the Statement by calling addBind().
-
-        Statement & addBind(AbstractBinding::Ptr pBind);
-        /// Registers a single binding with the statement.
-
-        void removeBind(const std::string & name);
-        /// Removes the all the bindings with specified name from the statement.
-
-        Statement & operator,(AbstractBindingVec & bindVec);
-        /// Registers the Binding vector with the Statement.
-
-        template <typename C>
-        Statement & addBinding(C & bindingCont, bool reset)
-        /// Registers binding container with the Statement.
-        {
-            if (reset)
-                _pImpl->resetBinding();
-            typename C::iterator itAB = bindingCont.begin();
-            typename C::iterator itABEnd = bindingCont.end();
-            for (; itAB != itABEnd; ++itAB)
-                addBind(*itAB);
-            return *this;
-        }
-
-        template <typename C>
-        Statement & bind(const C & value)
-        /// Adds a binding to the Statement. This can be used to implement
-        /// generic binding mechanisms and is a nicer syntax for:
-        ///
-        ///     statement , bind(value);
-        {
-            (*this), Keywords::bind(value);
-            return *this;
-        }
-
-        Statement & operator,(AbstractExtraction::Ptr extract);
-        /// Registers objects used for extracting data with the Statement by
-        /// calling addExtract().
-
-        Statement & operator,(AbstractExtractionVec & extVec);
-        /// Registers the extraction vector with the Statement.
-        /// The vector is registered at position 0 (i.e. for the first returned data set).
-
-        Statement & operator,(AbstractExtractionVecVec & extVecVec);
-        /// Registers the vector of extraction vectors with the Statement.
-
-        template <typename C>
-        Statement & addExtraction(C & val, bool reset)
-        /// Registers extraction container with the Statement.
-        {
-            if (reset)
-                _pImpl->resetExtraction();
-            typename C::iterator itAE = val.begin();
-            typename C::iterator itAEEnd = val.end();
-            for (; itAE != itAEEnd; ++itAE)
-                addExtract(*itAE);
-            return *this;
-        }
-
-        template <typename C>
-        Statement & addExtractions(C & val)
-        /// Registers container of extraction containers with the Statement.
-        {
-            _pImpl->resetExtraction();
-            typename C::iterator itAEV = val.begin();
-            typename C::iterator itAEVEnd = val.end();
-            for (; itAEV != itAEVEnd; ++itAEV)
-                addExtraction(*itAEV, false);
-            return *this;
-        }
-
-        Statement & addExtract(AbstractExtraction::Ptr pExtract);
-        /// Registers a single extraction with the statement.
-
-        Statement & operator,(const Bulk & bulk);
-        /// Sets the bulk execution mode (both binding and extraction) for this
-        /// statement.Statement must not have any extractors or binders set at the
-        /// time when this operator is applied.
-        /// Failure to adhere to the above constraint shall result in
-        /// InvalidAccessException.
-
-        Statement & operator,(BulkFnType);
-        /// Sets the bulk execution mode (both binding and extraction) for this
-        /// statement.Statement must not have any extractors or binders set at the
-        /// time when this operator is applied.
-        /// Additionally, this function requires limit to be set in order to
-        /// determine the bulk size.
-        /// Failure to adhere to the above constraints shall result in
-        /// InvalidAccessException.
-
-        Statement & operator,(const Limit & extrLimit);
-        /// Sets a limit on the maximum number of rows a select is allowed to return.
-        ///
-        /// Set per default to zero to Limit::LIMIT_UNLIMITED, which disables the limit.
-
-        Statement & operator,(RowFormatter::Ptr pRowFformatter);
-        /// Sets the row formatter for the statement.
-
-        Statement & operator,(const Range & extrRange);
-        /// Sets a an extraction range for the maximum number of rows a select is allowed to return.
-        ///
-        /// Set per default to Limit::LIMIT_UNLIMITED which disables the range.
-
-        Statement & operator,(char value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(Poco::UInt8 value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(Poco::Int8 value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(Poco::UInt16 value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(Poco::Int16 value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(Poco::UInt32 value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(Poco::Int32 value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-#ifndef POCO_LONG_IS_64_BIT
-        Statement & operator,(long value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(unsigned long value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-#endif
-        Statement & operator,(Poco::UInt64 value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(Poco::Int64 value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(double value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(float value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(bool value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(const std::string & value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        Statement & operator,(const char * value);
-        /// Adds the value to the list of values to be supplied to the SQL string formatting function.
-
-        const std::string & toString() const;
-        /// Creates a string from the accumulated SQL statement.
-
-        std::size_t execute(bool reset = true);
-        /// Executes the statement synchronously or asynchronously.
-        /// Stops when either a limit is hit or the whole statement was executed.
-        /// Returns the number of rows extracted from the database (for statements
-        /// returning data) or number of rows affected (for all other statements).
-        /// If reset is true (default), associated storage is reset and reused.
-        /// Otherwise, the results from this execution step are appended.
-        /// Reset argument has no meaning for unlimited statements that return all rows.
-        /// If isAsync() returns  true, the statement is executed asynchronously
-        /// and the return value from this function is zero.
-        /// The result of execution (i.e. number of returned or affected rows) can be
-        /// obtained by calling wait() on the statement at a later point in time.
-
-        const Result & executeAsync(bool reset = true);
-        /// Executes the statement asynchronously.
-        /// Stops when either a limit is hit or the whole statement was executed.
-        /// Returns immediately. Calling wait() (on either the result returned from this
-        /// call or the statement itself) returns the number of rows extracted or number
-        /// of rows affected by the statement execution.
-        /// When executed on a synchronous statement, this method does not alter the
-        /// statement's synchronous nature.
-
-        void setAsync(bool async = true);
-        /// Sets the asynchronous flag. If this flag is true, executeAsync() is called
-        /// from the now() manipulator. This setting does not affect the statement's
-        /// capability to be executed synchronously by directly calling execute().
-
-        bool isAsync() const;
-        /// Returns true if statement was marked for asynchronous execution.
-
-        std::size_t wait(long milliseconds = WAIT_FOREVER);
-        /// Waits for the execution completion for asynchronous statements or
-        /// returns immediately for synchronous ones. The return value for
-        /// asynchronous statement is the execution result (i.e. number of
-        /// rows retrieved). For synchronous statements, the return value is zero.
-
-        bool initialized();
-        /// Returns true if the statement was initialized (i.e. not executed yet).
-
-        bool paused();
-        /// Returns true if the statement was paused (a range limit stopped it
-        /// and there is more work to do).
-
-        bool done();
-        /// Returns true if the statement was completely executed or false if a range limit stopped it
-        /// and there is more work to do. When no limit is set, it will always return true after calling execute().
-
-        Statement & reset(Session & session);
-        /// Resets the Statement so that it can be filled with a new SQL command.
-
-        bool canModifyStorage();
-        /// Returns true if statement is in a state that allows the internal storage to be modified.
-
-        Storage storage() const;
-        /// Returns the internal storage type for the statement.
-
-        void setStorage(const std::string & storage);
-        /// Sets the internal storage type for the statement.
-
-        const std::string & getStorage() const;
-        /// Returns the internal storage type for the statement.
-
-        std::size_t columnsExtracted(int dataSet = StatementImpl::USE_CURRENT_DATA_SET) const;
-        /// Returns the number of columns returned for current data set.
-        /// Default value indicates current data set (if any).
-
-        std::size_t rowsExtracted(int dataSet = StatementImpl::USE_CURRENT_DATA_SET) const;
-        /// Returns the number of rows returned for current data set during last statement
-        /// execution. Default value indicates current data set (if any).
-
-        std::size_t subTotalRowCount(int dataSet = StatementImpl::USE_CURRENT_DATA_SET) const;
-        /// Returns the number of rows extracted so far for the data set.
-        /// Default value indicates current data set (if any).
-
-        std::size_t extractionCount() const;
-        /// Returns the number of extraction storage buffers associated
-        /// with the current data set.
-
-        std::size_t dataSetCount() const;
-        /// Returns the number of data sets associated with the statement.
-
-        std::size_t nextDataSet();
-        /// Returns the index of the next data set.
-
-        std::size_t previousDataSet();
-        /// Returns the index of the previous data set.
-
-        bool hasMoreDataSets() const;
-        /// Returns false if the current data set index points to the last
-        /// data set. Otherwise, it returns true.
-
-        void setRowFormatter(RowFormatter::Ptr pRowFormatter);
-        /// Sets the row formatter for this statement.
-        /// Statement takes the ownership of the formatter.
-
-    protected:
-        typedef StatementImpl::Ptr ImplPtr;
-
-        const AbstractExtractionVec & extractions() const;
-        /// Returns the extractions vector.
-
-        const MetaColumn & metaColumn(std::size_t pos) const;
-        /// Returns the type for the column at specified position.
-
-        const MetaColumn & metaColumn(const std::string & name) const;
-        /// Returns the type for the column with specified name.
-
-        bool isNull(std::size_t col, std::size_t row) const;
-        /// Returns true if the current row value at column pos is null.
-
-        bool isBulkExtraction() const;
-        /// Returns true if this statement extracts data in bulk.
-
-        ImplPtr impl() const;
-        /// Returns pointer to statement implementation.
-
-        const RowFormatter::Ptr & getRowFormatter();
-        /// Returns the row formatter for this statement.
-
-        Session session();
-        /// Returns the underlying session.
-
-    private:
-        const Result & doAsyncExec(bool reset = true);
-        /// Asynchronously executes the statement.
-
-        template <typename T>
-        Statement & commaPODImpl(const T & val)
-        {
-            _arguments.push_back(val);
-            return *this;
-        }
-
-        StatementImpl::Ptr _pImpl;
-
-        // asynchronous execution related members
-        bool _async;
-        mutable ResultPtr _pResult;
-        Mutex _mutex;
-        AsyncExecMethodPtr _pAsyncExec;
-        std::vector<Any> _arguments;
-        RowFormatter::Ptr _pRowFormatter;
-        mutable std::string _stmtString;
-    };
-
-    //
-    // inlines
-
-    inline std::size_t Statement::subTotalRowCount(int dataSet) const
-    {
-        return _pImpl->subTotalRowCount(dataSet);
-    }
-
-
-    namespace Keywords
-    {
-
-
-        //
-        // Manipulators
-        //
-
-        inline void Data_API now(Statement & statement)
-        /// Enforces immediate execution of the statement.
-        /// If _isAsync flag has been set, execution is invoked asynchronously.
-        {
-            statement.execute();
-        }
-
-
-        inline void Data_API sync(Statement & statement)
-        /// Sets the _isAsync flag to false, signalling synchronous execution.
-        /// Synchronous execution is default, so specifying this manipulator
-        /// only makes sense if async() was called for the statement before.
-        {
-            statement.setAsync(false);
-        }
-
-
-        inline void Data_API async(Statement & statement)
-        /// Sets the _async flag to true, signalling asynchronous execution.
-        {
-            statement.setAsync(true);
-        }
-
-
-        inline void Data_API deque(Statement & statement)
-        /// Sets the internal storage to std::deque.
-        /// std::deque is default storage, so specifying this manipulator
-        /// only makes sense if list() or deque() were called for the statement before.
-        {
-            if (!statement.canModifyStorage())
-                throw InvalidAccessException("Storage not modifiable.");
-
-            statement.setStorage("deque");
-        }
-
-
-        inline void Data_API vector(Statement & statement)
-        /// Sets the internal storage to std::vector.
-        {
-            if (!statement.canModifyStorage())
-                throw InvalidAccessException("Storage not modifiable.");
-
-            statement.setStorage("vector");
-        }
-
-
-        inline void Data_API list(Statement & statement)
-        /// Sets the internal storage to std::list.
-        {
-            if (!statement.canModifyStorage())
-                throw InvalidAccessException("Storage not modifiable.");
-
-            statement.setStorage("list");
-        }
-
-
-        inline void Data_API reset(Statement & statement)
-        /// Sets all internal settings to their respective default values.
-        {
-            if (!statement.canModifyStorage())
-                throw InvalidAccessException("Storage not modifiable.");
-
-            statement.setStorage("deque");
-            statement.setAsync(false);
-        }
-
-
-    } // namespace Keywords
-
-
-    //
-    // inlines
-    //
-
-    inline Statement &Statement::operator,(RowFormatter::Ptr pRowFformatter)
-    {
-        _pRowFormatter = pRowFformatter;
-        return *this;
-    }
-
-
-    inline Statement &Statement::operator,(char value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(Poco::UInt8 value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(Poco::Int8 value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(Poco::UInt16 value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(Poco::Int16 value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(Poco::UInt32 value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(Poco::Int32 value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-#ifndef POCO_LONG_IS_64_BIT
-    inline Statement &Statement::operator,(long value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(unsigned long value)
-    {
-        return commaPODImpl(value);
-    }
-#endif
-
-
-    inline Statement &Statement::operator,(Poco::UInt64 value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(Poco::Int64 value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(double value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(float value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(bool value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(const std::string &value)
-    {
-        return commaPODImpl(value);
-    }
-
-
-    inline Statement &Statement::operator,(const char *value)
-    {
-        return commaPODImpl(std::string(value));
-    }
-
-
-    inline void Statement::removeBind(const std::string & name)
-    {
-        _pImpl->removeBind(name);
-    }
-
-
-    inline Statement &Statement::operator,(AbstractBinding::Ptr pBind)
-    {
-        return addBind(pBind);
-    }
-
-
-    inline Statement &Statement::operator,(AbstractBindingVec &bindVec)
-    {
-        return addBinding(bindVec, false);
-    }
-
-
-    inline Statement &Statement::operator,(AbstractExtraction::Ptr pExtract)
-    {
-        return addExtract(pExtract);
-    }
-
-
-    inline Statement &Statement::operator,(AbstractExtractionVec &extVec)
-    {
-        return addExtraction(extVec, false);
-    }
-
-
-    inline Statement &Statement::operator,(AbstractExtractionVecVec &extVecVec)
-    {
-        return addExtractions(extVecVec);
-    }
-
-
-    inline Statement::ImplPtr Statement::impl() const
-    {
-        return _pImpl;
-    }
-
-
-    inline const std::string & Statement::toString() const
-    {
-        return _stmtString = _pImpl->toString();
-    }
-
-    inline const AbstractExtractionVec & Statement::extractions() const
-    {
-        return _pImpl->extractions();
-    }
-
-
-    inline const MetaColumn & Statement::metaColumn(std::size_t pos) const
-    {
-        return _pImpl->metaColumn(pos);
-    }
-
-
-    inline const MetaColumn & Statement::metaColumn(const std::string & name) const
-    {
-        return _pImpl->metaColumn(name);
-    }
-
-
-    inline void Statement::setStorage(const std::string & storage)
-    {
-        _pImpl->setStorage(storage);
-    }
-
-
-    inline std::size_t Statement::extractionCount() const
-    {
-        return _pImpl->extractionCount();
-    }
-
-
-    inline std::size_t Statement::columnsExtracted(int dataSet) const
-    {
-        return _pImpl->columnsExtracted(dataSet);
-    }
-
-
-    inline std::size_t Statement::rowsExtracted(int dataSet) const
-    {
-        return _pImpl->rowsExtracted(dataSet);
-    }
-
-
-    inline std::size_t Statement::dataSetCount() const
-    {
-        return _pImpl->dataSetCount();
-    }
-
-
-    inline std::size_t Statement::nextDataSet()
-    {
-        return _pImpl->activateNextDataSet();
-    }
-
-
-    inline std::size_t Statement::previousDataSet()
-    {
-        return _pImpl->activatePreviousDataSet();
-    }
-
-
-    inline bool Statement::hasMoreDataSets() const
-    {
-        return _pImpl->hasMoreDataSets();
-    }
-
-
-    inline Statement::Storage Statement::storage() const
-    {
-        return static_cast<Storage>(_pImpl->getStorage());
-    }
-
-
-    inline bool Statement::canModifyStorage()
-    {
-        return (0 == extractionCount()) && (initialized() || done());
-    }
-
-
-    inline bool Statement::initialized()
-    {
-        return _pImpl->getState() == StatementImpl::ST_INITIALIZED;
-    }
-
-
-    inline bool Statement::paused()
-    {
-        return _pImpl->getState() == StatementImpl::ST_PAUSED;
-    }
-
-
-    inline bool Statement::done()
-    {
-        return _pImpl->getState() == StatementImpl::ST_DONE;
-    }
-
-
-    inline bool Statement::isNull(std::size_t col, std::size_t row) const
-    {
-        return _pImpl->isNull(col, row);
-    }
-
-
-    inline bool Statement::isBulkExtraction() const
-    {
-        return _pImpl->isBulkExtraction();
-    }
-
-
-    inline bool Statement::isAsync() const
-    {
-        return _async;
-    }
-
-
-    inline void Statement::setRowFormatter(RowFormatter::Ptr pRowFormatter)
-    {
-        _pRowFormatter = pRowFormatter;
-    }
-
-
-    inline const RowFormatter::Ptr & Statement::getRowFormatter()
-    {
-        if (!_pRowFormatter)
-            _pRowFormatter = new SimpleRowFormatter;
-        return _pRowFormatter;
-    }
-
-
-    inline void swap(Statement & s1, Statement & s2)
-    {
-        s1.swap(s2);
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-namespace std
-{
-template <>
-inline void swap<Poco::Data::Statement>(Poco::Data::Statement & s1, Poco::Data::Statement & s2)
-/// Full template specalization of std:::swap for Statement
-{
-    s1.swap(s2);
-}
-}
-
-
-#endif // Data_Statement_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/StatementCreator.h b/contrib/poco/Data/include/Poco/Data/StatementCreator.h
deleted file mode 100644
index 7ff12f0a2..000000000
--- a/contrib/poco/Data/include/Poco/Data/StatementCreator.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// StatementCreator.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  StatementCreator
-//
-// Definition of the StatementCreator class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_StatementCreator_INCLUDED
-#define Data_StatementCreator_INCLUDED
-
-
-#include "Poco/AutoPtr.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/SessionImpl.h"
-#include "Poco/Data/Statement.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API StatementCreator
-    /// A StatementCreator creates Statements.
-    {
-    public:
-        StatementCreator();
-        /// Creates an uninitialized StatementCreator.
-
-        StatementCreator(Poco::AutoPtr<SessionImpl> ptrImpl);
-        /// Creates a StatementCreator.
-
-        StatementCreator(const StatementCreator & other);
-        /// Creates a StatementCreator by copying another one.
-
-        ~StatementCreator();
-        /// Destroys the StatementCreator.
-
-        StatementCreator & operator=(const StatementCreator & other);
-        /// Assignment operator.
-
-        void swap(StatementCreator & other);
-        /// Swaps the StatementCreator with another one.
-
-        template <typename T>
-        Statement operator<<(const T & t)
-        /// Creates a Statement.
-        {
-            if (!_ptrImpl->isConnected())
-                throw NotConnectedException(_ptrImpl->connectionString());
-
-            Statement stmt(_ptrImpl->createStatementImpl());
-            stmt << t;
-            return stmt;
-        }
-
-    private:
-        Poco::AutoPtr<SessionImpl> _ptrImpl;
-    };
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_StatementCreator_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/StatementImpl.h b/contrib/poco/Data/include/Poco/Data/StatementImpl.h
deleted file mode 100644
index bd6322ec8..000000000
--- a/contrib/poco/Data/include/Poco/Data/StatementImpl.h
+++ /dev/null
@@ -1,635 +0,0 @@
-//
-// StatementImpl.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  StatementImpl
-//
-// Definition of the StatementImpl class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_StatementImpl_INCLUDED
-#define Data_StatementImpl_INCLUDED
-
-
-#include <deque>
-#include <list>
-#include <sstream>
-#include <string>
-#include <vector>
-#include "Poco/Data/AbstractBinding.h"
-#include "Poco/Data/AbstractExtraction.h"
-#include "Poco/Data/Bulk.h"
-#include "Poco/Data/BulkExtraction.h"
-#include "Poco/Data/Column.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Extraction.h"
-#include "Poco/Data/Range.h"
-#include "Poco/Data/SessionImpl.h"
-#include "Poco/Exception.h"
-#include "Poco/Format.h"
-#include "Poco/RefCountedObject.h"
-#include "Poco/String.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API StatementImpl
-    /// StatementImpl interface that subclasses must implement to define database dependent query execution.
-    ///
-    /// StatementImpl's are noncopyable.
-    {
-    public:
-        typedef Poco::SharedPtr<StatementImpl> Ptr;
-
-        enum State
-        {
-            ST_INITIALIZED,
-            ST_COMPILED,
-            ST_BOUND,
-            ST_PAUSED,
-            ST_DONE,
-            ST_RESET
-        };
-
-        enum Storage
-        {
-            STORAGE_DEQUE_IMPL,
-            STORAGE_VECTOR_IMPL,
-            STORAGE_LIST_IMPL,
-            STORAGE_UNKNOWN_IMPL
-        };
-
-        enum BulkType
-        {
-            BULK_UNDEFINED,
-            /// Bulk mode not defined yet.
-            BULK_BINDING,
-            /// Binding in bulk mode.
-            /// If extraction is present in the same statement,
-            /// it must also be bulk.
-            BULK_EXTRACTION,
-            /// Extraction in bulk mode.
-            /// If binding is present in the same statement,
-            /// it must also be bulk.
-            BULK_FORBIDDEN
-            /// Bulk forbidden.
-            /// Happens when the statement has already been
-            /// configured as non-bulk.
-        };
-
-        static const std::string DEQUE;
-        static const std::string VECTOR;
-        static const std::string LIST;
-        static const std::string UNKNOWN;
-
-        static const int USE_CURRENT_DATA_SET = -1;
-
-        StatementImpl(SessionImpl & rSession);
-        /// Creates the StatementImpl.
-
-        virtual ~StatementImpl();
-        /// Destroys the StatementImpl.
-
-        template <typename T>
-        void add(const T & t)
-        /// Appends SQL statement (fragments).
-        {
-            _ostr << t;
-        }
-
-        void addBind(AbstractBinding::Ptr pBinding);
-        /// Registers the Binding with the StatementImpl.
-
-        void removeBind(const std::string & name);
-        /// Unregisters all the bindings having specified name with the StatementImpl.
-        /// Bindings are released and, if this class was the sole owner, deleted.
-
-        void addExtract(AbstractExtraction::Ptr pExtraction);
-        /// Registers objects used for extracting data with the StatementImpl.
-
-        void setExtractionLimit(const Limit & extrLimit);
-        /// Changes the extractionLimit to extrLimit.
-        /// Per default no limit (EXTRACT_UNLIMITED) is set.
-
-        std::string toString() const;
-        /// Create a string version of the SQL statement.
-
-        std::size_t execute(const bool & reset = true);
-        /// Executes a statement. Returns the number of rows
-        /// extracted for statements returning data or number of rows
-        /// affected for all other statements (insert, update, delete).
-        /// If reset is true (default), the underlying bound storage is
-        /// reset and reused. In case of containers, this means they are
-        /// cleared and resized to accommodate the number of rows returned by
-        /// this execution step. When reset is false, data is appended to the
-        /// bound containers during multiple execute calls.
-
-        void reset();
-        /// Resets the statement, so that we can reuse all bindings and re-execute again.
-
-        State getState() const;
-        /// Returns the state of the Statement.
-
-        void setStorage(Storage storage);
-        /// Sets the storage type for this statement;
-
-        void setStorage(const std::string & storage);
-        /// Sets the storage type for this statement;
-
-        Storage getStorage() const;
-        /// Returns the storage type for this statement.
-
-        std::size_t extractionCount() const;
-        /// Returns the number of extraction storage buffers associated
-        /// with the statement.
-
-        std::size_t dataSetCount() const;
-        /// Returns the number of data sets associated with the statement.
-
-    protected:
-        virtual std::size_t columnsReturned() const = 0;
-        /// Returns number of columns returned by query.
-
-        virtual int affectedRowCount() const = 0;
-        /// Returns the number of affected rows.
-        /// Used to find out the number of rows affected by insert, delete or update.
-        ///
-        /// Some back-ends may return a negative number in certain circumstances (e.g.
-        /// some ODBC drivers when this function is called after a select statement
-        /// execution).
-
-        virtual const MetaColumn & metaColumn(std::size_t pos) const = 0;
-        /// Returns column meta data.
-
-        const MetaColumn & metaColumn(const std::string & name) const;
-        /// Returns column meta data.
-
-        virtual bool hasNext() = 0;
-        /// Returns true if a call to next() will return data.
-        ///
-        /// Note that the implementation must support
-        /// several consecutive calls to hasNext without data getting lost,
-        /// ie. hasNext(); hasNext(); next() must be equal to hasNext(); next();
-
-        virtual std::size_t next() = 0;
-        /// Retrieves the next row or set of rows from the resultset and
-        /// returns the number of rows retrieved.
-        ///
-        /// Will throw, if the resultset is empty.
-        /// Expects the statement to be compiled and bound.
-
-        virtual bool canBind() const = 0;
-        /// Returns true if another bind is possible.
-
-        virtual bool canCompile() const = 0;
-        /// Returns true if another compile is possible.
-
-        virtual void compileImpl() = 0;
-        /// Compiles the statement, doesn't bind yet.
-
-        virtual void bindImpl() = 0;
-        /// Binds parameters.
-
-        virtual AbstractExtraction::ExtractorPtr extractor() = 0;
-        /// Returns the concrete extractor used by the statement.
-
-        const AbstractExtractionVec & extractions() const;
-        /// Returns the const reference to extractions vector.
-
-        AbstractExtractionVec & extractions();
-        /// Returns the reference to extractions vector.
-
-        void fixupExtraction();
-        /// Sets the AbstractExtractor at the extractors.
-
-        Limit::SizeT getExtractionLimit();
-        /// Returns the extraction limit value.
-
-        const Limit & extractionLimit() const;
-        /// Returns the extraction limit.
-
-        std::size_t columnsExtracted(int dataSet = USE_CURRENT_DATA_SET) const;
-        /// Returns the number of columns that the extractors handle.
-
-        std::size_t rowsExtracted(int dataSet = USE_CURRENT_DATA_SET) const;
-        /// Returns the number of rows extracted for current data set.
-        /// Default value (USE_CURRENT_DATA_SET) indicates current data set (if any).
-
-        std::size_t subTotalRowCount(int dataSet = USE_CURRENT_DATA_SET) const;
-        /// Returns the number of rows extracted so far for the data set.
-        /// Default value indicates current data set (if any).
-
-        void makeExtractors(std::size_t count);
-        /// Determines the type of the internal extraction container and
-        /// calls the extraction creation function (addInternalExtract)
-        /// with appropriate data type and container type arguments.
-        ///
-        /// This function is only called in cases when there is data
-        /// returned by query, but no data storage supplied by user.
-        ///
-        /// The type of the internal container is determined in the
-        /// following order:
-        /// 1. If statement has the container type set, the type is used.
-        /// 2. If statement does not have the container type set,
-        ///    session is queried for container type setting. If the
-        ///    session container type setting is found, it is used.
-        /// 3. If neither session nor statement have the internal
-        ///    container type set, std::deque is used.
-        ///
-        /// Supported internal extraction container types are:
-        /// - std::deque (default)
-        /// - std::vector
-        /// - std::list
-
-        SessionImpl & session();
-        /// Rteurns session associated with this statement.
-
-        virtual AbstractBinding::BinderPtr binder() = 0;
-        /// Returns the concrete binder used by the statement.
-
-        const AbstractBindingVec & bindings() const;
-        /// Returns the const reference to bindings vector.
-
-        AbstractBindingVec & bindings();
-        /// Returns the reference to bindings.
-
-        void fixupBinding();
-        /// Sets the AbstractBinder at the bindings.
-
-        void resetBinding();
-        /// Resets binding so it can be reused again.
-
-        virtual bool isStoredProcedure() const;
-        /// Returns true if the statement is stored procedure.
-        /// Used as a help to determine whether to automatically create the
-        /// internal extractions when no outside extraction is supplied.
-        /// The reason for this function is to prevent unnecessary internal
-        /// extraction creation in cases (behavior exhibited by some ODBC drivers)
-        /// when there is data available from the stored procedure call
-        /// statement execution but no external extraction is supplied (as is
-        /// usually the case when stored procedures are called). In such cases
-        /// no storage is needed because output parameters serve as storage.
-        /// At the Data framework level, this function always returns false.
-        /// When connector-specific behavior is desired, it should be overridden
-        /// by the statement implementation.
-
-        std::size_t currentDataSet() const;
-        /// Returns the current data set.
-
-        std::size_t activateNextDataSet();
-        /// Returns the next data set index, or throws NoDataException if the last
-        /// data set was reached.
-
-        std::size_t activatePreviousDataSet();
-        /// Returns the previous data set index, or throws NoDataException if the last
-        /// data set was reached.
-
-        bool hasMoreDataSets() const;
-        /// Returns true if there are data sets not activated yet.
-
-    private:
-        void compile();
-        /// Compiles the statement.
-
-        void bind();
-        /// Binds the statement, if not yet bound.
-
-        std::size_t executeWithLimit();
-        /// Executes with an upper limit set. Returns the number of rows
-        /// extracted for statements returning data or number of rows
-        /// affected for all other statements (insert, update, delete).
-
-        std::size_t executeWithoutLimit();
-        /// Executes without an upper limit set. Returns the number of rows
-        /// extracted for statements returning data or number of rows
-        /// affected for all other statements (insert, update, delete).
-
-        void resetExtraction();
-        /// Resets extraction so it can be reused again.
-
-        template <class C>
-        SharedPtr<InternalExtraction<C>> createExtract(const MetaColumn & mc)
-        {
-            C * pData = new C;
-            Column<C> * pCol = new Column<C>(mc, pData);
-            return new InternalExtraction<C>(*pData, pCol, Poco::UInt32(currentDataSet()));
-        }
-
-        template <class C>
-        SharedPtr<InternalBulkExtraction<C>> createBulkExtract(const MetaColumn & mc)
-        {
-            C * pData = new C;
-            Column<C> * pCol = new Column<C>(mc, pData);
-            return new InternalBulkExtraction<C>(
-                *pData, pCol, static_cast<Poco::UInt32>(getExtractionLimit()), Position(static_cast<Poco::UInt32>(currentDataSet())));
-        }
-
-        template <class T>
-        void addInternalExtract(const MetaColumn & mc)
-        /// Creates and adds the internal extraction.
-        ///
-        /// The decision about internal extraction container is done
-        /// in a following way:
-        ///
-        /// If this statement has _storage member set, that setting
-        /// overrides the session setting for storage, otherwise the
-        /// session setting is used.
-        /// If neither this statement nor the session have the storage
-        /// type set, std::deque is the default container type used.
-        {
-            std::string storage;
-
-            switch (_storage)
-            {
-                case STORAGE_DEQUE_IMPL:
-                    storage = DEQUE;
-                    break;
-                case STORAGE_VECTOR_IMPL:
-                    storage = VECTOR;
-                    break;
-                case STORAGE_LIST_IMPL:
-                    storage = LIST;
-                    break;
-                case STORAGE_UNKNOWN_IMPL:
-                    storage = AnyCast<std::string>(session().getProperty("storage"));
-                    break;
-            }
-
-            if (storage.empty())
-                storage = DEQUE;
-
-            if (0 == icompare(DEQUE, storage))
-            {
-                if (!isBulkExtraction())
-                    addExtract(createExtract<std::deque<T>>(mc));
-                else
-                    addExtract(createBulkExtract<std::deque<T>>(mc));
-            }
-            else if (0 == icompare(VECTOR, storage))
-            {
-                if (!isBulkExtraction())
-                    addExtract(createExtract<std::vector<T>>(mc));
-                else
-                    addExtract(createBulkExtract<std::vector<T>>(mc));
-            }
-            else if (0 == icompare(LIST, storage))
-            {
-                if (!isBulkExtraction())
-                    addExtract(createExtract<std::list<T>>(mc));
-                else
-                    addExtract(createBulkExtract<std::list<T>>(mc));
-            }
-        }
-
-        bool isNull(std::size_t col, std::size_t row) const;
-        /// Returns true if the value in [col, row] is null.
-
-        void forbidBulk();
-        /// Forbids bulk operations.
-
-        void setBulkBinding();
-        /// Sets the bulk binding flag.
-
-        void setBulkExtraction(const Bulk & l);
-        /// Sets the bulk extraction flag and extraction limit.
-
-        void resetBulk();
-        /// Resets the bulk extraction and binding flag.
-
-        bool bulkBindingAllowed() const;
-        /// Returns true if statement can be set to bind data in bulk.
-        /// Once bulk binding is set for a statement, it can be
-        /// neither altered nor mixed with non-bulk mode binding.
-
-        bool bulkExtractionAllowed() const;
-        /// Returns true if statement can be set to extract data in bulk.
-        /// Once bulk extraction is set for a statement, it can be
-        /// neither altered nor mixed with non-bulk mode extraction.
-
-        bool isBulkBinding() const;
-        /// Returns true if statement is set to bind data in bulk.
-
-        bool isBulkExtraction() const;
-        /// Returns true if statement is set to extract data in bulk.
-
-        bool isBulkSupported() const;
-        /// Returns true if connector and session support bulk operation.
-
-        void formatSQL(std::vector<Any> & arguments);
-        /// Formats the SQL string by filling in placeholders with values from supplied vector.
-
-        void assignSubTotal(bool reset);
-
-        StatementImpl(const StatementImpl & stmt);
-        StatementImpl & operator=(const StatementImpl & stmt);
-
-        typedef std::vector<std::size_t> CountVec;
-
-        State _state;
-        Limit _extrLimit;
-        std::size_t _lowerLimit;
-        std::vector<int> _columnsExtracted;
-        SessionImpl & _rSession;
-        Storage _storage;
-        std::ostringstream _ostr;
-        AbstractBindingVec _bindings;
-        AbstractExtractionVecVec _extractors;
-        std::size_t _curDataSet;
-        BulkType _bulkBinding;
-        BulkType _bulkExtraction;
-        CountVec _subTotalRowCount;
-
-        friend class Statement;
-    };
-
-
-    //
-    // inlines
-    //
-
-
-    inline void StatementImpl::addBind(AbstractBinding::Ptr pBinding)
-    {
-        poco_check_ptr(pBinding);
-        _bindings.push_back(pBinding);
-    }
-
-
-    inline std::string StatementImpl::toString() const
-    {
-        return _ostr.str();
-    }
-
-
-    inline const AbstractBindingVec & StatementImpl::bindings() const
-    {
-        return _bindings;
-    }
-
-
-    inline AbstractBindingVec & StatementImpl::bindings()
-    {
-        return _bindings;
-    }
-
-
-    inline const AbstractExtractionVec & StatementImpl::extractions() const
-    {
-        poco_assert(_curDataSet < _extractors.size());
-        return _extractors[_curDataSet];
-    }
-
-
-    inline AbstractExtractionVec & StatementImpl::extractions()
-    {
-        poco_assert(_curDataSet < _extractors.size());
-        return _extractors[_curDataSet];
-    }
-
-
-    inline StatementImpl::State StatementImpl::getState() const
-    {
-        return _state;
-    }
-
-
-    inline SessionImpl & StatementImpl::session()
-    {
-        return _rSession;
-    }
-
-
-    inline void StatementImpl::setStorage(Storage storage)
-    {
-        _storage = storage;
-    }
-
-
-    inline StatementImpl::Storage StatementImpl::getStorage() const
-    {
-        return _storage;
-    }
-
-
-    inline std::size_t StatementImpl::extractionCount() const
-    {
-        return static_cast<std::size_t>(extractions().size());
-    }
-
-
-    inline std::size_t StatementImpl::dataSetCount() const
-    {
-        return static_cast<std::size_t>(_extractors.size());
-    }
-
-
-    inline bool StatementImpl::isStoredProcedure() const
-    {
-        return false;
-    }
-
-
-    inline bool StatementImpl::isNull(std::size_t col, std::size_t row) const
-    {
-        try
-        {
-            return extractions().at(col)->isNull(row);
-        }
-        catch (std::out_of_range & ex)
-        {
-            throw RangeException(ex.what());
-        }
-    }
-
-
-    inline std::size_t StatementImpl::currentDataSet() const
-    {
-        return _curDataSet;
-    }
-
-
-    inline Limit::SizeT StatementImpl::getExtractionLimit()
-    {
-        return _extrLimit.value();
-    }
-
-
-    inline const Limit & StatementImpl::extractionLimit() const
-    {
-        return _extrLimit;
-    }
-
-
-    inline void StatementImpl::forbidBulk()
-    {
-        _bulkBinding = BULK_FORBIDDEN;
-        _bulkExtraction = BULK_FORBIDDEN;
-    }
-
-
-    inline void StatementImpl::setBulkBinding()
-    {
-        _bulkBinding = BULK_BINDING;
-    }
-
-
-    inline bool StatementImpl::bulkBindingAllowed() const
-    {
-        return BULK_UNDEFINED == _bulkBinding || BULK_BINDING == _bulkBinding;
-    }
-
-
-    inline bool StatementImpl::bulkExtractionAllowed() const
-    {
-        return BULK_UNDEFINED == _bulkExtraction || BULK_EXTRACTION == _bulkExtraction;
-    }
-
-
-    inline bool StatementImpl::isBulkBinding() const
-    {
-        return BULK_BINDING == _bulkBinding;
-    }
-
-
-    inline bool StatementImpl::isBulkExtraction() const
-    {
-        return BULK_EXTRACTION == _bulkExtraction;
-    }
-
-
-    inline void StatementImpl::resetBulk()
-    {
-        _bulkExtraction = BULK_UNDEFINED;
-        _bulkBinding = BULK_UNDEFINED;
-        setExtractionLimit(Limit(Limit::LIMIT_UNLIMITED, false, false));
-    }
-
-
-    inline bool StatementImpl::isBulkSupported() const
-    {
-        return _rSession.getFeature("bulk");
-    }
-
-
-    inline bool StatementImpl::hasMoreDataSets() const
-    {
-        return currentDataSet() + 1 < dataSetCount();
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_StatementImpl_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Time.h b/contrib/poco/Data/include/Poco/Data/Time.h
deleted file mode 100644
index dfd7ca919..000000000
--- a/contrib/poco/Data/include/Poco/Data/Time.h
+++ /dev/null
@@ -1,221 +0,0 @@
-//
-// Time.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Time
-//
-// Definition of the Time class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Time_INCLUDED
-#define Data_Time_INCLUDED
-
-
-#include "Poco/Data/Data.h"
-#include "Poco/Dynamic/VarHolder.h"
-#include "Poco/Exception.h"
-
-
-namespace Poco
-{
-
-namespace Dynamic
-{
-
-    class Var;
-
-}
-
-class DateTime;
-
-namespace Data
-{
-
-
-    class Date;
-
-
-    class Data_API Time
-    /// Time class wraps a DateTime and exposes time related interface.
-    /// The purpose of this class is binding/extraction support for time fields.
-    {
-    public:
-        Time();
-        /// Creates the Time
-
-        Time(int hour, int minute, int second);
-        /// Creates the Time
-
-        Time(const DateTime & dt);
-        /// Creates the Time from DateTime
-
-        ~Time();
-        /// Destroys the Time.
-
-        int hour() const;
-        /// Returns the hour.
-
-        int minute() const;
-        /// Returns the minute.
-
-        int second() const;
-        /// Returns the second.
-
-        void assign(int hour, int minute, int second);
-        /// Assigns time.
-
-        Time & operator=(const Time & t);
-        /// Assignment operator for Time.
-
-        Time & operator=(const DateTime & dt);
-        /// Assignment operator for DateTime.
-
-        Time & operator=(const Poco::Dynamic::Var & var);
-        /// Assignment operator for Var.
-
-        bool operator==(const Time & time) const;
-        /// Equality operator.
-
-        bool operator!=(const Time & time) const;
-        /// Inequality operator.
-
-        bool operator<(const Time & time) const;
-        /// Less then operator.
-
-        bool operator>(const Time & time) const;
-        /// Greater then operator.
-
-    private:
-        int _hour;
-        int _minute;
-        int _second;
-    };
-
-
-    //
-    // inlines
-    //
-    inline int Time::hour() const
-    {
-        return _hour;
-    }
-
-
-    inline int Time::minute() const
-    {
-        return _minute;
-    }
-
-
-    inline int Time::second() const
-    {
-        return _second;
-    }
-
-
-    inline Time & Time::operator=(const Time & t)
-    {
-        assign(t.hour(), t.minute(), t.second());
-        return *this;
-    }
-
-
-    inline Time & Time::operator=(const DateTime & dt)
-    {
-        assign(dt.hour(), dt.minute(), dt.second());
-        return *this;
-    }
-
-
-    inline bool Time::operator==(const Time & time) const
-    {
-        return _hour == time.hour() && _minute == time.minute() && _second == time.second();
-    }
-
-
-    inline bool Time::operator!=(const Time & time) const
-    {
-        return !(*this == time);
-    }
-
-
-    inline bool Time::operator>(const Time & time) const
-    {
-        return !(*this == time) && !(*this < time);
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-//
-// VarHolderImpl<Time>
-//
-
-
-namespace Poco
-{
-namespace Dynamic
-{
-
-
-    template <>
-    class VarHolderImpl<Poco::Data::Time> : public VarHolder
-    {
-    public:
-        VarHolderImpl(const Poco::Data::Time & val) : _val(val) { }
-
-        ~VarHolderImpl() { }
-
-        const std::type_info & type() const { return typeid(Poco::Data::Time); }
-
-        void convert(Poco::Timestamp & val) const
-        {
-            Poco::DateTime dt;
-            dt.assign(dt.year(), dt.month(), dt.day(), _val.hour(), _val.minute(), _val.second());
-            val = dt.timestamp();
-        }
-
-        void convert(Poco::DateTime & val) const
-        {
-            Poco::DateTime dt;
-            dt.assign(dt.year(), dt.month(), dt.day(), _val.hour(), _val.minute(), _val.second());
-            val = dt;
-        }
-
-        void convert(Poco::LocalDateTime & val) const
-        {
-            Poco::LocalDateTime ldt;
-            ldt.assign(ldt.year(), ldt.month(), ldt.day(), _val.hour(), _val.minute(), _val.second());
-            val = ldt;
-        }
-
-        void convert(std::string & val) const
-        {
-            DateTime dt(0, 1, 1, _val.hour(), _val.minute(), _val.second());
-            val = DateTimeFormatter::format(dt, "%H:%M:%S");
-        }
-
-        VarHolder * clone(Placeholder<VarHolder> * pVarHolder = 0) const { return cloneHolder(pVarHolder, _val); }
-
-        const Poco::Data::Time & value() const { return _val; }
-
-    private:
-        VarHolderImpl();
-        Poco::Data::Time _val;
-    };
-
-
-}
-} // namespace Poco::Dynamic
-
-
-#endif // Data_Time_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/Transaction.h b/contrib/poco/Data/include/Poco/Data/Transaction.h
deleted file mode 100644
index ed4c3446f..000000000
--- a/contrib/poco/Data/include/Poco/Data/Transaction.h
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// Transaction.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  Transaction
-//
-// Definition of the Transaction class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Transaction_INCLUDED
-#define Data_Transaction_INCLUDED
-
-
-#include "Poco/Data/Data.h"
-#include "Poco/Data/Session.h"
-#include "Poco/Logger.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class Data_API Transaction
-    /// Transaction helps with transactions in domain logic.
-    /// When an Transaction object is created, it first checks whether a
-    /// transaction is in progress. If not, a new transaction is created.
-    /// When the Transaction is destroyed, and commit() has been called,
-    /// nothing is done. Otherwise, the current transaction is rolled back.
-    /// See Transaction for more details and purpose of this template.
-    {
-    public:
-        Transaction(Poco::Data::Session & session, Poco::Logger * pLogger = 0);
-        /// Creates the Transaction and starts it, using the given database session and logger.
-
-        Transaction(Poco::Data::Session & session, bool start);
-        /// Creates the Transaction, using the given database session.
-        /// If start is true, transaction is started, otherwise begin() must be called
-        /// to start the transaction.
-
-        template <typename T>
-        Transaction(Poco::Data::Session & rSession, T & t, Poco::Logger * pLogger = 0) : _rSession(rSession), _pLogger(pLogger)
-        /// Creates the Transaction, using the given database session, transactor and logger.
-        /// The transactor type must provide operator () overload taking non-const Session
-        /// reference as an argument.
-        ///
-        /// When transaction is created using this constructor, it is executed and
-        /// committed automatically. If no error occurs, rollback is disabled and does
-        /// not occur at destruction time. If an error occurs resulting in exception being
-        /// thrown, the transaction is rolled back and exception propagated to calling code.
-        ///
-        /// Example usage:
-        ///
-        /// struct Transactor
-        /// {
-        ///		void operator () (Session& session) const
-        ///		{
-        ///			// do something ...
-        ///		}
-        /// };
-        ///
-        /// Transactor tr;
-        /// Transaction tn(session, tr);
-        {
-            try
-            {
-                transact(t);
-            }
-            catch (...)
-            {
-                if (_pLogger)
-                    _pLogger->error("Error executing transaction.");
-                rollback();
-                throw;
-            }
-        }
-
-        ~Transaction();
-        /// Destroys the Transaction.
-        /// Rolls back the current database transaction if it has not been committed
-        /// (by calling commit()), or rolled back (by calling rollback()).
-        ///
-        /// If an exception is thrown during rollback, the exception is logged
-        /// and no further action is taken.
-
-        void setIsolation(Poco::UInt32 ti);
-        /// Sets the transaction isolation level.
-
-        Poco::UInt32 getIsolation();
-        /// Returns the transaction isolation level.
-
-        bool hasIsolation(Poco::UInt32 ti);
-        /// Returns true iff the transaction isolation level corresponding
-        /// to the supplied bitmask is supported.
-
-        bool isIsolation(Poco::UInt32 ti);
-        /// Returns true iff the transaction isolation level corresponds
-        /// to the supplied bitmask.
-
-        void execute(const std::string & sql, bool doCommit = true);
-        /// Executes and, if doCommit is true, commits the transaction.
-        /// Passing true value for commit disables rollback during destruction
-        /// of this Transaction object.
-
-        void execute(const std::vector<std::string> & sql);
-        /// Executes all the SQL statements supplied in the vector and, after the last
-        /// one is successfully executed, commits the transaction.
-        /// If an error occurs during execution, transaction is rolled back.
-        /// Passing true value for commit disables rollback during destruction
-        /// of this Transaction object.
-
-        template <typename T>
-        void transact(T & t)
-        /// Executes the transactor and, unless transactor throws an exception,
-        /// commits the transaction.
-        {
-            if (!isActive())
-                begin();
-            t(_rSession);
-            commit();
-        }
-
-        void commit();
-        /// Commits the current transaction.
-
-        void rollback();
-        /// Rolls back the current transaction.
-
-        bool isActive();
-        /// Returns false after the transaction has been committed or rolled back,
-        /// true if the transaction is ongoing.
-
-        void setLogger(Poco::Logger * pLogger);
-        /// Sets the logger for this transaction.
-        /// Transaction does not take the ownership of the pointer.
-
-    private:
-        Transaction();
-        Transaction(const Transaction &);
-        Transaction & operator=(const Transaction &);
-
-        void begin();
-        /// Begins the transaction if the session is already not in transaction.
-        /// Otherwise does nothing.
-
-        Session _rSession;
-        Logger * _pLogger;
-    };
-
-
-    inline bool Transaction::isActive()
-    {
-        return _rSession.isTransaction();
-    }
-
-
-    inline void Transaction::setIsolation(Poco::UInt32 ti)
-    {
-        _rSession.setTransactionIsolation(ti);
-    }
-
-
-    inline Poco::UInt32 Transaction::getIsolation()
-    {
-        return _rSession.getTransactionIsolation();
-    }
-
-
-    inline bool Transaction::hasIsolation(Poco::UInt32 ti)
-    {
-        return _rSession.isTransactionIsolation(ti);
-    }
-
-
-    inline bool Transaction::isIsolation(Poco::UInt32 ti)
-    {
-        return _rSession.isTransactionIsolation(ti);
-    }
-
-
-    inline void Transaction::setLogger(Poco::Logger * pLogger)
-    {
-        _pLogger = pLogger;
-    }
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_Transaction_INCLUDED
diff --git a/contrib/poco/Data/include/Poco/Data/TypeHandler.h b/contrib/poco/Data/include/Poco/Data/TypeHandler.h
deleted file mode 100644
index e7633de70..000000000
--- a/contrib/poco/Data/include/Poco/Data/TypeHandler.h
+++ /dev/null
@@ -1,1906 +0,0 @@
-//
-// TypeHandler.h
-//
-// Library: Data
-// Package: DataCore
-// Module:  TypeHandler
-//
-// Definition of the TypeHandler class.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_TypeHandler_INCLUDED
-#define Data_TypeHandler_INCLUDED
-
-
-#include <cstddef>
-#include "Poco/AutoPtr.h"
-#include "Poco/Data/AbstractBinder.h"
-#include "Poco/Data/AbstractExtractor.h"
-#include "Poco/Data/AbstractPreparator.h"
-#include "Poco/Data/Data.h"
-#include "Poco/Nullable.h"
-#include "Poco/SharedPtr.h"
-#include "Poco/Tuple.h"
-
-
-namespace Poco
-{
-namespace Data
-{
-
-
-    class AbstractTypeHandler
-    /// Parent class for type handlers.
-    /// The reason for this class is to prevent instantiations of type handlers.
-    /// For documentation on type handlers, see TypeHandler class.
-    {
-    protected:
-        AbstractTypeHandler();
-        ~AbstractTypeHandler();
-        AbstractTypeHandler(const AbstractTypeHandler &);
-        AbstractTypeHandler & operator=(const AbstractTypeHandler &);
-    };
-
-
-    template <class T>
-    class TypeHandler : public AbstractTypeHandler
-    /// Converts Rows to a Type and the other way around. Provide template specializations to support your own complex types.
-    ///
-    /// Take as example the following (simplified) class:
-    ///	class Person
-    ///	{
-    ///	private:
-    ///		std::string _lastName;
-    ///		std::string _firstName;
-    ///		int		 _age;
-    ///	public:
-    ///		const std::string& getLastName();
-    ///		[...] // other set/get methods (returning const reference), a default constructor,
-    ///		[...] // optional < operator (for set, multiset) or function operator (for map, multimap)
-    ///	};
-    ///
-    /// The TypeHandler must provide a custom bind, size, prepare and extract method:
-    ///
-    ///	template <>
-    ///	class TypeHandler<struct Person>
-    ///	{
-    ///	public:
-    ///		static std::size_t size()
-    ///		{
-    ///			return 3; // lastName + firstname + age occupy three columns
-    ///		}
-    ///
-    ///		static void bind(std::size_t pos, const Person& obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-    ///		{
-    ///			// the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3))
-    ///			// Note that we advance pos by the number of columns the datatype uses! For string/int this is one.
-    ///			poco_assert_dbg (!pBinder.isNull());
-    ///			TypeHandler<std::string>::bind(pos++, obj.getLastName(), pBinder, dir);
-    ///			TypeHandler<std::string>::bind(pos++, obj.getFirstName(), pBinder, dir);
-    ///			TypeHandler<int>::bind(pos++, obj.getAge(), pBinder, dir);
-    ///		}
-    ///
-    ///		static void prepare(std::size_t pos, const Person& obj, AbstractPreparator::Ptr pPreparator)
-    ///		{
-    ///			// the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3))
-    ///			poco_assert_dbg (!pPreparator.isNull());
-    ///			TypeHandler<std::string>::prepare(pos++, obj.getLastName(), pPreparator);
-    ///			TypeHandler<std::string>::prepare(pos++, obj.getFirstName(), pPreparator);
-    ///			TypeHandler<int>::prepare(pos++, obj.getAge(), pPreparator);
-    ///		}
-    ///
-    ///		static void extract(std::size_t pos, Person& obj, const Person& defVal, AbstractExtractor::Ptr pExt)
-    ///		{
-    ///			// defVal is the default person we should use if we encounter NULL entries, so we take the individual fields
-    ///			// as defaults. You can do more complex checking, ie return defVal if only one single entry of the fields is null etc...
-    ///			poco_assert_dbg (!pExt.isNull());
-    ///			std::string lastName;
-    ///			std::string firstName;
-    ///			int age = 0;
-    ///			// the table is defined as Person (LastName VARCHAR(30), FirstName VARCHAR, Age INTEGER(3))
-    ///			TypeHandler<std::string>::extract(pos++, lastName, defVal.getLastName(), pExt);
-    ///			TypeHandler<std::string>::extract(pos++, firstName, defVal.getFirstName(), pExt);
-    ///			TypeHandler<int>::extract(pos++, age, defVal.getAge(), pExt);
-    ///			obj.setLastName(lastName);
-    ///			obj.setFirstName(firstName);
-    ///			obj.setAge(age);
-    ///		}
-    ///	};
-    ///
-    /// Note that the TypeHandler template specialization must always be declared in the namespace Poco::Data.
-    /// Apart from that no further work is needed. One can now use Person with into and use clauses.
-    {
-    public:
-        static void bind(std::size_t pos, const T & obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            pBinder->bind(pos, obj, dir);
-        }
-
-        static std::size_t size() { return 1u; }
-
-        static void extract(std::size_t pos, T & obj, const T & defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            if (!pExt->extract(pos, obj))
-                obj = defVal;
-        }
-
-        static void prepare(std::size_t pos, const T & obj, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            pPreparator->prepare(pos, obj);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T>
-    class TypeHandler<std::deque<T>> : public AbstractTypeHandler
-    /// Specialization of type handler for std::deque.
-    {
-    public:
-        static void bind(std::size_t pos, const std::deque<T> & obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            pBinder->bind(pos, obj, dir);
-        }
-
-        static std::size_t size() { return 1u; }
-
-        static void extract(std::size_t pos, std::deque<T> & obj, const T & defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            if (!pExt->extract(pos, obj))
-                obj.assign(obj.size(), defVal);
-        }
-
-        static void prepare(std::size_t pos, const std::deque<T> & obj, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            pPreparator->prepare(pos, obj);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T>
-    class TypeHandler<std::vector<T>> : public AbstractTypeHandler
-    /// Specialization of type handler for std::vector.
-    {
-    public:
-        static void bind(std::size_t pos, const std::vector<T> & obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            pBinder->bind(pos, obj, dir);
-        }
-
-        static std::size_t size() { return 1u; }
-
-        static void extract(std::size_t pos, std::vector<T> & obj, const T & defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            if (!pExt->extract(pos, obj))
-                obj.assign(obj.size(), defVal);
-        }
-
-        static void prepare(std::size_t pos, const std::vector<T> & obj, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            pPreparator->prepare(pos, obj);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T>
-    class TypeHandler<std::list<T>> : public AbstractTypeHandler
-    /// Specialization of type handler for std::list.
-    {
-    public:
-        static void bind(std::size_t pos, const std::list<T> & obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            pBinder->bind(pos, obj, dir);
-        }
-
-        static std::size_t size() { return 1u; }
-
-        static void extract(std::size_t pos, std::list<T> & obj, const T & defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            if (!pExt->extract(pos, obj))
-                obj.assign(obj.size(), defVal);
-        }
-
-        static void prepare(std::size_t pos, const std::list<T> & obj, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            pPreparator->prepare(pos, obj);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-    template <typename T>
-    class TypeHandler<Nullable<T>>
-    /// Specialization of type handler for Nullable.
-    {
-    public:
-        static void bind(std::size_t pos, const Nullable<T> & obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            if (obj.isNull())
-            {
-                pBinder->bind(pos++, Poco::Data::Keywords::null, dir);
-            }
-            else
-            {
-                pBinder->bind(pos++, obj.value(), dir);
-            }
-        }
-
-        static void prepare(std::size_t pos, const Nullable<T> & obj, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            if (obj.isNull())
-            {
-                pPreparator->prepare(pos++, Poco::Data::Keywords::null);
-            }
-            else
-            {
-                pPreparator->prepare(pos++, obj.value());
-            }
-        }
-
-        static std::size_t size() { return 1u; }
-
-        static void extract(std::size_t pos, Nullable<T> & obj, const Nullable<T> &, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            T val;
-
-            if (pExt->extract(pos++, val))
-            {
-                obj = val;
-            }
-            else
-            {
-                obj.clear();
-            }
-        }
-
-    private:
-        TypeHandler();
-        ~TypeHandler();
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-/// Poco::Tuple TypeHandler specializations
-
-// define this macro to nothing for smaller code size
-#define POCO_TUPLE_TYPE_HANDLER_INLINE inline
-
-
-    template <typename TupleType, typename Type, int N>
-    POCO_TUPLE_TYPE_HANDLER_INLINE void
-    tupleBind(std::size_t & pos, TupleType tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-    {
-        TypeHandler<Type>::bind(pos, tuple.template get<N>(), pBinder, dir);
-        pos += TypeHandler<Type>::size();
-    }
-
-
-    template <typename TupleType, typename Type, int N>
-    POCO_TUPLE_TYPE_HANDLER_INLINE void tuplePrepare(std::size_t & pos, TupleType tuple, AbstractPreparator::Ptr pPreparator)
-    {
-        TypeHandler<Type>::prepare(pos, tuple.template get<N>(), pPreparator);
-        pos += TypeHandler<Type>::size();
-    }
-
-
-    template <typename TupleType, typename DefValType, typename Type, int N>
-    POCO_TUPLE_TYPE_HANDLER_INLINE void tupleExtract(std::size_t & pos, TupleType tuple, DefValType defVal, AbstractExtractor::Ptr pExt)
-    {
-        Poco::Data::TypeHandler<Type>::extract(pos, tuple.template get<N>(), defVal.template get<N>(), pExt);
-        pos += TypeHandler<Type>::size();
-    }
-
-
-    template <
-        class T0,
-        class T1,
-        class T2,
-        class T3,
-        class T4,
-        class T5,
-        class T6,
-        class T7,
-        class T8,
-        class T9,
-        class T10,
-        class T11,
-        class T12,
-        class T13,
-        class T14,
-        class T15,
-        class T16,
-        class T17,
-        class T18,
-        class T19>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<
-            Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>>::CONSTREFTYPE
-            TupleConstRef;
-        typedef typename Poco::TypeWrapper<
-            Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T19, 19>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T19, 19>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size() + TypeHandler<T9>::size() + TypeHandler<T10>::size() + TypeHandler<T11>::size()
-                + TypeHandler<T12>::size() + TypeHandler<T13>::size() + TypeHandler<T14>::size() + TypeHandler<T15>::size()
-                + TypeHandler<T16>::size() + TypeHandler<T17>::size() + TypeHandler<T18>::size() + TypeHandler<T19>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T19, 19>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <
-        class T0,
-        class T1,
-        class T2,
-        class T3,
-        class T4,
-        class T5,
-        class T6,
-        class T7,
-        class T8,
-        class T9,
-        class T10,
-        class T11,
-        class T12,
-        class T13,
-        class T14,
-        class T15,
-        class T16,
-        class T17,
-        class T18>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<
-            Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<
-            Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T18, 18>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T18, 18>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size() + TypeHandler<T9>::size() + TypeHandler<T10>::size() + TypeHandler<T11>::size()
-                + TypeHandler<T12>::size() + TypeHandler<T13>::size() + TypeHandler<T14>::size() + TypeHandler<T15>::size()
-                + TypeHandler<T16>::size() + TypeHandler<T17>::size() + TypeHandler<T18>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T18, 18>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <
-        class T0,
-        class T1,
-        class T2,
-        class T3,
-        class T4,
-        class T5,
-        class T6,
-        class T7,
-        class T8,
-        class T9,
-        class T10,
-        class T11,
-        class T12,
-        class T13,
-        class T14,
-        class T15,
-        class T16,
-        class T17>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<
-            Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>>::CONSTREFTYPE TupleConstRef;
-        typedef
-            typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>>::REFTYPE
-                TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T17, 17>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T17, 17>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size() + TypeHandler<T9>::size() + TypeHandler<T10>::size() + TypeHandler<T11>::size()
-                + TypeHandler<T12>::size() + TypeHandler<T13>::size() + TypeHandler<T14>::size() + TypeHandler<T15>::size()
-                + TypeHandler<T16>::size() + TypeHandler<T17>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T17, 17>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <
-        class T0,
-        class T1,
-        class T2,
-        class T3,
-        class T4,
-        class T5,
-        class T6,
-        class T7,
-        class T8,
-        class T9,
-        class T10,
-        class T11,
-        class T12,
-        class T13,
-        class T14,
-        class T15,
-        class T16>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>>
-    {
-    public:
-        typedef
-            typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>>::CONSTREFTYPE
-                TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>>::REFTYPE
-            TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T16, 16>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T16, 16>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size() + TypeHandler<T9>::size() + TypeHandler<T10>::size() + TypeHandler<T11>::size()
-                + TypeHandler<T12>::size() + TypeHandler<T13>::size() + TypeHandler<T14>::size() + TypeHandler<T15>::size()
-                + TypeHandler<T16>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T16, 16>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <
-        class T0,
-        class T1,
-        class T2,
-        class T3,
-        class T4,
-        class T5,
-        class T6,
-        class T7,
-        class T8,
-        class T9,
-        class T10,
-        class T11,
-        class T12,
-        class T13,
-        class T14,
-        class T15>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>>::CONSTREFTYPE
-            TupleConstRef;
-        typedef
-            typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T15, 15>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T15, 15>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size() + TypeHandler<T9>::size() + TypeHandler<T10>::size() + TypeHandler<T11>::size()
-                + TypeHandler<T12>::size() + TypeHandler<T13>::size() + TypeHandler<T14>::size() + TypeHandler<T15>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T15, 15>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <
-        class T0,
-        class T1,
-        class T2,
-        class T3,
-        class T4,
-        class T5,
-        class T6,
-        class T7,
-        class T8,
-        class T9,
-        class T10,
-        class T11,
-        class T12,
-        class T13,
-        class T14>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>>::CONSTREFTYPE
-            TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T14, 14>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T14, 14>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size() + TypeHandler<T9>::size() + TypeHandler<T10>::size() + TypeHandler<T11>::size()
-                + TypeHandler<T12>::size() + TypeHandler<T13>::size() + TypeHandler<T14>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T14, 14>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <
-        class T0,
-        class T1,
-        class T2,
-        class T3,
-        class T4,
-        class T5,
-        class T6,
-        class T7,
-        class T8,
-        class T9,
-        class T10,
-        class T11,
-        class T12,
-        class T13>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>>
-    {
-    public:
-        typedef
-            typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T13, 13>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T13, 13>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size() + TypeHandler<T9>::size() + TypeHandler<T10>::size() + TypeHandler<T11>::size()
-                + TypeHandler<T12>::size() + TypeHandler<T13>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T13, 13>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <
-        class T0,
-        class T1,
-        class T2,
-        class T3,
-        class T4,
-        class T5,
-        class T6,
-        class T7,
-        class T8,
-        class T9,
-        class T10,
-        class T11,
-        class T12>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T12, 12>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T12, 12>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size() + TypeHandler<T9>::size() + TypeHandler<T10>::size() + TypeHandler<T11>::size()
-                + TypeHandler<T12>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T12, 12>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10, class T11>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T11, 11>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T11, 11>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size() + TypeHandler<T9>::size() + TypeHandler<T10>::size() + TypeHandler<T11>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T11, 11>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T10, 10>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T10, 10>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size() + TypeHandler<T9>::size() + TypeHandler<T10>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T10, 10>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T9, 9>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T9, 9>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size() + TypeHandler<T9>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T9, 9>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, NullTypeList>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, NullTypeList>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, NullTypeList>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T8, 8>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T8, 8>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size()
-                + TypeHandler<T8>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T8, 8>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, NullTypeList>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, NullTypeList>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, T7, NullTypeList>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T7, 7>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T7, 7>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size() + TypeHandler<T7>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T7, 7>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0, class T1, class T2, class T3, class T4, class T5, class T6>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, NullTypeList>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, NullTypeList>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, T6, NullTypeList>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T6, 6>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T6, 6>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size() + TypeHandler<T6>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T6, 6>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0, class T1, class T2, class T3, class T4, class T5>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, T5, NullTypeList>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, NullTypeList>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, T5, NullTypeList>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T5, 5>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T5, 5>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size() + TypeHandler<T5>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T5, 5>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0, class T1, class T2, class T3, class T4>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, T4, NullTypeList>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, NullTypeList>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, T4, NullTypeList>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T4, 4>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T4, 4>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size()
-                + TypeHandler<T4>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T4, 4>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0, class T1, class T2, class T3>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, T3, NullTypeList>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, NullTypeList>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, T3, NullTypeList>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T3, 3>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T3, 3>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size()
-        {
-            return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size() + TypeHandler<T3>::size();
-        }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T3, 3>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0, class T1, class T2>
-    class TypeHandler<Poco::Tuple<T0, T1, T2, NullTypeList>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, NullTypeList>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, T2, NullTypeList>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T2, 2>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T2, 2>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size() { return TypeHandler<T0>::size() + TypeHandler<T1>::size() + TypeHandler<T2>::size(); }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T2, 2>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0, class T1>
-    class TypeHandler<Poco::Tuple<T0, T1, NullTypeList>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, NullTypeList>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, T1, NullTypeList>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-            tupleBind<TupleConstRef, T1, 1>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-            tuplePrepare<TupleConstRef, T1, 1>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size() { return TypeHandler<T0>::size() + TypeHandler<T1>::size(); }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-            tupleExtract<TupleRef, TupleConstRef, T1, 1>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T0>
-    class TypeHandler<Poco::Tuple<T0, NullTypeList>>
-    {
-    public:
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, NullTypeList>>::CONSTREFTYPE TupleConstRef;
-        typedef typename Poco::TypeWrapper<Poco::Tuple<T0, NullTypeList>>::REFTYPE TupleRef;
-
-        static void bind(std::size_t pos, TupleConstRef tuple, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            poco_assert_dbg(!pBinder.isNull());
-            tupleBind<TupleConstRef, T0, 0>(pos, tuple, pBinder, dir);
-        }
-
-        static void prepare(std::size_t pos, TupleConstRef tuple, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            tuplePrepare<TupleConstRef, T0, 0>(pos, tuple, pPreparator);
-        }
-
-        static std::size_t size() { return TypeHandler<T0>::size(); }
-
-        static void extract(std::size_t pos, TupleRef tuple, TupleConstRef defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-            tupleExtract<TupleRef, TupleConstRef, T0, 0>(pos, tuple, defVal, pExt);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class K, class V>
-    class TypeHandler<std::pair<K, V>> : public AbstractTypeHandler
-    {
-    public:
-        static void bind(std::size_t pos, const std::pair<K, V> & obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            TypeHandler<K>::bind(pos, obj.first, pBinder, dir);
-            pos += TypeHandler<K>::size();
-            TypeHandler<V>::bind(pos, obj.second, pBinder, dir);
-        }
-
-        static std::size_t size() { return static_cast<std::size_t>(TypeHandler<K>::size() + TypeHandler<V>::size()); }
-
-        static void extract(std::size_t pos, std::pair<K, V> & obj, const std::pair<K, V> & defVal, AbstractExtractor::Ptr pExt)
-        {
-            TypeHandler<K>::extract(pos, obj.first, defVal.first, pExt);
-            pos += TypeHandler<K>::size();
-            TypeHandler<V>::extract(pos, obj.second, defVal.second, pExt);
-        }
-
-        static void prepare(std::size_t pos, const std::pair<K, V> & obj, AbstractPreparator::Ptr pPreparator)
-        {
-            TypeHandler<K>::prepare(pos, obj.first, pPreparator);
-            pos += TypeHandler<K>::size();
-            TypeHandler<V>::prepare(pos, obj.second, pPreparator);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T>
-    class TypeHandler<Poco::AutoPtr<T>> : public AbstractTypeHandler
-    /// Specialization of type handler for Poco::AutoPtr
-    {
-    public:
-        static void bind(std::size_t pos, const Poco::AutoPtr<T> & obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            // *obj will trigger a nullpointer exception if empty: this is on purpose
-            TypeHandler<T>::bind(pos, *obj, pBinder, dir);
-        }
-
-        static std::size_t size() { return static_cast<std::size_t>(TypeHandler<T>::size()); }
-
-        static void extract(std::size_t pos, Poco::AutoPtr<T> & obj, const Poco::AutoPtr<T> & defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-
-            obj = Poco::AutoPtr<T>(new T());
-            if (defVal)
-                TypeHandler<T>::extract(pos, *obj, *defVal, pExt);
-            else
-                TypeHandler<T>::extract(pos, *obj, *obj, pExt);
-        }
-
-        static void prepare(std::size_t pos, const Poco::AutoPtr<T> &, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            TypeHandler<T>::prepare(pos, T(), pPreparator);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-    template <class T>
-    class TypeHandler<Poco::SharedPtr<T>> : public AbstractTypeHandler
-    /// Specialization of type handler for Poco::SharedPtr
-    {
-    public:
-        static void bind(std::size_t pos, const Poco::SharedPtr<T> & obj, AbstractBinder::Ptr pBinder, AbstractBinder::Direction dir)
-        {
-            // *obj will trigger a nullpointer exception if empty
-            TypeHandler<T>::bind(pos, *obj, pBinder, dir);
-        }
-
-        static std::size_t size() { return static_cast<std::size_t>(TypeHandler<T>::size()); }
-
-        static void extract(std::size_t pos, Poco::SharedPtr<T> & obj, const Poco::SharedPtr<T> & defVal, AbstractExtractor::Ptr pExt)
-        {
-            poco_assert_dbg(!pExt.isNull());
-
-            obj = Poco::SharedPtr<T>(new T());
-            if (defVal)
-                TypeHandler<T>::extract(pos, *obj, *defVal, pExt);
-            else
-                TypeHandler<T>::extract(pos, *obj, *obj, pExt);
-        }
-
-        static void prepare(std::size_t pos, const Poco::SharedPtr<T> &, AbstractPreparator::Ptr pPreparator)
-        {
-            poco_assert_dbg(!pPreparator.isNull());
-            TypeHandler<T>::prepare(pos, T(), pPreparator);
-        }
-
-    private:
-        TypeHandler(const TypeHandler &);
-        TypeHandler & operator=(const TypeHandler &);
-    };
-
-
-}
-} // namespace Poco::Data
-
-
-#endif // Data_TypeHandler_INCLUDED
diff --git a/contrib/poco/Data/src/AbstractBinder.cpp b/contrib/poco/Data/src/AbstractBinder.cpp
deleted file mode 100644
index 4854467eb..000000000
--- a/contrib/poco/Data/src/AbstractBinder.cpp
+++ /dev/null
@@ -1,527 +0,0 @@
-//
-// AbstractBinder.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractBinder
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/AbstractBinder.h"
-#include "Poco/Data/Date.h"
-#include "Poco/Data/Time.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/Data/DataException.h"
-#include "Poco/DateTime.h"
-#include "Poco/Any.h"
-#include "Poco/Dynamic/Var.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-AbstractBinder::AbstractBinder()
-{
-}
-
-
-AbstractBinder::~AbstractBinder()
-{
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<Poco::Int8>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<Poco::Int8>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<Poco::Int8>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<Poco::UInt8>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<Poco::UInt8>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<Poco::UInt8>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<Poco::Int16>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<Poco::Int16>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<Poco::Int16>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<Poco::UInt16>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<Poco::UInt16>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<Poco::UInt16>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<Poco::Int32>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<Poco::Int32>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<Poco::Int32>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<Poco::UInt32>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<Poco::UInt32>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<Poco::UInt32>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<Poco::Int64>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<Poco::Int64>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<Poco::Int64>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-	
-void AbstractBinder::bind(std::size_t pos, const std::vector<Poco::UInt64>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-	
-void AbstractBinder::bind(std::size_t pos, const std::deque<Poco::UInt64>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-	
-void AbstractBinder::bind(std::size_t pos, const std::list<Poco::UInt64>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-#ifndef POCO_LONG_IS_64_BIT
-void AbstractBinder::bind(std::size_t pos, const std::vector<long>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<long>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<long>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-#endif
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<bool>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<bool>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<bool>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<float>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<float>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<float>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<double>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<double>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<double>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<char>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<char>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<char>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<std::string>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<std::string>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<std::string>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const UTF16String& val, Direction dir)
-{
-	throw NotImplementedException("UTF16String binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<UTF16String>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<UTF16String>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<UTF16String>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<BLOB>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<BLOB>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<BLOB>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<CLOB>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<CLOB>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<CLOB>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<DateTime>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<DateTime>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<DateTime>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<Date>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<Date>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<Date>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<Time>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<Time>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<Time>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::vector<NullData>& val, Direction dir)
-{
-	throw NotImplementedException("std::vector binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::deque<NullData>& val, Direction dir)
-{
-	throw NotImplementedException("std::deque binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const std::list<NullData>& val, Direction dir)
-{
-	throw NotImplementedException("std::list binder must be implemented.");
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const Any& val, Direction dir)
-{
-	const std::type_info& type = val.type();
-
-	if(type == typeid(Int32))
-		bind(pos, RefAnyCast<Int32>(val), dir);
-	else if(type == typeid(std::string))
-		bind(pos, RefAnyCast<std::string>(val), dir);
-	else if (type == typeid(Poco::UTF16String))
-		bind(pos, RefAnyCast<Poco::UTF16String>(val), dir);
-	else if (type == typeid(bool))
-		bind(pos, RefAnyCast<bool>(val), dir);
-	else if(type == typeid(char))
-		bind(pos, RefAnyCast<char>(val), dir);
-	else if(type == typeid(Int8))
-		bind(pos, RefAnyCast<Int8>(val), dir);
-	else if(type == typeid(UInt8))
-		bind(pos, RefAnyCast<UInt8>(val), dir);
-	else if(type == typeid(Int16))
-		bind(pos, RefAnyCast<Int16>(val), dir);
-	else if(type == typeid(UInt16))
-		bind(pos, RefAnyCast<UInt16>(val), dir);
-	else if(type == typeid(UInt32))
-		bind(pos, RefAnyCast<UInt32>(val), dir);
-	else if(type == typeid(Int64))
-		bind(pos, RefAnyCast<Int64>(val), dir);
-	else if(type == typeid(UInt64))
-		bind(pos, RefAnyCast<UInt64>(val), dir);
-	else if(type == typeid(float))
-		bind(pos, RefAnyCast<float>(val), dir);
-	else if(type == typeid(double))
-		bind(pos, RefAnyCast<double>(val), dir);
-	else if(type == typeid(DateTime))
-		bind(pos, RefAnyCast<DateTime>(val), dir);
-	else if(type == typeid(Date))
-		bind(pos, RefAnyCast<Date>(val), dir);
-	else if(type == typeid(Time))
-		bind(pos, RefAnyCast<Time>(val), dir);
-	else if(type == typeid(BLOB))
-		bind(pos, RefAnyCast<BLOB>(val), dir);
-	else if(type == typeid(void))
-		bind(pos, Keywords::null, dir);
-#ifndef POCO_LONG_IS_64_BIT
-	else if(type == typeid(long))
-		bind(pos, RefAnyCast<long>(val), dir);
-#endif
-	else
-		throw UnknownTypeException(std::string(val.type().name()));
-}
-
-
-void AbstractBinder::bind(std::size_t pos, const Poco::Dynamic::Var& val, Direction dir)
-{
-	const std::type_info& type = val.type();
-
-	if(type == typeid(Int32))
-		bind(pos, val.extract<Int32>(), dir);
-	else if(type == typeid(std::string))
-		bind(pos, val.extract<std::string>(), dir);
-	else if (type == typeid(Poco::UTF16String))
-		bind(pos, val.extract<Poco::UTF16String>(), dir);
-	else if (type == typeid(bool))
-		bind(pos, val.extract<bool>(), dir);
-	else if(type == typeid(char))
-		bind(pos, val.extract<char>(), dir);
-	else if(type == typeid(Int8))
-		bind(pos, val.extract<Int8>(), dir);
-	else if(type == typeid(UInt8))
-		bind(pos, val.extract<UInt8>(), dir);
-	else if(type == typeid(Int16))
-		bind(pos, val.extract<Int16>(), dir);
-	else if(type == typeid(UInt16))
-		bind(pos, val.extract<UInt16>(), dir);
-	else if(type == typeid(UInt32))
-		bind(pos, val.extract<UInt32>(), dir);
-	else if(type == typeid(Int64))
-		bind(pos, val.extract<Int64>(), dir);
-	else if(type == typeid(UInt64))
-		bind(pos, val.extract<UInt64>(), dir);
-	else if(type == typeid(float))
-		bind(pos, val.extract<float>(), dir);
-	else if(type == typeid(double))
-		bind(pos, val.extract<double>(), dir);
-	else if(type == typeid(DateTime))
-		bind(pos, val.extract<DateTime>(), dir);
-	else if(type == typeid(Date))
-		bind(pos, val.extract<Date>(), dir);
-	else if(type == typeid(Time))
-		bind(pos, val.extract<Time>(), dir);
-	else if(type == typeid(BLOB))
-		bind(pos, val.extract<BLOB>(), dir);
-	else if(type == typeid(void))
-		bind(pos, Keywords::null, dir);
-#ifndef POCO_LONG_IS_64_BIT
-	else if(type == typeid(long))
-		bind(pos, val.extract<long>(), dir);
-#endif
-	else
-		throw UnknownTypeException(std::string(val.type().name()));
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/AbstractBinding.cpp b/contrib/poco/Data/src/AbstractBinding.cpp
deleted file mode 100644
index d30ccd1d8..000000000
--- a/contrib/poco/Data/src/AbstractBinding.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// AbstractBinding.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractBinding
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/AbstractBinding.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-AbstractBinding::AbstractBinding(const std::string& name, 
-	Direction direction, 
-	Poco::UInt32 bulkSize): 
-	_pBinder(0),
-	_name(name),
-	_direction(direction),
-	_bulkSize(bulkSize)
-{
-}
-
-
-AbstractBinding::~AbstractBinding()
-{
-}
-
-
-void AbstractBinding::setBinder(BinderPtr pBinder)
-{
-	poco_check_ptr (pBinder);
-	_pBinder = pBinder;
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/AbstractExtraction.cpp b/contrib/poco/Data/src/AbstractExtraction.cpp
deleted file mode 100644
index ac3f83927..000000000
--- a/contrib/poco/Data/src/AbstractExtraction.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// AbstractExtraction.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractExtraction
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/AbstractExtraction.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-AbstractExtraction::AbstractExtraction(Poco::UInt32 limit,
-	Poco::UInt32 position,
-	bool bulk): 
-	_pExtractor(0), 
-	_limit(limit),
-	_position(position),
-	_bulk(bulk),
-	_emptyStringIsNull(false),
-	_forceEmptyString(false)
-{
-}
-
-
-AbstractExtraction::~AbstractExtraction()
-{
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/AbstractExtractor.cpp b/contrib/poco/Data/src/AbstractExtractor.cpp
deleted file mode 100644
index 566c721ab..000000000
--- a/contrib/poco/Data/src/AbstractExtractor.cpp
+++ /dev/null
@@ -1,437 +0,0 @@
-//
-// AbstractExtractor.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractExtractor
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/AbstractExtractor.h"
-#include "Poco/Exception.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-AbstractExtractor::AbstractExtractor()
-{
-}
-
-
-AbstractExtractor::~AbstractExtractor()
-{
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Poco::Int8>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Poco::Int8>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Poco::Int8>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Poco::UInt8>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Poco::UInt8>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Poco::UInt8>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Poco::Int16>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Poco::Int16>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Poco::Int16>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Poco::UInt16>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Poco::UInt16>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Poco::UInt16>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Poco::Int32>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Poco::Int32>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Poco::Int32>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Poco::UInt32>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Poco::UInt32>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Poco::UInt32>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Poco::Int64>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Poco::Int64>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Poco::Int64>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Poco::UInt64>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Poco::UInt64>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Poco::UInt64>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-#ifndef POCO_LONG_IS_64_BIT
-bool AbstractExtractor::extract(std::size_t pos, std::vector<long>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<long>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<long>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-#endif
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<bool>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<bool>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<bool>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<float>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<float>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<float>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<double>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<double>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<double>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<char>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<char>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<char>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<std::string>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<std::string>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<std::string>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, UTF16String& val)
-{
-	throw NotImplementedException("UTF16String extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<UTF16String>& val)
-{
-	throw NotImplementedException("std::vector<UTF16String> extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<UTF16String>& val)
-{
-	throw NotImplementedException("std::deque<UTF16String> extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<UTF16String>& val)
-{
-	throw NotImplementedException("std::list<UTF16String> extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<BLOB>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<BLOB>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<BLOB>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<CLOB>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<CLOB>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<CLOB>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<DateTime>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<DateTime>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<DateTime>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Date>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Date>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Date>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Time>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Time>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Time>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Any>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Any>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Any>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::vector<Poco::Dynamic::Var>& val)
-{
-	throw NotImplementedException("std::vector extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::deque<Poco::Dynamic::Var>& val)
-{
-	throw NotImplementedException("std::deque extractor must be implemented.");
-}
-
-
-bool AbstractExtractor::extract(std::size_t pos, std::list<Poco::Dynamic::Var>& val)
-{
-	throw NotImplementedException("std::list extractor must be implemented.");
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/AbstractPreparation.cpp b/contrib/poco/Data/src/AbstractPreparation.cpp
deleted file mode 100644
index 0d8f4c690..000000000
--- a/contrib/poco/Data/src/AbstractPreparation.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// AbstractPreparation.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractPreparation
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/AbstractPreparation.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-AbstractPreparation::AbstractPreparation(PreparatorPtr pPreparator):
-	_pPreparator(pPreparator)
-{
-	poco_assert_dbg (_pPreparator);
-}
-
-
-AbstractPreparation::~AbstractPreparation()
-{
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/AbstractPreparator.cpp b/contrib/poco/Data/src/AbstractPreparator.cpp
deleted file mode 100644
index 58eb4fb72..000000000
--- a/contrib/poco/Data/src/AbstractPreparator.cpp
+++ /dev/null
@@ -1,438 +0,0 @@
-//
-// AbstractPreparator.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  AbstractPreparator
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/AbstractPreparator.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-AbstractPreparator::AbstractPreparator(Poco::UInt32 length): 
-	_length(length),
-	_bulk(false)
-{
-}
-
-
-AbstractPreparator::~AbstractPreparator()
-{
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Poco::Int8>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Poco::Int8>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Poco::Int8>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Poco::UInt8>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Poco::UInt8>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Poco::UInt8>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Poco::Int16>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Poco::Int16>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Poco::Int16>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Poco::UInt16>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Poco::UInt16>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Poco::UInt16>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Poco::Int32>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Poco::Int32>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Poco::Int32>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Poco::UInt32>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Poco::UInt32>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Poco::UInt32>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Poco::Int64>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Poco::Int64>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Poco::Int64>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Poco::UInt64>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Poco::UInt64>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Poco::UInt64>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-#ifndef POCO_LONG_IS_64_BIT
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<long>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<long>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<long>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-#endif
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<bool>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<bool>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<bool>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<float>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<float>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<float>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<double>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<double>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<double>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<char>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<char>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<char>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<std::string>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<std::string>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<std::string>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const UTF16String& val)
-{
-	throw NotImplementedException("UTF16String preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<UTF16String>& val)
-{
-	throw NotImplementedException("std::vector<UTF16String> preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<UTF16String>& val)
-{
-	throw NotImplementedException("std::deque<UTF16String> preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<UTF16String>& val)
-{
-	throw NotImplementedException("std::list<UTF16String> preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<BLOB>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<BLOB>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<BLOB>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<CLOB>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<CLOB>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<CLOB>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<DateTime>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<DateTime>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<DateTime>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Date>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Date>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Date>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Time>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Time>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Time>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Any>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Any>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Any>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::vector<Poco::Dynamic::Var>& val)
-{
-	throw NotImplementedException("std::vector preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::deque<Poco::Dynamic::Var>& val)
-{
-	throw NotImplementedException("std::deque preparator must be implemented.");
-}
-
-
-void AbstractPreparator::prepare(std::size_t pos, const std::list<Poco::Dynamic::Var>& val)
-{
-	throw NotImplementedException("std::list preparator must be implemented.");
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/ArchiveStrategy.cpp b/contrib/poco/Data/src/ArchiveStrategy.cpp
deleted file mode 100644
index 2d8842ba2..000000000
--- a/contrib/poco/Data/src/ArchiveStrategy.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// ArchiveStrategy.cpp
-//
-// Library: Data
-// Package: Logging
-// Module:  ArchiveStrategy
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/ArchiveStrategy.h"
-#include "Poco/Ascii.h"
-
-namespace Poco {
-namespace Data {
-
-
-using namespace Keywords;
-
-//
-// ArchiveStrategy
-//
-
-
-const std::string ArchiveStrategy::DEFAULT_ARCHIVE_DESTINATION = "T_POCO_LOG_ARCHIVE";
-
-
-ArchiveStrategy::ArchiveStrategy(const std::string& connector,
-	const std::string& connect, 
-	const std::string& source, 
-	const std::string& destination):
-	_connector(connector),
-	_connect(connect),
-	_source(source),
-	_destination(destination)
-{
-	open();
-}
-
-
-ArchiveStrategy::~ArchiveStrategy()
-{
-}
-
-
-void ArchiveStrategy::open()
-{
-	if (_connector.empty() || _connect.empty())
-		throw IllegalStateException("Connector and connect string must be non-empty.");
-
-	_pSession = new Session(_connector, _connect);
-}
-
-
-//
-// ArchiveByAgeStrategy
-//
-
-
-ArchiveByAgeStrategy::ArchiveByAgeStrategy(const std::string& connector, 
-	const std::string& connect, 
-	const std::string& sourceTable, 
-	const std::string& destinationTable):
-	ArchiveStrategy(connector, connect, sourceTable, destinationTable)
-{
-	initStatements();
-}
-
-
-ArchiveByAgeStrategy::~ArchiveByAgeStrategy()
-{
-}
-
-
-void ArchiveByAgeStrategy::archive()
-{
-	if (!session().isConnected()) open();
-
-	DateTime now;
-	_archiveDateTime = now - _maxAge;
-	getCountStatement().execute();
-	if (_archiveCount > 0)
-	{
-		getCopyStatement().execute();
-		getDeleteStatement().execute();
-	}
-}
-
-
-void ArchiveByAgeStrategy::initStatements()
-{
-	std::string src = getSource();
-	std::string dest = getDestination();
-
-	setCountStatement();
-	_archiveCount = 0;
-	std::string sql;
-	Poco::format(sql, "SELECT COUNT(*) FROM %s WHERE DateTime < ?", src);
-	getCountStatement() << sql, into(_archiveCount), use(_archiveDateTime);
-
-	setCopyStatement();
-	sql.clear();
-	Poco::format(sql, "INSERT INTO %s SELECT * FROM %s WHERE DateTime < ?", dest, src);
-	getCopyStatement() << sql, use(_archiveDateTime);
-
-	setDeleteStatement();
-	sql.clear();
-	Poco::format(sql, "DELETE FROM %s WHERE DateTime < ?", src);
-	getDeleteStatement() << sql, use(_archiveDateTime);
-}
-
-
-void ArchiveByAgeStrategy::setThreshold(const std::string& age)
-{
-	std::string::const_iterator it  = age.begin();
-	std::string::const_iterator end = age.end();
-	int n = 0;
-	while (it != end && Ascii::isSpace(*it)) ++it;
-	while (it != end && Ascii::isDigit(*it)) { n *= 10; n += *it++ - '0'; }
-	while (it != end && Ascii::isSpace(*it)) ++it;
-	std::string unit;
-	while (it != end && Ascii::isAlpha(*it)) unit += *it++;
-	
-	Timespan::TimeDiff factor = Timespan::SECONDS;
-	if (unit == "minutes")
-		factor = Timespan::MINUTES;
-	else if (unit == "hours")
-		factor = Timespan::HOURS;
-	else if (unit == "days")
-		factor = Timespan::DAYS;
-	else if (unit == "weeks")
-		factor = 7*Timespan::DAYS;
-	else if (unit == "months")
-		factor = 30*Timespan::DAYS;
-	else if (unit != "seconds")
-		throw InvalidArgumentException("setMaxAge", age);
-		
-	_maxAge = factor * n;
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/Bulk.cpp b/contrib/poco/Data/src/Bulk.cpp
deleted file mode 100644
index 1def56226..000000000
--- a/contrib/poco/Data/src/Bulk.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Bulk.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  Bulk
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/Bulk.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-Bulk::Bulk(const Limit& limit): _limit(limit.value(), false, false)
-{
-}
-
-
-Bulk::Bulk(Poco::UInt32 value): _limit(value, false, false)
-{
-}
-
-
-Bulk::~Bulk()
-{
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/Connector.cpp b/contrib/poco/Data/src/Connector.cpp
deleted file mode 100644
index c721ae2a9..000000000
--- a/contrib/poco/Data/src/Connector.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Connector.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  Connector
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/Connector.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-Connector::Connector()
-{
-}
-
-
-Connector::~Connector()
-{
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/DataException.cpp b/contrib/poco/Data/src/DataException.cpp
deleted file mode 100644
index b5bc7275b..000000000
--- a/contrib/poco/Data/src/DataException.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// DataException.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  DataException
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/DataException.h"
-#include <typeinfo>
-
-
-namespace Poco {
-namespace Data {
-
-
-POCO_IMPLEMENT_EXCEPTION(DataException, Poco::IOException, "Database Exception")
-POCO_IMPLEMENT_EXCEPTION(RowDataMissingException, DataException, "Data for row missing")
-POCO_IMPLEMENT_EXCEPTION(UnknownDataBaseException, DataException, "Type of data base unknown")
-POCO_IMPLEMENT_EXCEPTION(UnknownTypeException, DataException, "Type of data unknown")
-POCO_IMPLEMENT_EXCEPTION(ExecutionException, DataException, "Execution error")
-POCO_IMPLEMENT_EXCEPTION(BindingException, DataException, "Binding error")
-POCO_IMPLEMENT_EXCEPTION(ExtractException, DataException, "Extraction error")
-POCO_IMPLEMENT_EXCEPTION(LimitException, DataException, "Limit error")
-POCO_IMPLEMENT_EXCEPTION(NotSupportedException, DataException, "Feature or property not supported")
-POCO_IMPLEMENT_EXCEPTION(SessionUnavailableException, DataException, "Session is unavailable")
-POCO_IMPLEMENT_EXCEPTION(SessionPoolExhaustedException, DataException, "No more sessions available from the session pool")
-POCO_IMPLEMENT_EXCEPTION(SessionPoolExistsException, DataException, "Session already exists in the pool")
-POCO_IMPLEMENT_EXCEPTION(NoDataException, DataException, "No data found")
-POCO_IMPLEMENT_EXCEPTION(LengthExceededException, DataException, "Data too long")
-POCO_IMPLEMENT_EXCEPTION(ConnectionFailedException, DataException, "Connection attempt failed")
-POCO_IMPLEMENT_EXCEPTION(NotConnectedException, DataException, "Not connected to data source")
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/Date.cpp b/contrib/poco/Data/src/Date.cpp
deleted file mode 100644
index 542d9a981..000000000
--- a/contrib/poco/Data/src/Date.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// Date.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  Date
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/Date.h"
-#include "Poco/DateTime.h"
-#include "Poco/NumberFormatter.h"
-#include "Poco/Data/DynamicDateTime.h"
-#include "Poco/Dynamic/Var.h"
-
-
-using Poco::DateTime;
-using Poco::Dynamic::Var;
-using Poco::NumberFormatter;
-
-
-namespace Poco {
-namespace Data {
-
-
-Date::Date()
-{
-	DateTime dt;
-	assign(dt.year(), dt.month(), dt.day());
-}
-
-
-Date::Date(int year, int month, int day)
-{
-	assign(year, month, day);
-}
-
-
-Date::Date(const DateTime& dt)
-{
-	assign(dt.year(), dt.month(), dt.day());
-}
-
-
-Date::~Date()
-{
-}
-
-
-void Date::assign(int year, int month, int day)
-{
-	if (year < 0 || year > 9999)
-		throw InvalidArgumentException("Year must be between 0 and 9999");
-
-	if (month < 1 || month > 12)
-		throw InvalidArgumentException("Month must be between 1 and 12");
-
-	if (day < 1 || day > DateTime::daysOfMonth(year, month))
-		throw InvalidArgumentException("Month must be between 1 and " + 
-			NumberFormatter::format(DateTime::daysOfMonth(year, month)));
-
-	_year = year;
-	_month = month;
-	_day = day;
-}
-
-
-bool Date::operator < (const Date& date) const
-{
-	int year = date.year();
-
-	if (_year < year) return true;
-	else if (_year > year) return false;
-	else // years equal
-	{
-		int month = date.month();
-		if (_month < month) return true;
-		else 
-		if (_month > month) return false;
-		else // months equal
-		if (_day < date.day()) return true;
-	}
-
-	return false;
-}
-
-
-Date& Date::operator = (const Var& var)
-{
-#ifndef __GNUC__
-// g++ used to choke on this, newer versions seem to digest it fine
-// TODO: determine the version able to handle it properly
-	*this = var.extract<Date>();
-#else
-	*this = var.operator Date();
-#endif
-	return *this;
-}
-
-
-} } // namespace Poco::Data
-
-
-#ifdef __GNUC__
-// only needed for g++ (see comment in Date::operator = above)
-
-namespace Poco {
-namespace Dynamic {
-
-
-using Poco::Data::Date;
-using Poco::DateTime;
-
-
-template <>
-Var::operator Date () const
-{
-	VarHolder* pHolder = content();
-
-	if (!pHolder)
-		throw InvalidAccessException("Can not convert empty value.");
-
-	if (typeid(Date) == pHolder->type())
-		return extract<Date>();
-	else
-	{
-		Poco::DateTime result;
-		pHolder->convert(result);
-		return Date(result);
-	}
-}
-
-
-} } // namespace Poco::Dynamic
-
-
-#endif // __GNUC__
diff --git a/contrib/poco/Data/src/Limit.cpp b/contrib/poco/Data/src/Limit.cpp
deleted file mode 100644
index 3a111e34f..000000000
--- a/contrib/poco/Data/src/Limit.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// Limit.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  Limit
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/Limit.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-Limit::Limit(SizeT value, bool hardLimit, bool isLowerLimit) :
-	_value(value),
-	_hardLimit(hardLimit),
-	_isLowerLimit(isLowerLimit)
-{
-}
-
-
-Limit::~Limit()
-{
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/MetaColumn.cpp b/contrib/poco/Data/src/MetaColumn.cpp
deleted file mode 100644
index 7b937e6a4..000000000
--- a/contrib/poco/Data/src/MetaColumn.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// MetaColumn.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  MetaColumn
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/MetaColumn.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-MetaColumn::MetaColumn():
-	_length(),
-	_precision(),
-	_position(),
-	_type(),
-	_nullable()
-{
-}
-
-
-MetaColumn::MetaColumn(std::size_t position,
-	const std::string& name,
-	ColumnDataType type,
-	std::size_t length,
-	std::size_t precision,
-	bool nullable): 
-	_name(name),
-	_length(length),
-	_precision(precision),
-	_position(position),
-	_type(type),
-	_nullable(nullable)
-{
-}
-
-
-MetaColumn::~MetaColumn()
-{
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/PooledSessionHolder.cpp b/contrib/poco/Data/src/PooledSessionHolder.cpp
deleted file mode 100644
index 80d35e2a6..000000000
--- a/contrib/poco/Data/src/PooledSessionHolder.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// PooledSessionHolder.cpp
-//
-// Library: Data
-// Package: SessionPooling
-// Module:  PooledSessionHolder
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/PooledSessionHolder.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-PooledSessionHolder::PooledSessionHolder(SessionPool& owner, SessionImpl* pSessionImpl):
-	_owner(owner),
-	_pImpl(pSessionImpl, true)
-{
-}
-
-
-PooledSessionHolder::~PooledSessionHolder()
-{
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/PooledSessionImpl.cpp b/contrib/poco/Data/src/PooledSessionImpl.cpp
deleted file mode 100644
index 2acf2f9d8..000000000
--- a/contrib/poco/Data/src/PooledSessionImpl.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// PooledSessionImpl.cpp
-//
-// Library: Data
-// Package: SessionPooling
-// Module:  PooledSessionImpl
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/PooledSessionImpl.h"
-#include "Poco/Data/DataException.h"
-#include "Poco/Data/SessionPool.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-PooledSessionImpl::PooledSessionImpl(PooledSessionHolder* pHolder):
-	SessionImpl(pHolder->session()->connectionString(),
-		pHolder->session()->getLoginTimeout()),
-	_pHolder(pHolder, true)
-{
-}
-
-
-PooledSessionImpl::~PooledSessionImpl()
-{
-	try
-	{
-		close();
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-StatementImpl* PooledSessionImpl::createStatementImpl()
-{
-	return access()->createStatementImpl();
-}
-
-
-void PooledSessionImpl::begin()
-{
-	return access()->begin();
-}
-
-
-void PooledSessionImpl::commit()
-{
-	return access()->commit();
-}
-
-
-bool PooledSessionImpl::isConnected()
-{
-	return access()->isConnected();
-}
-
-
-void PooledSessionImpl::setConnectionTimeout(std::size_t timeout)
-{
-	return access()->setConnectionTimeout(timeout);
-}
-
-
-std::size_t PooledSessionImpl::getConnectionTimeout()
-{
-	return access()->getConnectionTimeout();
-}
-
-
-bool PooledSessionImpl::canTransact()
-{
-	return access()->canTransact();
-}
-
-
-bool PooledSessionImpl::isTransaction()
-{
-	return access()->isTransaction();
-}
-
-
-void PooledSessionImpl::setTransactionIsolation(Poco::UInt32 ti)
-{
-	access()->setTransactionIsolation(ti);
-}
-
-
-Poco::UInt32 PooledSessionImpl::getTransactionIsolation()
-{
-	return access()->getTransactionIsolation();
-}
-
-
-bool PooledSessionImpl::hasTransactionIsolation(Poco::UInt32 ti)
-{
-	return access()->hasTransactionIsolation(ti);
-}
-
-
-bool PooledSessionImpl::isTransactionIsolation(Poco::UInt32 ti)
-{
-	return access()->isTransactionIsolation(ti);
-}
-
-
-void PooledSessionImpl::rollback()
-{
-	return access()->rollback();
-}
-
-
-void PooledSessionImpl::open(const std::string& connect)
-{
-	access()->open(connect);
-}
-
-
-void PooledSessionImpl::close()
-{
-	if (_pHolder)
-	{
-		if (isTransaction())
-		{
-			try
-			{
-				rollback();
-			}
-			catch (...)
-			{
-				// Something's wrong with the session. Get rid of it.
-				access()->close();
-			}
-		}
-		_pHolder->owner().putBack(_pHolder);
-		_pHolder = 0;
-	}
-}
-
-
-const std::string& PooledSessionImpl::connectorName() const
-{
-	return access()->connectorName();
-}
-
-
-void PooledSessionImpl::setFeature(const std::string& name, bool state)	
-{
-	access()->setFeature(name, state);
-}
-
-
-bool PooledSessionImpl::getFeature(const std::string& name)
-{
-	return access()->getFeature(name);
-}
-
-
-void PooledSessionImpl::setProperty(const std::string& name, const Poco::Any& value)
-{
-	access()->setProperty(name, value);
-}
-
-
-Poco::Any PooledSessionImpl::getProperty(const std::string& name)
-{
-	return access()->getProperty(name);
-}
-
-
-SessionImpl* PooledSessionImpl::access() const
-{
-	if (_pHolder)
-	{
-		_pHolder->access();
-		return impl();
-	}
-	else throw SessionUnavailableException();
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/Position.cpp b/contrib/poco/Data/src/Position.cpp
deleted file mode 100644
index 64db6fca7..000000000
--- a/contrib/poco/Data/src/Position.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Position.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  Position
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/Position.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-Position::Position(Poco::UInt32 value): _value(value)
-{
-}
-
-
-Position::~Position()
-{
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/Range.cpp b/contrib/poco/Data/src/Range.cpp
deleted file mode 100644
index d41fde130..000000000
--- a/contrib/poco/Data/src/Range.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Range.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  Range
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/Range.h"
-#include "Poco/Data/DataException.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-using namespace Keywords;
-
-
-Range::Range(Limit::SizeT lowValue, Limit::SizeT upValue, bool hardLimit) :
-	_lower(lowerLimit(lowValue)),
-	_upper(upperLimit(upValue, hardLimit))
-{
-	if (lowValue > upValue)
-		throw LimitException("lowerLimit > upperLimit!");
-}
-
-
-Range::~Range()
-{
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/RecordSet.cpp b/contrib/poco/Data/src/RecordSet.cpp
deleted file mode 100644
index 0d8c143a9..000000000
--- a/contrib/poco/Data/src/RecordSet.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-//
-// RecordSet.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  RecordSet
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/RecordSet.h"
-#include "Poco/Data/RowFilter.h"
-#include "Poco/Data/Date.h"
-#include "Poco/Data/Time.h"
-#include "Poco/Data/DataException.h"
-#include "Poco/DateTime.h"
-#include "Poco/UTFString.h"
-
-
-using namespace Poco::Data::Keywords;
-using Poco::DateTime;
-using Poco::UTF16String;
-
-
-namespace Poco {
-namespace Data {
-
-
-const std::size_t RecordSet::UNKNOWN_TOTAL_ROW_COUNT = std::numeric_limits<std::size_t>::max();
-
-
-RecordSet::RecordSet(const Statement& rStatement,
-	RowFormatter::Ptr pRowFormatter): 
-	Statement(rStatement),
-	_currentRow(0),
-	_pBegin(new RowIterator(this, 0 == rowsExtracted())),
-	_pEnd(new RowIterator(this, true)),
-	_totalRowCount(UNKNOWN_TOTAL_ROW_COUNT)
-{
-	if (pRowFormatter) setRowFormatter(pRowFormatter);
-}
-
-
-RecordSet::RecordSet(Session& rSession, 
-	const std::string& query, 
-	RowFormatter::Ptr pRowFormatter): 
-	Statement((rSession << query, now)),
-	_currentRow(0),
-	_pBegin(new RowIterator(this, 0 == rowsExtracted())),
-	_pEnd(new RowIterator(this, true)),
-	_totalRowCount(UNKNOWN_TOTAL_ROW_COUNT)
-{
-	if (pRowFormatter) setRowFormatter(pRowFormatter);
-}
-
-
-RecordSet::RecordSet(const RecordSet& other):
-	Statement(other.impl()),
-	_currentRow(other._currentRow),
-	_pBegin(new RowIterator(this, 0 == rowsExtracted())),
-	_pEnd(new RowIterator(this, true)),
-	_pFilter(other._pFilter),
-	_totalRowCount(other._totalRowCount)
-{
-}
-
-
-RecordSet::~RecordSet()
-{
-	try
-	{
-		delete _pBegin;
-		delete _pEnd;
-
-		RowMap::iterator it = _rowMap.begin();
-		RowMap::iterator end = _rowMap.end();
-		for (; it != end; ++it) delete it->second;
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-void RecordSet::reset(const Statement& stmt)
-{
-	delete _pBegin;
-	_pBegin = 0;
-	delete _pEnd;
-	_pEnd = 0;
-	_currentRow = 0;
-	_totalRowCount = UNKNOWN_TOTAL_ROW_COUNT;
-	
-	RowMap::iterator it = _rowMap.begin();
-	RowMap::iterator end = _rowMap.end();
-	for (; it != end; ++it) delete it->second;
-	_rowMap.clear();
-
-	Statement::operator = (stmt);
-
-	_pBegin = new RowIterator(this, 0 == rowsExtracted());
-	_pEnd = new RowIterator(this, true);
-}
-
-
-Poco::Dynamic::Var RecordSet::value(std::size_t col, std::size_t row, bool useFilter) const
-{
-	if (useFilter && isFiltered() && !isAllowed(row))
-		throw InvalidAccessException("Row not allowed");
-
-	if (isNull(col, row)) return Poco::Dynamic::Var();
-
-	switch (columnType(col))
-	{
-	case MetaColumn::FDT_BOOL:      return value<bool>(col, row, useFilter);
-	case MetaColumn::FDT_INT8:      return value<Int8>(col, row, useFilter);
-	case MetaColumn::FDT_UINT8:     return value<UInt8>(col, row, useFilter);
-	case MetaColumn::FDT_INT16:     return value<Int16>(col, row, useFilter);
-	case MetaColumn::FDT_UINT16:    return value<UInt16>(col, row, useFilter);
-	case MetaColumn::FDT_INT32:	    return value<Int32>(col, row, useFilter);
-	case MetaColumn::FDT_UINT32:    return value<UInt32>(col, row, useFilter);
-	case MetaColumn::FDT_INT64:     return value<Int64>(col, row, useFilter);
-	case MetaColumn::FDT_UINT64:    return value<UInt64>(col, row, useFilter);
-	case MetaColumn::FDT_FLOAT:     return value<float>(col, row, useFilter);
-	case MetaColumn::FDT_DOUBLE:    return value<double>(col, row, useFilter);
-	case MetaColumn::FDT_STRING:    return value<std::string>(col, row, useFilter);
-	case MetaColumn::FDT_WSTRING:   return value<UTF16String>(col, row, useFilter);
-	case MetaColumn::FDT_BLOB:      return value<BLOB>(col, row, useFilter);
-	case MetaColumn::FDT_CLOB:      return value<CLOB>(col, row, useFilter);
-	case MetaColumn::FDT_DATE:      return value<Date>(col, row, useFilter);
-	case MetaColumn::FDT_TIME:      return value<Time>(col, row, useFilter);
-	case MetaColumn::FDT_TIMESTAMP: return value<DateTime>(col, row);
-	default:
-		throw UnknownTypeException("Data type not supported.");
-	}
-}
-
-
-Poco::Dynamic::Var RecordSet::value(const std::string& name, std::size_t row, bool useFilter) const
-{
-	if (useFilter && isFiltered() && !isAllowed(row))
-		throw InvalidAccessException("Row not allowed");
-
-	if (isNull(metaColumn(name).position(), row)) return Poco::Dynamic::Var();
-
-	switch (columnType(name))
-	{
-	case MetaColumn::FDT_BOOL:      return value<bool>(name, row, useFilter);
-	case MetaColumn::FDT_INT8:      return value<Int8>(name, row, useFilter);
-	case MetaColumn::FDT_UINT8:     return value<UInt8>(name, row, useFilter);
-	case MetaColumn::FDT_INT16:     return value<Int16>(name, row, useFilter);
-	case MetaColumn::FDT_UINT16:    return value<UInt16>(name, row, useFilter);
-	case MetaColumn::FDT_INT32:	    return value<Int32>(name, row, useFilter);
-	case MetaColumn::FDT_UINT32:    return value<UInt32>(name, row, useFilter);
-	case MetaColumn::FDT_INT64:     return value<Int64>(name, row, useFilter);
-	case MetaColumn::FDT_UINT64:    return value<UInt64>(name, row, useFilter);
-	case MetaColumn::FDT_FLOAT:     return value<float>(name, row, useFilter);
-	case MetaColumn::FDT_DOUBLE:    return value<double>(name, row, useFilter);
-	case MetaColumn::FDT_STRING:    return value<std::string>(name, row, useFilter);
-	case MetaColumn::FDT_WSTRING:   return value<UTF16String>(name, row, useFilter);
-	case MetaColumn::FDT_BLOB:      return value<BLOB>(name, row, useFilter);
-	case MetaColumn::FDT_DATE:      return value<Date>(name, row, useFilter);
-	case MetaColumn::FDT_TIME:      return value<Time>(name, row, useFilter);
-	case MetaColumn::FDT_TIMESTAMP: return value<DateTime>(name, row, useFilter);
-	default:
-		throw UnknownTypeException("Data type not supported.");
-	}
-}
-
-
-Row& RecordSet::row(std::size_t pos)
-{
-	std::size_t rowCnt = rowCount();
-	if (0 == rowCnt || pos > rowCnt - 1)
-		throw RangeException("Invalid recordset row requested.");
-
-	RowMap::const_iterator it = _rowMap.find(pos);
-	Row* pRow = 0;
-	std::size_t columns = columnCount();
-	if (it == _rowMap.end())
-	{
-		if (_rowMap.size())
-		{
-			//reuse first row column names and sorting fields to save some memory 
-			pRow = new Row(_rowMap.begin()->second->names(),
-				_rowMap.begin()->second->getSortMap(),
-				getRowFormatter());
-
-			for (std::size_t col = 0; col < columns; ++col)
-				pRow->set(col, value(col, pos));
-		}
-		else 
-		{
-			pRow = new Row;
-			pRow->setFormatter(getRowFormatter());
-			for (std::size_t col = 0; col < columns; ++col)
-				pRow->append(metaColumn(static_cast<UInt32>(col)).name(), value(col, pos));
-		}
-
-		_rowMap.insert(RowMap::value_type(pos, pRow));
-	}
-	else 
-	{
-		pRow = it->second;
-		poco_check_ptr (pRow);
-	}
-
-	return *pRow;
-}
-
-
-std::size_t RecordSet::rowCount() const
-{
-	poco_assert (extractions().size());
-	std::size_t rc = subTotalRowCount();
-	if (!isFiltered()) return rc;
-
-	std::size_t counter = 0;
-	for (int row = 0; row < rc; ++row)
-	{
-		if (isAllowed(row)) ++counter;
-	}
-
-	return counter;
-}
-
-
-bool RecordSet::isAllowed(std::size_t row) const
-{
-	if (!isFiltered()) return true;
-	return _pFilter->isAllowed(row);
-}
-
-
-bool RecordSet::moveFirst()
-{
-	if (subTotalRowCount() > 0)
-	{
-		if (!isFiltered())
-		{
-			_currentRow = 0;
-			return true;
-		}
-
-		std::size_t currentRow = 0;
-		while (!isAllowed(currentRow))
-		{
-			if (currentRow >= subTotalRowCount() - 1) return false;
-			++currentRow;
-		}
-
-		_currentRow = currentRow;
-		return true;
-	}
-	else return false;
-}
-
-
-bool RecordSet::moveNext()
-{
-	std::size_t currentRow = _currentRow;
-	do
-	{
-		if (currentRow >= subTotalRowCount() - 1) return false;
-		++currentRow;
-	} while (isFiltered() && !isAllowed(currentRow));
-
-	_currentRow = currentRow;
-	return true;
-}
-
-
-bool RecordSet::movePrevious()
-{
-	std::size_t currentRow = _currentRow;
-	do
-	{
-		if (currentRow <= 0) return false;
-		--currentRow;
-	} while (isFiltered() && !isAllowed(currentRow));
-
-	_currentRow = currentRow;
-	return true;
-}
-
-
-bool RecordSet::moveLast()
-{
-	if (subTotalRowCount() > 0)
-	{
-		std::size_t currentRow = subTotalRowCount() - 1;
-		if (!isFiltered())
-		{
-			_currentRow = currentRow;
-			return true;
-		}
-
-		while (!isAllowed(currentRow))
-		{
-			if (currentRow <= 0) return false;
-			--currentRow;
-		}
-
-		_currentRow = currentRow;
-		return true;
-	}
-	else return false;
-}
-
-
-void RecordSet::setRowFormatter(RowFormatter::Ptr pRowFormatter)
-{
-	pRowFormatter->setTotalRowCount(static_cast<int>(getTotalRowCount()));
-	Statement::setRowFormatter(pRowFormatter);
-	RowMap::iterator it = _rowMap.begin();
-	RowMap::iterator end = _rowMap.end();
-	for (; it != end; ++it) it->second->setFormatter(getRowFormatter());
-}
-
-
-std::ostream& RecordSet::copyNames(std::ostream& os) const
-{
-	std::string names = (*_pBegin)->namesToString();
-	if (!names.empty()) os << names;
-	return os;
-}
-
-
-std::ostream& RecordSet::copyValues(std::ostream& os, std::size_t offset, std::size_t length) const
-{
-	RowIterator it = *_pBegin + offset;
-	RowIterator end = (RowIterator::POSITION_END != length) ? it + length : *_pEnd;
-	std::copy(it, end, std::ostream_iterator<Row>(os));
-	return os;
-}
-
-
-void RecordSet::formatValues(std::size_t offset, std::size_t length) const
-{
-	RowIterator it = *_pBegin + offset;
-	RowIterator end = (RowIterator::POSITION_END != length) ? it + length : *_pEnd;
-	std::string val;
-	for (; it != end; ++it) it->formatValues();
-}
-
-
-std::ostream& RecordSet::copy(std::ostream& os, std::size_t offset, std::size_t length) const
-{
-	RowFormatter& rf = const_cast<RowFormatter&>((*_pBegin)->getFormatter());
-	rf.setTotalRowCount(static_cast<int>(getTotalRowCount()));
-	if (RowFormatter::FORMAT_PROGRESSIVE == rf.getMode())
-	{
-		os << rf.prefix();
-		copyNames(os);
-		copyValues(os, offset, length);
-		os << rf.postfix();
-	}
-	else
-	{
-		formatNames();
-		formatValues(offset, length);
-		os << rf.toString();
-	}
-
-	return os;
-}
-
-
-void RecordSet::filter(const Poco::AutoPtr<RowFilter>& pFilter)
-{
-	_pFilter = pFilter;
-}
-
-
-bool RecordSet::isFiltered() const
-{
-	return _pFilter && !_pFilter->isEmpty();
-}
-
-
-void RecordSet::setTotalRowCount(const std::string& sql)
-{
-	session() << sql, into(_totalRowCount), now;
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/Row.cpp b/contrib/poco/Data/src/Row.cpp
deleted file mode 100644
index d078536bd..000000000
--- a/contrib/poco/Data/src/Row.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-//
-// Row.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  Row
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/Row.h"
-#include "Poco/Data/SimpleRowFormatter.h"
-#include "Poco/String.h"
-#include "Poco/Exception.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-std::ostream& operator << (std::ostream &os, const Row& row)
-{
-	os << row.valuesToString();
-	return os;
-}
-
-
-Row::Row(): 
-	_pNames(0),
-	_pSortMap(new SortMap),
-	_pFormatter(new SimpleRowFormatter)
-{
-}
-
-
-Row::Row(NameVecPtr pNames,
-	const RowFormatter::Ptr& pFormatter): _pNames(pNames)
-{
-	if (!_pNames) throw NullPointerException();
-	init(0, pFormatter);
-}
-
-
-Row::Row(NameVecPtr pNames,
-	const SortMapPtr& pSortMap,
-	const RowFormatter::Ptr& pFormatter): _pNames(pNames)
-{
-	if (!_pNames) throw NullPointerException();
-	init(pSortMap, pFormatter);
-}
-
-
-void Row::init(const SortMapPtr& pSortMap, const RowFormatter::Ptr& pFormatter)
-{
-	setFormatter(pFormatter);
-	setSortMap(pSortMap);
-
-	NameVec::size_type sz = _pNames->size();
-	if (sz)
-	{
-		_values.resize(sz);
-		// Row sortability in the strict weak ordering sense is 
-		// an invariant, hence we must start with a zero here.
-		// If null value is later retrieved from DB, the 
-		// Var::empty() call should be used to empty
-		// the corresponding Row value.
-		_values[0] = 0;
-		addSortField(0);
-	}
-}
-
-
-Row::~Row()
-{
-}
-
-
-Poco::Dynamic::Var& Row::get(std::size_t col)
-{
-	try
-	{
-		return _values.at(col);
-	}
-	catch (std::out_of_range& re)
-	{
-		throw RangeException(re.what());
-	}
-}
-
-
-std::size_t Row::getPosition(const std::string& name)
-{
-	if (!_pNames)
-		throw NullPointerException();
-
-	NameVec::const_iterator it = _pNames->begin();
-	NameVec::const_iterator end = _pNames->end();
-	std::size_t col = 0;
-	for (; it != end; ++it, ++col)
-		if (0 == icompare(name, *it)) return col;
-	
-	throw NotFoundException(name);
-}
-
-
-void Row::addSortField(std::size_t pos)
-{
-	poco_assert (pos <= _values.size());
-
-	SortMap::iterator it = _pSortMap->begin();
-	SortMap::iterator end = _pSortMap->end();
-	for (; it != end; ++it)
-	{
-		if (it->get<0>() == pos) return; 
-	}
-
-	ComparisonType ct;
-	if (_values[pos].isEmpty())
-	{
-		ct = COMPARE_AS_EMPTY;
-	}
-	else if ((_values[pos].type() == typeid(Poco::Int8))   ||
-		(_values[pos].type() == typeid(Poco::UInt8))  ||
-		(_values[pos].type() == typeid(Poco::Int16))  ||
-		(_values[pos].type() == typeid(Poco::UInt16)) ||
-		(_values[pos].type() == typeid(Poco::Int32))  ||
-		(_values[pos].type() == typeid(Poco::UInt32)) ||
-		(_values[pos].type() == typeid(Poco::Int64))  ||
-		(_values[pos].type() == typeid(Poco::UInt64)) ||
-		(_values[pos].type() == typeid(bool)))
-	{
-		ct = COMPARE_AS_INTEGER;
-	}
-	else if ((_values[pos].type() == typeid(float)) ||
-		(_values[pos].type() == typeid(double)))
-	{
-		ct = COMPARE_AS_FLOAT;
-	}
-	else
-	{
-		ct = COMPARE_AS_STRING;
-	}
-
-	_pSortMap->push_back(SortTuple(pos, ct));
-}
-
-
-void Row::addSortField(const std::string& name)
-{
-	addSortField(getPosition(name));
-}
-
-
-void Row::removeSortField(std::size_t pos)
-{
-	SortMap::iterator it = _pSortMap->begin();
-	SortMap::iterator end = _pSortMap->end();
-	for (; it != end; ++it)
-	{
-		if (it->get<0>() == pos)
-		{
-			_pSortMap->erase(it);
-			return;
-		}
-	}
-}
-
-
-void Row::removeSortField(const std::string& name)
-{
-	removeSortField(getPosition(name));
-}
-
-
-void Row::replaceSortField(std::size_t oldPos, std::size_t newPos)
-{
-	poco_assert (oldPos <= _values.size());
-	poco_assert (newPos <= _values.size());
-
-	ComparisonType ct;
-
-	if (_values[newPos].isEmpty())
-	{
-		ct = COMPARE_AS_EMPTY;
-	}
-	else if ((_values[newPos].type() == typeid(Poco::Int8)) ||
-		(_values[newPos].type() == typeid(Poco::UInt8))     ||
-		(_values[newPos].type() == typeid(Poco::Int16))     ||
-		(_values[newPos].type() == typeid(Poco::UInt16))    ||
-		(_values[newPos].type() == typeid(Poco::Int32))     ||
-		(_values[newPos].type() == typeid(Poco::UInt32))    ||
-		(_values[newPos].type() == typeid(Poco::Int64))     ||
-		(_values[newPos].type() == typeid(Poco::UInt64))    ||
-		(_values[newPos].type() == typeid(bool)))
-	{
-		ct = COMPARE_AS_INTEGER;
-	}
-	else if ((_values[newPos].type() == typeid(float)) ||
-		(_values[newPos].type() == typeid(double)))
-	{
-		ct = COMPARE_AS_FLOAT;
-	}
-	else
-	{
-		ct = COMPARE_AS_STRING;
-	}
-
-	SortMap::iterator it = _pSortMap->begin();
-	SortMap::iterator end = _pSortMap->end();
-	for (; it != end; ++it)
-	{
-		if (it->get<0>() == oldPos)
-		{
-			*it = SortTuple(newPos, ct);
-			return;
-		}
-	}
-
-	throw NotFoundException("Field not found");
-}
-
-
-void Row::replaceSortField(const std::string& oldName, const std::string& newName)
-{
-	replaceSortField(getPosition(oldName), getPosition(newName));
-}
-
-
-void Row::resetSort()
-{
-	_pSortMap->clear();
-	if (_values.size())	addSortField(0);
-}
-
-
-bool Row::isEqualSize(const Row& other) const
-{
-	return (other._values.size() == _values.size());
-}
-
-
-bool Row::isEqualType(const Row& other) const
-{
-	std::vector<Poco::Dynamic::Var>::const_iterator it = _values.begin();
-	std::vector<Poco::Dynamic::Var>::const_iterator end = _values.end();
-	for (int i = 0; it != end; ++it, ++i)
-	{
-		if (it->type() != other._values[i].type())
-			return false;
-	}
-
-	return true;
-}
-
-
-bool Row::operator == (const Row& other) const
-{
-	if (!isEqualSize(other)) return false;
-	if (!isEqualType(other)) return false;
-
-	std::vector<Poco::Dynamic::Var>::const_iterator it = _values.begin();
-	std::vector<Poco::Dynamic::Var>::const_iterator end = _values.end();
-	for (int i = 0; it != end; ++it, ++i)
-	{
-		if ((*it).convert<std::string>() != other._values[i].convert<std::string>())
-			return false;
-	}
-
-	return true;
-}
-
-
-bool Row::operator != (const Row& other) const
-{
-	return !(*this == other);
-}
-
-
-bool Row::operator < (const Row& other) const
-{
-	if (*_pSortMap != *other._pSortMap)
-		throw InvalidAccessException("Rows compared have different sorting criteria.");
-
-	SortMap::const_iterator it = _pSortMap->begin();
-	SortMap::const_iterator end = _pSortMap->end();
-	for (; it != end; ++it)
-	{
-		switch (it->get<1>())
-		{
-		case COMPARE_AS_EMPTY:
-			return false;
-
-		case COMPARE_AS_INTEGER:
-			if (_values[it->get<0>()].convert<Poco::Int64>() < 
-				other._values[it->get<0>()].convert<Poco::Int64>())
-				return true;
-			else if (_values[it->get<0>()].convert<Poco::Int64>() != 
-				other._values[it->get<0>()].convert<Poco::Int64>())
-				return false;
-			break;
-
-		case COMPARE_AS_FLOAT:
-			if (_values[it->get<0>()].convert<double>() < 
-				other._values[it->get<0>()].convert<double>())
-				return true;
-			else if (_values[it->get<0>()].convert<double>() !=
-				other._values[it->get<0>()].convert<double>())
-				return false;
-			break;
-
-		case COMPARE_AS_STRING:
-			if (_values[it->get<0>()].convert<std::string>() < 
-				other._values[it->get<0>()].convert<std::string>())
-				return true;
-			else if (_values[it->get<0>()].convert<std::string>() !=
-				other._values[it->get<0>()].convert<std::string>())
-				return false;
-			break;
-
-		default:
-			throw IllegalStateException("Unknown comparison criteria.");
-		}
-	}
-
-	return false;
-}
-
-
-void Row::setFormatter(const RowFormatter::Ptr& pFormatter)
-{
-	if (pFormatter.get())
-		_pFormatter = pFormatter;
-	else 
-		_pFormatter = new SimpleRowFormatter;
-}
-
-
-void Row::setSortMap(const SortMapPtr& pSortMap)
-{
-	if (pSortMap.get())
-		_pSortMap = pSortMap;
-	else 
-		_pSortMap = new SortMap;
-}
-
-
-const std::string& Row::namesToString() const
-{
-	if (!_pNames)
-		throw NullPointerException();
-
-	return _pFormatter->formatNames(names(), _nameStr);
-}
-
-
-void Row::formatNames() const
-{
-	if (!_pNames)
-		throw NullPointerException();
-
-	return _pFormatter->formatNames(names());
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/RowFilter.cpp b/contrib/poco/Data/src/RowFilter.cpp
deleted file mode 100644
index 9fd0b6287..000000000
--- a/contrib/poco/Data/src/RowFilter.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-//
-// RowFilter.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  RowFilter
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/RowFilter.h"
-#include "Poco/Data/RecordSet.h"
-#include "Poco/String.h"
-#include "Poco/Exception.h"
-#include <functional>
-
-
-namespace Poco {
-namespace Data {
-
-
-RowFilter::RowFilter(RecordSet* pRecordSet): _pRecordSet(pRecordSet), _not(false)
-{
-	poco_check_ptr(pRecordSet);
-	init();
-	duplicate();
-	_pRecordSet->filter(this);
-}
-
-
-RowFilter::RowFilter(Ptr pParent, LogicOperator op): _pRecordSet(0),
-	_pParent(pParent),
-	_not(false)
-{
-	poco_check_ptr(_pParent.get());
-	init();
-	duplicate();
-	_pParent->addFilter(this, op);
-}
-
-
-void RowFilter::init()
-{
-	_comparisons.insert(Comparisons::value_type("<", VALUE_LESS_THAN));
-	_comparisons.insert(Comparisons::value_type("<=", VALUE_LESS_THAN_OR_EQUAL));
-	_comparisons.insert(Comparisons::value_type("=", VALUE_EQUAL));
-	_comparisons.insert(Comparisons::value_type("==", VALUE_EQUAL));
-	_comparisons.insert(Comparisons::value_type(">", VALUE_GREATER_THAN));
-	_comparisons.insert(Comparisons::value_type(">=", VALUE_GREATER_THAN_OR_EQUAL));
-	_comparisons.insert(Comparisons::value_type("<>", VALUE_NOT_EQUAL));
-	_comparisons.insert(Comparisons::value_type("!=", VALUE_NOT_EQUAL));
-	_comparisons.insert(Comparisons::value_type("IS NULL", VALUE_IS_NULL));
-}
-
-
-RowFilter::~RowFilter()
-{
-	try
-	{
-		if (_pRecordSet) _pRecordSet->filter(0);
-		if (_pParent && _pParent->has(this))
-			_pParent->removeFilter(this);
-		release();
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-bool RowFilter::isAllowed(std::size_t row) const
-{
-	Poco::Dynamic::Var retVal;
-	const RecordSet& rs = recordSet();
-	
-	std::size_t columns = rs.columnCount();
-	ComparisonMap::const_iterator it = _comparisonMap.begin();
-	ComparisonMap::const_iterator end = _comparisonMap.end();
-	for (; it != end; ++it)
-	{
-		for (std::size_t col = 0; col < columns; ++col)
-		{
-			const std::string name = toUpper(rs.metaColumn(static_cast<UInt32>(col)).name());
-			if (_comparisonMap.find(name) == _comparisonMap.end()) continue;
-
-			Poco::Dynamic::Var ret;
-			CompT compOp = 0;
-			Poco::Dynamic::Var val = rs.value(col, row, false);
-
-			switch (it->second.get<1>())
-			{
-			case VALUE_LESS_THAN:
-				compOp = less; break;
-			case VALUE_LESS_THAN_OR_EQUAL:
-				compOp = lessOrEqual; break;
-			case VALUE_EQUAL:
-				compOp = equal; break;
-			case VALUE_GREATER_THAN:
-				compOp = greater; break;
-			case VALUE_GREATER_THAN_OR_EQUAL:
-				compOp = greaterOrEqual; break;
-			case VALUE_NOT_EQUAL:
-				compOp = notEqual; break;
-			case VALUE_IS_NULL:
-				compOp = isNull; break;
-			default:
-				throw IllegalStateException("Unsupported comparison criteria.");
-			}
-			
-			doCompare(ret, val, compOp, it->second);
-			if (retVal.isEmpty()) retVal = ret;
-			else retVal = retVal || ret;
-		}
-	}
-
-	// iterate through children
-	FilterMap::const_iterator fIt = _filterMap.begin();
-	FilterMap::const_iterator fEnd = _filterMap.end();
-	for (; fIt != fEnd; ++fIt)
-	{
-		if (OP_OR == fIt->second)
-		{
-			if (retVal.isEmpty())
-				retVal = fIt->first->isAllowed(row);
-			else
-				retVal = retVal || fIt->first->isAllowed(row);
-		}
-		else if (OP_AND == fIt->second)
-		{
-			if (retVal.isEmpty())
-				retVal = fIt->first->isAllowed(row);
-			else
-				retVal = retVal && fIt->first->isAllowed(row);
-		}
-		else
-			throw IllegalStateException("Unknown logical operation.");
-	}
-
-	if (retVal.isEmpty()) retVal = true; // no filtering found
-	return (!_not) && retVal.extract<bool>();
-}
-
-
-int RowFilter::remove(const std::string& name)
-{
-	poco_check_ptr (_pRecordSet);
-	_pRecordSet->moveFirst();
-	return static_cast<int>(_comparisonMap.erase(toUpper(name)));
-}
-
-
-RowFilter::Comparison RowFilter::getComparison(const std::string& comp) const
-{
-	Comparisons::const_iterator it = _comparisons.find(toUpper(comp));
-	if (it == _comparisons.end())
-		throw NotFoundException("Comparison not found", comp);
-
-	return it->second;
-}
-
-
-void RowFilter::addFilter(Ptr pFilter, LogicOperator comparison)
-{
-	poco_check_ptr (_pRecordSet);
-
-	pFilter->_pRecordSet = _pRecordSet;
-	_pRecordSet->moveFirst();
-	_filterMap.insert(FilterMap::value_type(pFilter, comparison));
-}
-
-
-void RowFilter::removeFilter(Ptr pFilter)
-{
-	poco_check_ptr (_pRecordSet);
-
-	_pRecordSet->moveFirst();
-	_filterMap.erase(pFilter);
-	pFilter->_pRecordSet = 0;
-	pFilter->_pParent = 0;
-}
-
-
-void RowFilter::doCompare(Poco::Dynamic::Var& ret,
-	Poco::Dynamic::Var& val,
-	CompT comp,
-	const ComparisonEntry& ce)
-{
-	if (ret.isEmpty()) ret = comp(val, ce.get<0>());
-	else
-	{
-		if (ce.get<2>() == OP_OR)
-			ret = ret || comp(val, ce.get<0>());
-		else if (ce.get<2>() == OP_AND)
-			ret = ret && comp(val, ce.get<0>());
-		else
-			throw IllegalStateException("Unknown logical operation.");
-	}
-}
-
-
-RecordSet& RowFilter::recordSet() const
-{
-	if (!_pRecordSet)
-	{
-		Ptr pParent = _pParent;
-		while (pParent && !_pRecordSet)
-			_pRecordSet = pParent->_pRecordSet;
-	}
-	poco_check_ptr (_pRecordSet);
-	return *_pRecordSet; 
-}
-
-
-void RowFilter::rewindRecordSet()
-{
-	if (_pRecordSet) _pRecordSet->moveFirst();
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/RowFormatter.cpp b/contrib/poco/Data/src/RowFormatter.cpp
deleted file mode 100644
index 071c80f6f..000000000
--- a/contrib/poco/Data/src/RowFormatter.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// RowFormatter.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  RowFormatter
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/RowFormatter.h"
-#include "Poco/Exception.h"
-#include <iomanip>
-
-
-namespace Poco {
-namespace Data {
-
-
-RowFormatter::RowFormatter(const std::string& prefix,
-	const std::string& postfix,
-	Mode mode):
-	_prefix(prefix), 
-	_postfix(postfix),
-	_mode(mode),
-	_totalRowCount(0)
-{
-}
-
-
-RowFormatter::~RowFormatter()
-{
-}
-
-
-std::string& RowFormatter::formatNames(const NameVecPtr pNames, std::string& formattedNames)
-{
-	formattedNames.clear();
-	return formattedNames;
-}
-
-
-void RowFormatter::formatNames(const NameVecPtr pNames)
-{
-	return;
-}
-
-
-std::string& RowFormatter::formatValues(const ValueVec& vals, std::string& formattedValues)
-{
-	formattedValues.clear();
-	return formattedValues;
-}
-
-
-void RowFormatter::formatValues(const ValueVec& vals)
-{
-	return;
-}
-
-
-const std::string& RowFormatter::toString()
-{
-	throw NotImplementedException("RowFormatter::toString()");
-}
-
-
-void RowFormatter::reset()
-{
-	_prefix = "";
-	_postfix = "";
-	_totalRowCount = INVALID_ROW_COUNT;
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/RowIterator.cpp b/contrib/poco/Data/src/RowIterator.cpp
deleted file mode 100644
index c7e1f45c3..000000000
--- a/contrib/poco/Data/src/RowIterator.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-//
-// RowIterator.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  RowIterator
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/RowIterator.h"
-#include "Poco/Data/RecordSet.h"
-#undef min
-#undef max
-#include <limits>
-
-
-namespace Poco {
-namespace Data {
-
-
-const std::size_t RowIterator::POSITION_END = std::numeric_limits<std::size_t>::max();
-
-
-RowIterator::RowIterator(RecordSet* pRecordSet, bool positionEnd): 
-	_pRecordSet(pRecordSet),
-	_position(positionEnd ? POSITION_END : 0)
-{
-}
-
-
-RowIterator::RowIterator(const RowIterator& other):
-	_pRecordSet(other._pRecordSet),
-	_position(other._position)
-{
-}
-
-
-RowIterator::~RowIterator()
-{
-}
-
-
-RowIterator& RowIterator::operator = (const RowIterator& other)
-{
-	RowIterator tmp(other);
-	swap(tmp);
-	return *this;
-}
-
-
-void RowIterator::swap(RowIterator& other)
-{
-	using std::swap;
-	
-	swap(_pRecordSet, other._pRecordSet);
-	swap(_position, other._position);
-}
-
-
-void RowIterator::increment() const
-{
-	if (POSITION_END == _position)
-		throw RangeException("End of iterator reached.");
-
-	if (_position < _pRecordSet->subTotalRowCount() - 1)
-		++_position;
-	else
-		_position = POSITION_END;
-
-	if (_pRecordSet->getFilter() && POSITION_END != _position)
-	{
-		while (!_pRecordSet->isAllowed(_position))
-		{
-			increment();
-			if (POSITION_END == _position) break;
-		}
-	}
-}
-
-
-void RowIterator::decrement() const
-{
-	if (0 == _position)
-		throw RangeException("Beginning of iterator reached.");
-	else if (POSITION_END == _position)
-		_position = _pRecordSet->subTotalRowCount() - 1;
-	else
-		--_position;
-
-	if (_pRecordSet->getFilter() && 0 != _position)
-	{
-		while (!_pRecordSet->isAllowed(_position))
-		{
-			decrement();
-			if (0 == _position) break;
-		}
-	}
-}
-
-
-void RowIterator::setPosition(std::size_t pos) const
-{
-	if (_position == pos) return;
-
-	if (_pRecordSet->getFilter())
-	{
-		std::size_t start = _position;
-		if (_position > pos)
-		{
-			std::size_t end = _position - pos;
-			for (; start > end; --start)
-			{
-				if (pos) --pos;
-				else throw RangeException("Invalid position argument.");
-			}
-		}
-		else
-		{
-			std::size_t end = pos - _position;
-			for (; start < end; ++start)
-			{
-				if (_pRecordSet->subTotalRowCount() != pos) ++pos;
-				else throw RangeException("Invalid position argument.");
-			}
-		}
-	}
-
-	if (pos < _pRecordSet->subTotalRowCount())
-		_position = pos;
-	else if (pos == _pRecordSet->subTotalRowCount())
-		_position = POSITION_END;
-	else
-		throw RangeException("Invalid position argument.");
-}
-
-
-Row& RowIterator::operator * () const
-{
-	if (POSITION_END == _position)
-		throw InvalidAccessException("End of iterator reached.");
-
-	return _pRecordSet->row(_position);
-}
-
-
-Row* RowIterator::operator -> () const
-{
-	if (POSITION_END == _position)
-		throw InvalidAccessException("End of iterator reached.");
-
-	return &_pRecordSet->row(_position);
-}
-
-
-const RowIterator& RowIterator::operator ++ () const
-{
-	increment();
-	return *this;
-}
-
-
-RowIterator RowIterator::operator ++ (int) const
-{
-	RowIterator old(*this);
-	increment();
-	return old;
-}
-
-
-const RowIterator& RowIterator::operator -- () const
-{
-	decrement();
-	return *this;
-}
-
-
-RowIterator RowIterator::operator -- (int) const
-{
-	RowIterator old(*this);
-	decrement();
-	return old;
-}
-
-
-RowIterator RowIterator::operator + (std::size_t diff) const
-{
-	RowIterator ri(*this);
-	ri.setPosition(_position + diff);
-	return ri;
-}
-
-
-RowIterator RowIterator::operator - (std::size_t diff) const
-{
-	if (diff > _position) throw RangeException("Invalid position argument.");
-	RowIterator ri(*this);
-	ri.setPosition(_position - diff);
-	return ri;
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/SQLChannel.cpp b/contrib/poco/Data/src/SQLChannel.cpp
deleted file mode 100644
index bd23fc9a5..000000000
--- a/contrib/poco/Data/src/SQLChannel.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-//
-// SQLChannel.cpp
-//
-// Library: Data
-// Package: Logging
-// Module:  SQLChannel
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/SQLChannel.h"
-#include "Poco/Data/SessionFactory.h"
-#include "Poco/DateTime.h"
-#include "Poco/LoggingFactory.h"
-#include "Poco/Instantiator.h"
-#include "Poco/NumberParser.h"
-#include "Poco/NumberFormatter.h"
-#include "Poco/Format.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-using namespace Keywords;
-
-
-const std::string SQLChannel::PROP_CONNECTOR("connector");
-const std::string SQLChannel::PROP_CONNECT("connect");
-const std::string SQLChannel::PROP_NAME("name");
-const std::string SQLChannel::PROP_TABLE("table");
-const std::string SQLChannel::PROP_ARCHIVE_TABLE("archive");
-const std::string SQLChannel::PROP_MAX_AGE("keep");
-const std::string SQLChannel::PROP_ASYNC("async");
-const std::string SQLChannel::PROP_TIMEOUT("timeout");
-const std::string SQLChannel::PROP_THROW("throw");
-
-
-SQLChannel::SQLChannel():
-	_name("-"),
-	_table("T_POCO_LOG"),
-	_timeout(1000),
-	_throw(true),
-	_async(true),
-	_pid(),
-	_tid(),
-	_priority()
-{
-}
-
-
-SQLChannel::SQLChannel(const std::string& connector, 
-	const std::string& connect,
-	const std::string& name):
-	_connector(connector),
-	_connect(connect),
-	_name(name),
-	_table("T_POCO_LOG"),
-	_timeout(1000),
-	_throw(true),
-	_async(true),
-	_pid(),
-	_tid(),
-	_priority()
-{
-	open();
-}
-
-
-SQLChannel::~SQLChannel()
-{
-	try
-	{
-		close();
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-void SQLChannel::open()
-{
-	if (_connector.empty() || _connect.empty())
-		throw IllegalStateException("Connector and connect string must be non-empty.");
-
-	_pSession = new Session(_connector, _connect);
-	initLogStatement();
-}
-
-	
-void SQLChannel::close()
-{
-	wait();
-}
-
-
-void SQLChannel::log(const Message& msg)
-{
-	if (_async) logAsync(msg);
-	else logSync(msg);
-}
-
-
-void SQLChannel::logAsync(const Message& msg)
-{
-	poco_check_ptr (_pLogStatement);
-	if (0 == wait() && !_pLogStatement->done() && !_pLogStatement->initialized()) 
-	{
-		if (_throw) 
-			throw TimeoutException("Timed out waiting for previous statement completion");
-		else return;
-	}
-
-	if (!_pSession || !_pSession->isConnected()) open();
-	logSync(msg);
-}
-
-
-void SQLChannel::logSync(const Message& msg)
-{
-	if (_pArchiveStrategy) _pArchiveStrategy->archive();
-
-	_source = msg.getSource();
-	_pid = msg.getPid();
-	_thread = msg.getThread();
-	_tid = msg.getTid();
-	_priority = msg.getPriority();
-	_text = msg.getText();
-	_dateTime = msg.getTime();
-	if (_source.empty()) _source = _name;
-
-	try
-	{
-		_pLogStatement->execute();
-	}
-	catch (Exception&)
-	{
-		if (_throw) throw;
-	}
-}
-
-	
-void SQLChannel::setProperty(const std::string& name, const std::string& value)
-{
-	if (name == PROP_NAME)
-	{
-		_name = value;
-		if (_name.empty()) _name = "-";
-	}
-	else if (name == PROP_CONNECTOR)
-	{
-		_connector = value;
-		close(); open();
-	}
-	else if (name == PROP_CONNECT)
-	{
-		_connect = value;
-		close(); open();
-	}
-	else if (name == PROP_TABLE)
-	{
-		_table = value;
-		initLogStatement();
-	}
-	else if (name == PROP_ARCHIVE_TABLE)
-	{
-		if (value.empty())
-		{
-			_pArchiveStrategy = 0;
-		}
-		else if (_pArchiveStrategy)
-		{
-			_pArchiveStrategy->setDestination(value);
-		}
-		else
-		{
-			_pArchiveStrategy = new ArchiveByAgeStrategy(_connector, _connect, _table, value);
-		}
-	}
-	else if (name == PROP_MAX_AGE)
-	{
-		if (value.empty() || "forever" == value)
-		{
-			_pArchiveStrategy = 0;
-		}
-		else if (_pArchiveStrategy)
-		{
-			_pArchiveStrategy->setThreshold(value);
-		}
-		else
-		{
-			ArchiveByAgeStrategy* p = new ArchiveByAgeStrategy(_connector, _connect, _table);
-			p->setThreshold(value);
-			_pArchiveStrategy = p;
-		}
-	}
-	else if (name == PROP_ASYNC)
-	{
-		_async = isTrue(value);
-		initLogStatement();
-	}
-	else if (name == PROP_TIMEOUT)
-	{
-		if (value.empty() || '0' == value[0])
-			_timeout = Statement::WAIT_FOREVER;
-		else
-			_timeout = NumberParser::parse(value);
-	}
-	else if (name == PROP_THROW)
-	{
-		_throw = isTrue(value);
-	}
-	else
-	{
-		Channel::setProperty(name, value);
-	}
-}
-
-	
-std::string SQLChannel::getProperty(const std::string& name) const
-{
-	if (name == PROP_NAME)
-	{
-		if (_name != "-") return _name;
-		else return "";
-	}
-	else if (name == PROP_CONNECTOR)
-	{
-		return _connector;
-	}
-	else if (name == PROP_CONNECT)
-	{
-		return _connect;
-	}
-	else if (name == PROP_TABLE)
-	{
-		return _table;
-	}
-	else if (name == PROP_ARCHIVE_TABLE)
-	{
-		return _pArchiveStrategy ? _pArchiveStrategy->getDestination() : "" ;
-	}
-	else if (name == PROP_MAX_AGE)
-	{
-		return _pArchiveStrategy ? _pArchiveStrategy->getThreshold() : "forever";
-	}
-	else if (name == PROP_TIMEOUT)
-	{
-		return NumberFormatter::format(_timeout);
-	}
-	else if (name == PROP_THROW)
-	{
-		if (_throw) return "true";
-		else return "false";
-	}
-	else
-	{
-		return Channel::getProperty(name);
-	}
-}
-
-
-void SQLChannel::initLogStatement()
-{
-	_pLogStatement = new Statement(*_pSession);
-
-	std::string sql;
-	Poco::format(sql, "INSERT INTO %s VALUES (?,?,?,?,?,?,?,?)", _table);
-	*_pLogStatement << sql,
-		use(_source),
-		use(_name),
-		use(_pid),
-		use(_thread),
-		use(_tid),
-		use(_priority),
-		use(_text),
-		use(_dateTime);
-
-	if (_async) _pLogStatement->setAsync();
-}
-
-
-void SQLChannel::registerChannel()
-{
-	Poco::LoggingFactory::defaultFactory().registerChannelClass("SQLChannel", 
-		new Poco::Instantiator<SQLChannel, Poco::Channel>);
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/Session.cpp b/contrib/poco/Data/src/Session.cpp
deleted file mode 100644
index e2cc6b6dd..000000000
--- a/contrib/poco/Data/src/Session.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Session.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  Session
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/Session.h"
-#include "Poco/Data/SessionFactory.h"
-#include "Poco/String.h"
-#include "Poco/URI.h"
-#include <algorithm>
-
-
-namespace Poco {
-namespace Data {
-
-
-Session::Session(Poco::AutoPtr<SessionImpl> pImpl):
-	_pImpl(pImpl),
-	_statementCreator(pImpl)
-{
-	poco_check_ptr (pImpl.get());
-}
-
-
-Session::Session(const std::string& connector,
-	const std::string& connectionString,
-	std::size_t timeout)
-{
-	Session newSession(SessionFactory::instance().create(connector, connectionString, timeout));
-	swap(newSession);
-}
-
-
-Session::Session(const std::string& connection,
-	std::size_t timeout)
-{
-	Session newSession(SessionFactory::instance().create(connection, timeout));
-	swap(newSession);
-}
-
-
-Session::Session(const Session& other):	_pImpl(other._pImpl),
-	_statementCreator(other._pImpl)
-{
-}
-
-
-Session::~Session()
-{
-}
-
-
-Session& Session::operator = (const Session& other)
-{
-	Session tmp(other);
-	swap(tmp);
-	return *this;
-}
-
-
-void Session::swap(Session& other)
-{
-	using std::swap;
-	swap(_statementCreator, other._statementCreator);
-	swap(_pImpl, other._pImpl);
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/SessionFactory.cpp b/contrib/poco/Data/src/SessionFactory.cpp
deleted file mode 100644
index bcc5c412f..000000000
--- a/contrib/poco/Data/src/SessionFactory.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// SessionFactory.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  SessionFactory
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/SessionFactory.h"
-#include "Poco/URI.h"
-#include "Poco/String.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-SessionFactory::SessionFactory()
-{
-}
-
-
-SessionFactory::~SessionFactory()
-{
-}
-
-
-SessionFactory& SessionFactory::instance()
-{
-	static SessionFactory sf;
-	return sf;
-}
-
-
-void SessionFactory::add(Connector* pIn)
-{
-	Poco::FastMutex::ScopedLock lock(_mutex);
-	SessionInfo info(pIn);
-	std::pair<Connectors::iterator, bool> res =
-		_connectors.insert(std::make_pair(pIn->name(), info));
-	if (!res.second) res.first->second.cnt++;
-}
-
-
-void SessionFactory::remove(const std::string& key)
-{
-	Poco::FastMutex::ScopedLock lock(_mutex);
-	Connectors::iterator it = _connectors.find(key);
-	poco_assert (_connectors.end() != it);
-
-	--(it->second.cnt);
-	if (it->second.cnt == 0) _connectors.erase(it);
-}
-
-
-Session SessionFactory::create(const std::string& key,
-	const std::string& connectionString,
-	std::size_t timeout)
-{
-	Poco::SharedPtr<Connector> ptrSI;
-	{
-		Poco::FastMutex::ScopedLock lock(_mutex);
-		Connectors::iterator it = _connectors.find(key);
-		if (_connectors.end() == it) throw Poco::NotFoundException(key);
-		ptrSI = it->second.ptrSI;
-	}
-	return Session(ptrSI->createSession(connectionString, timeout));
-}
-
-
-Session SessionFactory::create(const std::string& uri,
-	std::size_t timeout)
-{
-	URI u(uri);
-	poco_assert (!u.getPath().empty());
-	return create(u.getScheme(), u.getPath().substr(1), timeout);
-}
-
-
-SessionFactory::SessionInfo::SessionInfo(Connector* pSI): 
-	cnt(1), 
-	ptrSI(pSI)
-{
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/SessionImpl.cpp b/contrib/poco/Data/src/SessionImpl.cpp
deleted file mode 100644
index a422f7516..000000000
--- a/contrib/poco/Data/src/SessionImpl.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// SessionImpl.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  SessionImpl
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/SessionImpl.h"
-#include "Poco/Exception.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-SessionImpl::SessionImpl(const std::string& connectionString, std::size_t timeout): 
-	_connectionString(connectionString),
-	_loginTimeout(timeout)
-{
-}
-
-
-SessionImpl::~SessionImpl()
-{
-}
-
-
-void SessionImpl::reconnect()
-{
-	close();
-	open();
-}
-
-
-void SessionImpl::setConnectionString(const std::string& connectionString)
-{
-	if (isConnected())
-		throw Poco::InvalidAccessException("Can not change connection string on connected session."
-			" Close the session first.");
-
-	_connectionString = connectionString;
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/SessionPool.cpp b/contrib/poco/Data/src/SessionPool.cpp
deleted file mode 100644
index 095b38cfc..000000000
--- a/contrib/poco/Data/src/SessionPool.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-//
-// SessionPool.cpp
-//
-// Library: Data
-// Package: SessionPooling
-// Module:  SessionPool
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/SessionPool.h"
-#include "Poco/Data/SessionFactory.h"
-#include "Poco/Data/DataException.h"
-#include <algorithm>
-
-
-namespace Poco {
-namespace Data {
-
-
-SessionPool::SessionPool(const std::string& connector, const std::string& connectionString, int minSessions, int maxSessions, int idleTime):
-	_connector(connector),
-	_connectionString(connectionString),
-	_minSessions(minSessions),
-	_maxSessions(maxSessions),
-	_idleTime(idleTime),
-	_nSessions(0),
-	_janitorTimer(1000*idleTime, 1000*idleTime/4),
-	_shutdown(false)
-{
-	Poco::TimerCallback<SessionPool> callback(*this, &SessionPool::onJanitorTimer);
-	_janitorTimer.start(callback);
-}
-
-
-SessionPool::~SessionPool()
-{
-	try
-	{
-		shutdown();
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-Session SessionPool::get(const std::string& name, bool value)
-{
-	Session s = get();
-	_addFeatureMap.insert(AddFeatureMap::value_type(s.impl(),
-		std::make_pair(name, s.getFeature(name))));
-	s.setFeature(name, value);
-
-	return s;
-}
-
-
-Session SessionPool::get()
-{
-	Poco::Mutex::ScopedLock lock(_mutex);
-    if (_shutdown) throw InvalidAccessException("Session pool has been shut down.");
-	
-	purgeDeadSessions();
-
-	if (_idleSessions.empty())
-	{
-		if (_nSessions < _maxSessions)
-		{
-			Session newSession(SessionFactory::instance().create(_connector, _connectionString));
-			applySettings(newSession.impl());
-			customizeSession(newSession);
-
-			PooledSessionHolderPtr pHolder(new PooledSessionHolder(*this, newSession.impl()));
-			_idleSessions.push_front(pHolder);
-			++_nSessions;
-		}
-		else throw SessionPoolExhaustedException(_connector);
-	}
-
-	PooledSessionHolderPtr pHolder(_idleSessions.front());
-	PooledSessionImplPtr pPSI(new PooledSessionImpl(pHolder));
-	
-	_activeSessions.push_front(pHolder);
-	_idleSessions.pop_front();
-	return Session(pPSI);
-}
-
-
-void SessionPool::purgeDeadSessions()
-{
-	Poco::Mutex::ScopedLock lock(_mutex);
-	if (_shutdown) return;
-
-	SessionList::iterator it = _idleSessions.begin();
-	for (; it != _idleSessions.end(); )
-	{
-		if (!(*it)->session()->isConnected())
-		{
-			it = _idleSessions.erase(it);
-			--_nSessions;
-		}
-		else ++it;
-	}
-}
-
-
-int SessionPool::capacity() const
-{
-	return _maxSessions;
-}
-
-	
-int SessionPool::used() const
-{
-	Poco::Mutex::ScopedLock lock(_mutex);
-	return (int) _activeSessions.size();
-}
-
-	
-int SessionPool::idle() const
-{
-	Poco::Mutex::ScopedLock lock(_mutex);
-	return (int) _idleSessions.size();
-}
-
-
-int SessionPool::dead()
-{
-	Poco::Mutex::ScopedLock lock(_mutex);
-	int count = 0;
-
-	SessionList::iterator it = _activeSessions.begin();
-	SessionList::iterator itEnd = _activeSessions.end();
-	for (; it != itEnd; ++it)
-	{
-		if (!(*it)->session()->isConnected())
-			++count;
-	}
-
-	return count;
-}
-
-
-int SessionPool::allocated() const
-{
-	Poco::Mutex::ScopedLock lock(_mutex);
-	return _nSessions;
-}
-
-	
-int SessionPool::available() const
-{
-	if (_shutdown) return 0;
-	return _maxSessions - used();
-}
-
-
-void SessionPool::setFeature(const std::string& name, bool state)
-{
-	Poco::Mutex::ScopedLock lock(_mutex);
-	if (_shutdown) throw InvalidAccessException("Session pool has been shut down.");
-
-	if (_nSessions > 0)
-		throw InvalidAccessException("Features can not be set after the first session was created.");
-
-	_featureMap.insert(FeatureMap::ValueType(name, state));
-}
-
-
-bool SessionPool::getFeature(const std::string& name)
-{
-	FeatureMap::ConstIterator it = _featureMap.find(name);
-	if (_shutdown) throw InvalidAccessException("Session pool has been shut down.");
-
-	if (_featureMap.end() == it)
-		throw NotFoundException("Feature not found:" + name);
-
-	return it->second;
-}
-
-
-void SessionPool::setProperty(const std::string& name, const Poco::Any& value)
-{
-	Poco::Mutex::ScopedLock lock(_mutex);
-	if (_shutdown) throw InvalidAccessException("Session pool has been shut down.");
-
-	if (_nSessions > 0)
-		throw InvalidAccessException("Properties can not be set after first session was created.");
-
-	_propertyMap.insert(PropertyMap::ValueType(name, value));
-}
-
-
-Poco::Any SessionPool::getProperty(const std::string& name)
-{
-	PropertyMap::ConstIterator it = _propertyMap.find(name);
-
-	if (_propertyMap.end() == it)
-		throw NotFoundException("Property not found:" + name);
-
-	return it->second;
-}
-
-
-void SessionPool::applySettings(SessionImpl* pImpl)
-{
-	FeatureMap::Iterator fmIt = _featureMap.begin();
-	FeatureMap::Iterator fmEnd = _featureMap.end();
-	for (; fmIt != fmEnd; ++fmIt) pImpl->setFeature(fmIt->first, fmIt->second);
-
-	PropertyMap::Iterator pmIt = _propertyMap.begin();
-	PropertyMap::Iterator pmEnd = _propertyMap.end();
-	for (; pmIt != pmEnd; ++pmIt) pImpl->setProperty(pmIt->first, pmIt->second);
-}
-
-
-void SessionPool::customizeSession(Session&)
-{
-}
-
-
-void SessionPool::putBack(PooledSessionHolderPtr pHolder)
-{
-	Poco::Mutex::ScopedLock lock(_mutex);
-	if (_shutdown) return;
-
-	SessionList::iterator it = std::find(_activeSessions.begin(), _activeSessions.end(), pHolder);
-	if (it != _activeSessions.end())
-	{
-		if (pHolder->session()->isConnected())
-		{
-			// reverse settings applied at acquisition time, if any
-			AddPropertyMap::iterator pIt = _addPropertyMap.find(pHolder->session());
-			if (pIt != _addPropertyMap.end())
-				pHolder->session()->setProperty(pIt->second.first, pIt->second.second);
-
-			AddFeatureMap::iterator fIt = _addFeatureMap.find(pHolder->session());
-			if (fIt != _addFeatureMap.end())
-				pHolder->session()->setFeature(fIt->second.first, fIt->second.second);
-
-			// re-apply the default pool settings
-			applySettings(pHolder->session());
-
-			pHolder->access();
-			_idleSessions.push_front(pHolder);
-		}
-		else --_nSessions;
-
-		_activeSessions.erase(it);
-	}
-	else
-	{
-		poco_bugcheck_msg("Unknown session passed to SessionPool::putBack()");
-	}
-}
-
-
-void SessionPool::onJanitorTimer(Poco::Timer&)
-{
-	Poco::Mutex::ScopedLock lock(_mutex);
-	if (_shutdown) return;
-
-	SessionList::iterator it = _idleSessions.begin(); 
-	while (_nSessions > _minSessions && it != _idleSessions.end())
-	{
-		if ((*it)->idle() > _idleTime || !(*it)->session()->isConnected())
-		{	
-			try	{ (*it)->session()->close(); }
-			catch (...) { }
-			it = _idleSessions.erase(it);
-			--_nSessions;
-		}
-		else ++it;
-	}
-}
-
-
-void SessionPool::shutdown()
-{
-	Poco::Mutex::ScopedLock lock(_mutex);
-	if (_shutdown) return;
-	_shutdown = true;
-	_janitorTimer.stop();
-	closeAll(_idleSessions);
-	closeAll(_activeSessions);
-}
-
-
-void SessionPool::closeAll(SessionList& sessionList)
-{
-	SessionList::iterator it = sessionList.begin(); 
-	for (; it != sessionList.end();)
-	{
-		try	{ (*it)->session()->close(); }
-		catch (...) { }
-		it = sessionList.erase(it);
-		if (_nSessions > 0) --_nSessions;
-	}
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/SessionPoolContainer.cpp b/contrib/poco/Data/src/SessionPoolContainer.cpp
deleted file mode 100644
index 1fd1bb292..000000000
--- a/contrib/poco/Data/src/SessionPoolContainer.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// SessionPoolContainer.cpp
-//
-// Library: Data
-// Package: SessionPooling
-// Module:  SessionPoolContainer
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/SessionPoolContainer.h"
-#include "Poco/Data/SessionFactory.h"
-#include "Poco/Data/DataException.h"
-#include "Poco/URI.h"
-#include "Poco/String.h"
-#include "Poco/Exception.h"
-#include <algorithm>
-
-
-using Poco::FastMutex;
-
-
-namespace Poco {
-namespace Data {
-
-
-SessionPoolContainer::SessionPoolContainer()
-{
-}
-
-
-SessionPoolContainer::~SessionPoolContainer()
-{
-}
-
-
-void SessionPoolContainer::add(SessionPool* pPool)
-{
-	poco_check_ptr (pPool);
-
-	FastMutex::ScopedLock lock(_mutex);
-	if (_sessionPools.find(pPool->name()) != _sessionPools.end())
-		throw SessionPoolExistsException("Session pool already exists: " + pPool->name());
-
-	pPool->duplicate();
-	_sessionPools.insert(SessionPoolMap::value_type(pPool->name(), pPool));
-}
-
-
-Session SessionPoolContainer::add(const std::string& sessionKey, 
-	const std::string& connectionString,
-	int minSessions, 
-	int maxSessions, 
-	int idleTime)
-{
-	std::string name = SessionPool::name(sessionKey, connectionString);
-
-	FastMutex::ScopedLock lock(_mutex);
-	SessionPoolMap::iterator it = _sessionPools.find(name);
-
-	// pool already exists, silently return a session from it
-	if (it != _sessionPools.end()) return it->second->get();
-
-	SessionPool* pSP = 
-		new SessionPool(sessionKey, connectionString, minSessions, maxSessions, idleTime);
-
-	std::pair<SessionPoolMap::iterator, bool> ins = 
-		_sessionPools.insert(SessionPoolMap::value_type(name, pSP));
-
-	return ins.first->second->get();
-}
-
-
-bool SessionPoolContainer::isActive(const std::string& sessionKey,
-		const std::string& connectionString) const
-{
-	std::string name = connectionString.empty() ? 
-		sessionKey : SessionPool::name(sessionKey, connectionString);
-
-	SessionPoolMap::const_iterator it = _sessionPools.find(name);
-	if (it != _sessionPools.end() && it->second->isActive())
-	{
-		return true;
-	}
-
-	return false;
-}
-
-
-Session SessionPoolContainer::get(const std::string& name)
-{
-	return getPool(name).get();
-}
-
-
-SessionPool& SessionPoolContainer::getPool(const std::string& name)
-{
-	URI uri(name);
-	std::string path = uri.getPath();
-	poco_assert (!path.empty());
-	std::string n = Session::uri(uri.getScheme(), path.substr(1));
-
-	FastMutex::ScopedLock lock(_mutex);
-	SessionPoolMap::iterator it = _sessionPools.find(n);
-	if (_sessionPools.end() == it) throw NotFoundException(n);
-	return *it->second;
-}
-
-
-void SessionPoolContainer::shutdown()
-{
-	SessionPoolMap::iterator it = _sessionPools.begin();
-	SessionPoolMap::iterator end = _sessionPools.end();
-	for (; it != end; ++it) it->second->shutdown();
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/SimpleRowFormatter.cpp b/contrib/poco/Data/src/SimpleRowFormatter.cpp
deleted file mode 100644
index 839eb86e5..000000000
--- a/contrib/poco/Data/src/SimpleRowFormatter.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// RowFormatter.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  RowFormatter
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/SimpleRowFormatter.h"
-#include "Poco/Exception.h"
-#include <iomanip>
-
-
-namespace Poco {
-namespace Data {
-
-
-SimpleRowFormatter::SimpleRowFormatter(std::streamsize columnWidth, std::streamsize spacing):
-	_colWidth(columnWidth), _spacing(spacing), _rowCount(0)
-{
-}
-
-
-SimpleRowFormatter::SimpleRowFormatter(const SimpleRowFormatter& other):
-	RowFormatter(other.prefix(), other.postfix()),
-	_colWidth(other._colWidth),
-	_spacing(other._spacing),
-	_rowCount(0)
-{
-}
-
-
-SimpleRowFormatter::~SimpleRowFormatter()
-{
-}
-
-
-SimpleRowFormatter& SimpleRowFormatter::operator = (const SimpleRowFormatter& row)
-{
-	SimpleRowFormatter tmp(row);
-	swap(tmp);
-	return *this;
-}
-
-
-void SimpleRowFormatter::swap(SimpleRowFormatter& other)
-{
-	using std::swap;
-
-	setPrefix(other.prefix());
-	setPostfix(other.postfix());
-	swap(_colWidth, other._colWidth);
-	swap(_spacing, other._spacing);
-}
-
-
-std::string& SimpleRowFormatter::formatNames(const NameVecPtr pNames, std::string& formattedNames)
-{
-	_rowCount = 0;
-
-	std::ostringstream str;
-	std::string line(std::string::size_type(pNames->size()*_colWidth + (pNames->size() - 1)*_spacing), '-');
-	std::string space(_spacing, ' ');
-	NameVec::const_iterator it = pNames->begin();
-	NameVec::const_iterator end = pNames->end();
-	for (; it != end; ++it)
-	{
-		if (it != pNames->begin()) str << space;
-		str << std::left << std::setw(_colWidth) << *it;
-	}
-	str << std::endl << line << std::endl;
-
-	return formattedNames = str.str();
-}
-
-
-std::string& SimpleRowFormatter::formatValues(const ValueVec& vals, std::string& formattedValues)
-{
-	std::ostringstream str;
-	std::string space(_spacing, ' ');
-	ValueVec::const_iterator it = vals.begin();
-	ValueVec::const_iterator end = vals.end();
-	for (; it != end; ++it)
-	{
-		if (it != vals.begin()) str << space;
-		if (it->isNumeric())
-		{
-			str << std::right 
-				<< std::fixed
-				<< std::setprecision(2);
-		}
-		else str << std::left;
-
-		if (!it->isEmpty())
-			str << std::setw(_colWidth) << it->convert<std::string>();
-		else
-			str << std::setw(_colWidth) << "null";
-	}
-	str << std::endl;
-
-	++_rowCount;
-
-	return formattedValues = str.str();
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/Statement.cpp b/contrib/poco/Data/src/Statement.cpp
deleted file mode 100644
index d4c470ae8..000000000
--- a/contrib/poco/Data/src/Statement.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-//
-// Statement.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  Statement
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/Statement.h"
-#include "Poco/Data/DataException.h"
-#include "Poco/Data/Extraction.h"
-#include "Poco/Data/Session.h"
-#include "Poco/Data/Bulk.h"
-#include "Poco/Any.h"
-#include "Poco/Tuple.h"
-#include "Poco/ActiveMethod.h"
-#include <algorithm>
-
-
-namespace Poco {
-namespace Data {
-
-
-Statement::Statement(StatementImpl::Ptr pImpl):
-	_pImpl(pImpl),
-	_async(false)
-{
-	poco_check_ptr (pImpl);
-}
-
-
-Statement::Statement(Session& session):
-	_async(false)
-{
-	reset(session);
-}
-
-
-Statement::Statement(const Statement& stmt):
-	_pImpl(stmt._pImpl),
-	_async(stmt._async),
-	_pResult(stmt._pResult),
-	_pAsyncExec(stmt._pAsyncExec),
-	_arguments(stmt._arguments),
-	_pRowFormatter(stmt._pRowFormatter)
-{
-}
-
-
-Statement::~Statement()
-{
-}
-
-
-Statement& Statement::operator = (const Statement& stmt)
-{
-	Statement tmp(stmt);
-	swap(tmp);
-	return *this;
-}
-
-
-void Statement::swap(Statement& other)
-{
-	using std::swap;
-	
-	swap(_pImpl, other._pImpl);
-	swap(_async, other._async);
-	swap(_pAsyncExec, other._pAsyncExec);
-	swap(_pResult, other._pResult);
-	_arguments.swap(other._arguments);
-	swap(_pRowFormatter, other._pRowFormatter);
-}
-
-
-Statement& Statement::reset(Session& session)
-{
-	Statement stmt(session.createStatementImpl());
-	swap(stmt);
-	return *this;
-}
-
-
-std::size_t Statement::execute(bool reset)
-{
-	Mutex::ScopedLock lock(_mutex);
-	bool isDone = done();
-	if (initialized() || paused() || isDone)
-	{
-		if (_arguments.size()) 
-		{
-			_pImpl->formatSQL(_arguments);
-			_arguments.clear();
-		}
-
-		if (!isAsync())
-		{
-			if (isDone) _pImpl->reset();
-			return _pImpl->execute(reset);
-		}
-		else
-		{
-			doAsyncExec();
-			return 0;
-		}
-	} 
-	else throw InvalidAccessException("Statement still executing.");
-}
-
-
-const Statement::Result& Statement::executeAsync(bool reset)
-{
-	Mutex::ScopedLock lock(_mutex);
-	if (initialized() || paused() || done())
-		return doAsyncExec(reset);
-	else
-		throw InvalidAccessException("Statement still executing.");
-}
-
-
-const Statement::Result& Statement::doAsyncExec(bool reset)
-{
-	if (done()) _pImpl->reset();
-	if (!_pAsyncExec)
-		_pAsyncExec = new AsyncExecMethod(_pImpl, &StatementImpl::execute);
-	_pResult = new Result((*_pAsyncExec)(reset));
-	return *_pResult;
-}
-
-
-void Statement::setAsync(bool async)
-{
-	_async = async;
-	if (_async && !_pAsyncExec)
-		_pAsyncExec = new AsyncExecMethod(_pImpl, &StatementImpl::execute);
-}
-
-
-std::size_t Statement::wait(long milliseconds)
-{
-	if (!_pResult) return 0;
-	bool success = true;
-	if (WAIT_FOREVER != milliseconds)
-		success = _pResult->tryWait(milliseconds);
-	else
-		_pResult->wait();
-
-	if (_pResult->exception())
-		throw *_pResult->exception();
-	else if (!success)
-		throw TimeoutException("Statement timed out.");
-
-	return _pResult->data();
-}
-
-
-const std::string& Statement::getStorage() const
-{
-	switch (storage())
-	{
-	case STORAGE_VECTOR:
-		return StatementImpl::VECTOR;
-	case STORAGE_LIST:
-		return StatementImpl::LIST;
-	case STORAGE_DEQUE:
-		return StatementImpl::DEQUE;
-	case STORAGE_UNKNOWN:
-		return StatementImpl::UNKNOWN;
-	}
-
-	throw IllegalStateException("Invalid storage setting.");
-}
-
-
-Statement& Statement::operator , (Manipulator manip)
-{
-	manip(*this);
-	return *this;
-}
-
-
-Statement& Statement::addBind(AbstractBinding::Ptr pBind)
-{
-	if (pBind->isBulk())
-	{
-		if (!_pImpl->isBulkSupported())
-			throw InvalidAccessException("Bulk not supported by this session.");
-
-		if(_pImpl->bulkBindingAllowed())
-			_pImpl->setBulkBinding();
-		else
-			throw InvalidAccessException("Bulk and non-bulk binding modes can not be mixed.");
-	}
-	else _pImpl->forbidBulk();
-
-	_pImpl->addBind(pBind);
-	return *this;
-}
-
-
-Statement& Statement::addExtract(AbstractExtraction::Ptr pExtract)
-{
-	if (pExtract->isBulk())
-	{
-		if (!_pImpl->isBulkSupported())
-			throw InvalidAccessException("Bulk not supported by this session.");
-
-		if(_pImpl->bulkExtractionAllowed())
-		{
-			Bulk b(pExtract->getLimit());
-			_pImpl->setBulkExtraction(b);
-		}
-		else
-			throw InvalidAccessException("Bulk and non-bulk extraction modes can not be mixed.");
-	}
-	else _pImpl->forbidBulk();
-
-	_pImpl->addExtract(pExtract);
-	return *this;
-}
-
-
-Statement& Statement::operator , (const Limit& extrLimit)
-{
-	if (_pImpl->isBulkExtraction() && _pImpl->extractionLimit() != extrLimit)
-		throw InvalidArgumentException("Limit for bulk extraction already set.");
-
-	_pImpl->setExtractionLimit(extrLimit);
-	return *this;
-}
-
-
-Statement& Statement::operator , (const Range& extrRange)
-{
-	if (_pImpl->isBulkExtraction())
-		throw InvalidAccessException("Can not set range for bulk extraction.");
-
-	_pImpl->setExtractionLimit(extrRange.lower());
-	_pImpl->setExtractionLimit(extrRange.upper());
-	return *this;
-}
-
-
-Statement& Statement::operator , (const Bulk& bulk)
-{
-	if (!_pImpl->isBulkSupported())
-			throw InvalidAccessException("Bulk not supported by this session.");
-
-	if (0 == _pImpl->extractions().size() && 
-		0 == _pImpl->bindings().size() &&
-		_pImpl->bulkExtractionAllowed() &&
-		_pImpl->bulkBindingAllowed())
-	{
-		_pImpl->setBulkExtraction(bulk);
-		_pImpl->setBulkBinding();
-	}
-	else
-		throw InvalidAccessException("Can not set bulk operations.");
-
-	return *this;
-}
-
-
-Statement& Statement::operator , (BulkFnType)
-{
-	const Limit& limit(_pImpl->extractionLimit());
-	if (limit.isHardLimit() || 
-		limit.isLowerLimit() || 
-		Limit::LIMIT_UNLIMITED == limit.value())
-	{
-		throw InvalidAccessException("Bulk is only allowed with limited extraction,"
-			"non-hard and zero-based limits.");
-	}
-
-	Bulk bulk(limit);
-	_pImpl->setBulkExtraction(bulk);
-	_pImpl->setBulkBinding();
-
-	return *this;
-}
-
-
-Session Statement::session()
-{
-	Poco::AutoPtr<SessionImpl> ps(&impl()->session(), true); 
-	return Session(ps);
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/StatementCreator.cpp b/contrib/poco/Data/src/StatementCreator.cpp
deleted file mode 100644
index 6fd944aa0..000000000
--- a/contrib/poco/Data/src/StatementCreator.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// StatementCreator.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  StatementCreator
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/StatementCreator.h"
-#include <algorithm>
-
-
-namespace Poco {
-namespace Data {
-
-
-StatementCreator::StatementCreator()
-{
-}
-
-
-StatementCreator::StatementCreator(Poco::AutoPtr<SessionImpl> ptrImpl):
-	_ptrImpl(ptrImpl)
-{
-}
-
-
-StatementCreator::StatementCreator(const StatementCreator& other):
-	_ptrImpl(other._ptrImpl)
-{
-}
-
-
-StatementCreator& StatementCreator::operator = (const StatementCreator& other)
-{
-	StatementCreator tmp(other);
-	swap(tmp);
-	return *this;
-}
-
-
-void StatementCreator::swap(StatementCreator& other)
-{
-	using std::swap;
-	swap(_ptrImpl, other._ptrImpl);
-}
-
-
-StatementCreator::~StatementCreator()
-{
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/StatementImpl.cpp b/contrib/poco/Data/src/StatementImpl.cpp
deleted file mode 100644
index 254f81bc1..000000000
--- a/contrib/poco/Data/src/StatementImpl.cpp
+++ /dev/null
@@ -1,475 +0,0 @@
-//
-// StatementImpl.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  StatementImpl
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/StatementImpl.h"
-#include "Poco/Data/SessionImpl.h"
-#include "Poco/Data/DataException.h"
-#include "Poco/Data/AbstractBinder.h"
-#include "Poco/Data/Extraction.h"
-#include "Poco/Data/LOB.h"
-#include "Poco/Data/Date.h"
-#include "Poco/Data/Time.h"
-#include "Poco/SharedPtr.h"
-#include "Poco/DateTime.h"
-#include "Poco/Exception.h"
-
-
-using Poco::icompare;
-
-
-namespace Poco {
-namespace Data {
-
-
-using namespace Keywords;
-
-
-const std::string StatementImpl::VECTOR = "vector";
-const std::string StatementImpl::LIST = "list";
-const std::string StatementImpl::DEQUE = "deque";
-const std::string StatementImpl::UNKNOWN = "unknown";
-
-
-StatementImpl::StatementImpl(SessionImpl& rSession):
-	_state(ST_INITIALIZED),
-	_extrLimit(upperLimit(Limit::LIMIT_UNLIMITED, false)),
-	_lowerLimit(0),
-	_rSession(rSession),
-	_storage(STORAGE_UNKNOWN_IMPL),
-	_ostr(),
-	_curDataSet(0),
-	_bulkBinding(BULK_UNDEFINED),
-	_bulkExtraction(BULK_UNDEFINED)
-{
-	if (!_rSession.isConnected())
-		throw NotConnectedException(_rSession.connectionString());
-
-	_extractors.resize(1);
-	_columnsExtracted.resize(1, 0);
-	_subTotalRowCount.resize(1, 0);
-}
-
-
-StatementImpl::~StatementImpl()
-{
-}
-
-
-std::size_t StatementImpl::execute(const bool& reset)
-{
-	if (reset) resetExtraction();
-
-	if (!_rSession.isConnected())
-	{
-		_state = ST_DONE;
-		throw NotConnectedException(_rSession.connectionString());
-	}
-
-	std::size_t lim = 0;
-	if (_lowerLimit > _extrLimit.value())
-		throw LimitException("Illegal Statement state. Upper limit must not be smaller than the lower limit.");
-
-	do
-	{
-		compile();
-		if (_extrLimit.value() == Limit::LIMIT_UNLIMITED)
-			lim += executeWithoutLimit();
-		else
-			lim += executeWithLimit();
-	} while (canCompile());
-
-	if (_extrLimit.value() == Limit::LIMIT_UNLIMITED)
-		_state = ST_DONE;
-
-	if (lim < _lowerLimit)
-		throw LimitException("Did not receive enough data.");
-
-	assignSubTotal(reset);
-
-	return lim;
-}
-
-
-void StatementImpl::assignSubTotal(bool reset)
-{
-	if (_extractors.size() == _subTotalRowCount.size())
-	{
-		CountVec::iterator it  = _subTotalRowCount.begin();
-		CountVec::iterator end = _subTotalRowCount.end();
-		for (int counter = 0; it != end; ++it, ++counter)
-		{
-			if (_extractors[counter].size())
-			{
-				if (reset)
-					*it = CountVec::value_type(_extractors[counter][0]->numOfRowsHandled());
-				else
-					*it += CountVec::value_type(_extractors[counter][0]->numOfRowsHandled());
-			}
-		}
-	}
-}
-
-
-std::size_t StatementImpl::executeWithLimit()
-{
-	poco_assert (_state != ST_DONE);
-	std::size_t count = 0;
-	std::size_t limit = _extrLimit.value();
-
-	do
-	{
-		bind();
-		while (count < limit && hasNext()) 
-			count += next();
-	} while (count < limit && canBind());
-
-	if (!canBind() && (!hasNext() || limit == 0)) 
-		_state = ST_DONE;
-	else if (hasNext() && limit == count && _extrLimit.isHardLimit())
-		throw LimitException("HardLimit reached (retrieved more data than requested).");
-	else 
-		_state = ST_PAUSED;
-
-	int affectedRows = affectedRowCount();
-	if (count == 0)
-	{
-		if (affectedRows > 0)
-			return affectedRows;
-	}
-
-	return count;
-}
-
-
-std::size_t StatementImpl::executeWithoutLimit()
-{
-	poco_assert (_state != ST_DONE);
-	std::size_t count = 0;
-
-	do
-	{
-		bind();
-		while (hasNext()) count += next();
-	} while (canBind());
-
-	int affectedRows = affectedRowCount();
-	if (count == 0)
-	{
-		if (affectedRows > 0)
-			return affectedRows;
-	}
-
-	return count;
-}
-
-
-void StatementImpl::compile()
-{
-	if (_state == ST_INITIALIZED || 
-		_state == ST_RESET || 
-		_state == ST_BOUND)
-	{
-		compileImpl();
-		_state = ST_COMPILED;
-
-		if (!extractions().size() && !isStoredProcedure())
-		{
-			std::size_t cols = columnsReturned();
-			if (cols) makeExtractors(cols);
-		}
-
-		fixupExtraction();
-		fixupBinding();
-	}
-}
-
-
-void StatementImpl::bind()
-{
-	if (_state == ST_COMPILED)
-	{
-		bindImpl();
-		_state = ST_BOUND;
-	}
-	else if (_state == ST_BOUND)
-	{
-		if (!hasNext())
-		{
-			if (canBind()) bindImpl();
-			else _state = ST_DONE;
-		}
-	}
-}
-
-
-void StatementImpl::reset()
-{
-	resetBinding();
-	resetExtraction();
-	_state = ST_RESET;
-}
-
-
-void StatementImpl::setExtractionLimit(const Limit& extrLimit)
-{
-	if (!extrLimit.isLowerLimit())
-		_extrLimit = extrLimit;
-	else
-		_lowerLimit = extrLimit.value();
-}
-
-
-void StatementImpl::setBulkExtraction(const Bulk& b)
-{
-	Limit::SizeT limit = getExtractionLimit();
-	if (Limit::LIMIT_UNLIMITED != limit && b.size() != limit)
-		throw InvalidArgumentException("Can not set limit for statement.");
-
-	setExtractionLimit(b.limit());
-	_bulkExtraction = BULK_EXTRACTION;
-}
-
-
-void StatementImpl::fixupExtraction()
-{
-	CountVec::iterator sIt  = _subTotalRowCount.begin();
-	CountVec::iterator sEnd = _subTotalRowCount.end();
-	for (; sIt != sEnd; ++sIt) *sIt = 0;
-
-	if (_curDataSet >= _columnsExtracted.size())
-	{
-		_columnsExtracted.resize(_curDataSet + 1, 0);
-		_subTotalRowCount.resize(_curDataSet + 1, 0);
-	}
-
-	Poco::Data::AbstractExtractionVec::iterator it    = extractions().begin();
-	Poco::Data::AbstractExtractionVec::iterator itEnd = extractions().end();
-	for (; it != itEnd; ++it)
-	{
-		(*it)->setExtractor(extractor());
-		(*it)->setLimit(_extrLimit.value()),
-		_columnsExtracted[_curDataSet] += (int)(*it)->numOfColumnsHandled();
-	}
-}
-
-
-void StatementImpl::fixupBinding()
-{
-	// no need to call binder().reset(); here will be called before each bind anyway
-	AbstractBindingVec::iterator it    = bindings().begin();
-	AbstractBindingVec::iterator itEnd = bindings().end();
-	for (; it != itEnd; ++it) (*it)->setBinder(binder());
-}
-
-
-void StatementImpl::resetBinding()
-{
-	AbstractBindingVec::iterator it    = bindings().begin();
-	AbstractBindingVec::iterator itEnd = bindings().end();
-	for (; it != itEnd; ++it) (*it)->reset();
-}
-
-
-void StatementImpl::resetExtraction()
-{
-	Poco::Data::AbstractExtractionVec::iterator it = extractions().begin();
-	Poco::Data::AbstractExtractionVec::iterator itEnd = extractions().end();
-	for (; it != itEnd; ++it) (*it)->reset();
-
-	poco_assert (_curDataSet < _columnsExtracted.size());
-	_columnsExtracted[_curDataSet] = 0;
-}
-
-
-void StatementImpl::setStorage(const std::string& storage)
-{
-	if (0 == icompare(DEQUE, storage))
-		_storage = STORAGE_DEQUE_IMPL;
-	else if (0 == icompare(VECTOR, storage))
-		_storage = STORAGE_VECTOR_IMPL; 
-	else if (0 == icompare(LIST, storage))
-		_storage = STORAGE_LIST_IMPL;
-	else if (0 == icompare(UNKNOWN, storage))
-		_storage = STORAGE_UNKNOWN_IMPL;
-	else
-		throw NotFoundException();
-}
-
-
-void StatementImpl::makeExtractors(std::size_t count)
-{
-	for (int i = 0; i < count; ++i)
-	{
-		const MetaColumn& mc = metaColumn(i);
-		switch (mc.type())
-		{
-			case MetaColumn::FDT_BOOL:
-				addInternalExtract<bool>(mc); break;
-			case MetaColumn::FDT_INT8:  
-				addInternalExtract<Int8>(mc); break;
-			case MetaColumn::FDT_UINT8:  
-				addInternalExtract<UInt8>(mc); break;
-			case MetaColumn::FDT_INT16:  
-				addInternalExtract<Int16>(mc); break;
-			case MetaColumn::FDT_UINT16: 
-				addInternalExtract<UInt16>(mc); break;
-			case MetaColumn::FDT_INT32:  
-				addInternalExtract<Int32>(mc); break;
-			case MetaColumn::FDT_UINT32: 
-				addInternalExtract<UInt32>(mc); break;
-			case MetaColumn::FDT_INT64:  
-				addInternalExtract<Int64>(mc); break;
-			case MetaColumn::FDT_UINT64: 
-				addInternalExtract<UInt64>(mc); break;
-			case MetaColumn::FDT_FLOAT:  
-				addInternalExtract<float>(mc); break;
-			case MetaColumn::FDT_DOUBLE: 
-				addInternalExtract<double>(mc); break;
-			case MetaColumn::FDT_STRING: 
-				addInternalExtract<std::string>(mc); break;
-			case MetaColumn::FDT_WSTRING:
-				addInternalExtract<Poco::UTF16String>(mc); break;
-			case MetaColumn::FDT_BLOB:   
-				addInternalExtract<BLOB>(mc); break;
-			case MetaColumn::FDT_DATE:
-				addInternalExtract<Date>(mc); break;
-			case MetaColumn::FDT_TIME:
-				addInternalExtract<Time>(mc); break;
-			case MetaColumn::FDT_TIMESTAMP:
-				addInternalExtract<DateTime>(mc); break;
-			default:
-				throw Poco::InvalidArgumentException("Data type not supported.");
-		}
-	}
-}
-
-
-const MetaColumn& StatementImpl::metaColumn(const std::string& name) const
-{
-	std::size_t cols = columnsReturned();
-	for (std::size_t i = 0; i < cols; ++i)
-	{
-		const MetaColumn& column = metaColumn(i);
-		if (0 == icompare(column.name(), name)) return column;
-	}
-
-	throw NotFoundException(format("Invalid column name: %s", name));
-}
-
-
-std::size_t StatementImpl::activateNextDataSet()
-{
-	if (_curDataSet + 1 < dataSetCount())
-		return ++_curDataSet;
-	else
-		throw NoDataException("End of data sets reached.");
-}
-
-
-std::size_t StatementImpl::activatePreviousDataSet()
-{
-	if (_curDataSet > 0)
-		return --_curDataSet;
-	else
-		throw NoDataException("Beginning of data sets reached.");
-}
-
-
-void StatementImpl::addExtract(AbstractExtraction::Ptr pExtraction)
-{
-	poco_check_ptr (pExtraction);
-	std::size_t pos = pExtraction->position();
-	if (pos >= _extractors.size()) 
-		_extractors.resize(pos + 1);
-
-	pExtraction->setEmptyStringIsNull(
-		_rSession.getFeature("emptyStringIsNull"));
-
-	pExtraction->setForceEmptyString(
-		_rSession.getFeature("forceEmptyString"));
-
-	_extractors[pos].push_back(pExtraction);
-}
-
-
-void StatementImpl::removeBind(const std::string& name)
-{
-	bool found = false;
-
-	AbstractBindingVec::iterator it = _bindings.begin();
-	for (; it != _bindings.end();)
-	{
-		if ((*it)->name() == name) 
-		{
-			it = _bindings.erase(it);
-			found = true;
-		}
-		else ++it;
-	}
-
-	if (!found)
-		throw NotFoundException(name);
-}
-
-
-std::size_t StatementImpl::columnsExtracted(int dataSet) const
-{
-	if (USE_CURRENT_DATA_SET == dataSet) dataSet = static_cast<int>(_curDataSet);
-	if (_columnsExtracted.size() > 0)
-	{
-		poco_assert (dataSet >= 0 && dataSet < _columnsExtracted.size());
-		return _columnsExtracted[dataSet];
-	}
-
-	return 0;
-}
-
-
-std::size_t StatementImpl::rowsExtracted(int dataSet) const
-{
-	if (USE_CURRENT_DATA_SET == dataSet) dataSet = static_cast<int>(_curDataSet);
-	if (extractions().size() > 0)
-	{
-		poco_assert (dataSet >= 0 && dataSet < _extractors.size());
-		if (_extractors[dataSet].size() > 0)
-			return _extractors[dataSet][0]->numOfRowsHandled();
-	}
-	
-	return 0;
-}
-
-
-std::size_t StatementImpl::subTotalRowCount(int dataSet) const
-{
-	if (USE_CURRENT_DATA_SET == dataSet) dataSet = static_cast<int>(_curDataSet);
-	if (_subTotalRowCount.size() > 0)
-	{
-		poco_assert (dataSet >= 0 && dataSet < _subTotalRowCount.size());
-		return _subTotalRowCount[dataSet];
-	}
-	
-	return 0;
-}
-
-
-void StatementImpl::formatSQL(std::vector<Any>& arguments)
-{
-	std::string sql;
-	Poco::format(sql, _ostr.str(), arguments);
-	_ostr.str("");
-	_ostr << sql;
-}
-
-
-} } // namespace Poco::Data
diff --git a/contrib/poco/Data/src/Time.cpp b/contrib/poco/Data/src/Time.cpp
deleted file mode 100644
index de54b96e7..000000000
--- a/contrib/poco/Data/src/Time.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Time.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  Time
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/Time.h"
-#include "Poco/Data/DynamicDateTime.h"
-#include "Poco/DateTime.h"
-#include "Poco/Dynamic/Var.h"
-
-
-using Poco::DateTime;
-using Poco::Dynamic::Var;
-
-
-namespace Poco {
-namespace Data {
-
-
-Time::Time()
-{
-	DateTime dt;
-	assign(dt.hour(), dt.minute(), dt.second());
-}
-
-
-Time::Time(int hour, int minute, int second)
-{
-	assign(hour, minute, second);
-}
-
-
-Time::Time(const DateTime& dt)
-{
-	assign(dt.hour(), dt.minute(), dt.second());
-}
-
-
-Time::~Time()
-{
-}
-
-
-void Time::assign(int hour, int minute, int second)
-{
-	if (hour < 0 || hour > 23) 
-		throw InvalidArgumentException("Hour must be between 0 and 23.");
-
-	if (minute < 0 || minute > 59) 
-		throw InvalidArgumentException("Minute must be between 0 and 59.");
-
-	if (second < 0 || second > 59) 
-		throw InvalidArgumentException("Second must be between 0 and 59.");
-
-	_hour = hour;
-	_minute = minute;
-	_second = second;
-}
-
-
-bool Time::operator < (const Time& time) const
-{
-	int hour = time.hour();
-
-	if (_hour < hour) return true;
-	else if (_hour > hour) return false;
-	else // hours equal
-	{
-		int minute = time.minute();
-		if (_minute < minute) return true;
-		else 
-		if (_minute > minute) return false;
-		else // minutes equal
-		if (_second < time.second()) return true;
-	}
-
-	return false;
-}
-
-
-Time& Time::operator = (const Var& var)
-{
-#ifndef __GNUC__
-// g++ used to choke on this, newer versions seem to digest it fine
-// TODO: determine the version able to handle it properly
-	*this = var.extract<Time>();
-#else
-	*this = var.operator Time(); 
-#endif
-	return *this;
-}
-
-
-} } // namespace Poco::Data
-
-
-#ifdef __GNUC__
-// only needed for g++ (see comment in Time::operator = above)
-
-namespace Poco {
-namespace Dynamic {
-
-
-using Poco::Data::Time;
-using Poco::DateTime;
-
-
-template <>
-Var::operator Time () const
-{
-	VarHolder* pHolder = content();
-
-	if (!pHolder)
-		throw InvalidAccessException("Can not convert empty value.");
-
-	if (typeid(Time) == pHolder->type())
-		return extract<Time>();
-	else
-	{
-		Poco::DateTime result;
-		pHolder->convert(result);
-		return Time(result);
-	}
-}
-
-
-} } // namespace Poco::Dynamic
-
-
-#endif // __GNUC__
diff --git a/contrib/poco/Data/src/Transaction.cpp b/contrib/poco/Data/src/Transaction.cpp
deleted file mode 100644
index 21da65304..000000000
--- a/contrib/poco/Data/src/Transaction.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Transaction.cpp
-//
-// Library: Data
-// Package: DataCore
-// Module:  Transaction
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/Data/Transaction.h"
-#include "Poco/Exception.h"
-
-
-namespace Poco {
-namespace Data {
-
-
-Transaction::Transaction(Poco::Data::Session& rSession, Poco::Logger* pLogger):
-	_rSession(rSession),
-	_pLogger(pLogger)
-{
-	begin();
-}
-
-
-Transaction::Transaction(Poco::Data::Session& rSession, bool start):
-	_rSession(rSession),
-	_pLogger(0)
-{
-	if (start) begin();
-}
-
-	
-Transaction::~Transaction()
-{
-	try
-	{
-		if (_rSession.isTransaction())
-		{
-			try
-			{
-				if (_pLogger) 
-					_pLogger->debug("Rolling back transaction.");
-
-				_rSession.rollback();
-			}
-			catch (Poco::Exception& exc)
-			{
-				if (_pLogger) 
-					_pLogger->error("Error while rolling back database transaction: %s", exc.displayText());
-			}
-			catch (...)
-			{
-				if (_pLogger) 
-					_pLogger->error("Error while rolling back database transaction.");
-			}
-		}
-	}
-	catch (...)
-	{
-		poco_unexpected();
-	}
-}
-
-
-void Transaction::begin()
-{
-	if (!_rSession.isTransaction())
-		_rSession.begin();
-	else
-		throw InvalidAccessException("Transaction in progress.");
-}
-
-
-void Transaction::execute(const std::string& sql, bool doCommit)
-{
-	if (!_rSession.isTransaction()) _rSession.begin();
-	_rSession << sql, Keywords::now;
-	if (doCommit) commit();
-}
-
-
-void Transaction::execute(const std::vector<std::string>& sql)
-{
-	try
-	{
-		std::vector<std::string>::const_iterator it = sql.begin();
-		std::vector<std::string>::const_iterator end = sql.end();
-		for (; it != end; ++it)	execute(*it, it + 1 == end ? true : false);
-		return;
-	}
-	catch (Exception& ex)
-	{
-		if (_pLogger) _pLogger->log(ex);
-	}
-
-	rollback();
-}
-
-
-void Transaction::commit()
-{
-	if (_pLogger) 
-		_pLogger->debug("Committing transaction.");
-
-	_rSession.commit();
-}
-
-	
-void Transaction::rollback()
-{
-	if (_pLogger) 
-		_pLogger->debug("Rolling back transaction.");
-
-	_rSession.rollback();
-}
-
-
-} } // namespace Poco::Data