generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-06-26 14:34:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'poco-1.9.1' of https://github.com/pocoproject/poco.git into poco-1.9.1

Browse Source
This commit is contained in:
Francis ANDRE 2018-05-07 18:52:25 +02:00
commit 1f866b6049
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -101,6 +101,7 @@ option(ENABLE_CRYPTO "Enable Crypto" ON)
option(ENABLE_DATA "Enable Data" ON) option(ENABLE_DATA "Enable Data" ON)
option(ENABLE_DATA_SQLITE "Enable Data SQlite" ON) option(ENABLE_DATA_SQLITE "Enable Data SQlite" ON)
option(ENABLE_DATA_MYSQL "Enable Data MySQL" ON) option(ENABLE_DATA_MYSQL "Enable Data MySQL" ON)
option(ENABLE_DATA_POSTGRESQL "Enable Data PostgreSQL" ON)
option(ENABLE_DATA_ODBC "Enable Data ODBC" ON) option(ENABLE_DATA_ODBC "Enable Data ODBC" ON)
option(ENABLE_SEVENZIP "Enable SevenZip" OFF) option(ENABLE_SEVENZIP "Enable SevenZip" OFF)
option(ENABLE_ZIP "Enable Zip" ON) option(ENABLE_ZIP "Enable Zip" ON)

13
Data/CMakeLists.txt
View File

@ -55,6 +55,19 @@ if(ENABLE_DATA_MYSQL)
endif(MYSQL_FOUND) endif(MYSQL_FOUND)
endif(ENABLE_DATA_MYSQL) endif(ENABLE_DATA_MYSQL)
if(ENABLE_DATA_POSTGRESQL)
find_package(PostgreSQL)
if(POSTGRESQL_FOUND)
include_directories("${PostgreSQL_INCLUDE_DIR}")
if(POCO_VERBOSE_MESSAGES)
message(STATUS "PostgreSQL Support Enabled")
endif()
add_subdirectory( PostgreSQL )
elseif(POCO_VERBOSE_MESSAGES)
message(STATUS "PostgreSQL Support Disabled - no PostgreSQL library")
endif(POSTGRESQL_FOUND)
endif(ENABLE_DATA_POSTGRESQL)
if(ENABLE_DATA_ODBC) if(ENABLE_DATA_ODBC)
find_package(ODBC) find_package(ODBC)
if(WIN32 AND NOT WINCE) if(WIN32 AND NOT WINCE)

4
Data/ODBC/src/Extractor.cpp
View File

@ -19,6 +19,7 @@
#include "Poco/Data/LOB.h" #include "Poco/Data/LOB.h"
#include "Poco/Buffer.h" #include "Poco/Buffer.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"
#include <typeinfo>
namespace Poco { namespace Poco {
@ -68,10 +69,9 @@ bool Extractor::extractBoundImpl<UTF16String>(std::size_t pos, UTF16String& val)
typedef UTF16String::value_type CharT; typedef UTF16String::value_type CharT;
if (isNull(pos)) return false; if (isNull(pos)) return false;
std::size_t dataSize = _pPreparator->actualDataSize(pos); std::size_t dataSize = _pPreparator->actualDataSize(pos);
//CharT* sp = AnyCast<CharT*>(_pPreparator->at(pos));
CharT* sp = 0; CharT* sp = 0;
UTF16String us; UTF16String us;
const type_info& ti = _pPreparator->at(pos).type(); const std::type_info& ti = _pPreparator->at(pos).type();
if (ti == typeid(CharT*)) if (ti == typeid(CharT*))
{ {
sp = AnyCast<CharT*>(_pPreparator->at(pos)); sp = AnyCast<CharT*>(_pPreparator->at(pos));

4
Data/PostgreSQL/Makefile
View File

@ -14,8 +14,8 @@ objects = Extractor Binder SessionImpl Connector \
PostgreSQLStatementImpl PostgreSQLException \ PostgreSQLStatementImpl PostgreSQLException \
SessionHandle StatementExecutor PostgreSQLTypes Utility SessionHandle StatementExecutor PostgreSQLTypes Utility
target = PocoSQLPostgreSQL target = PocoDataPostgreSQL
target_version = $(LIBVERSION) target_version = $(LIBVERSION)
target_libs = PocoSQL PocoFoundation target_libs = PocoData PocoFoundation
include $(POCO_BASE)/build/rules/lib include $(POCO_BASE)/build/rules/lib

2
Data/PostgreSQL/testsuite/Makefile
View File

@ -17,6 +17,6 @@ objects = PostgreSQLTestSuite Driver PostgreSQLTest SQLExecutor
target = testrunner target = testrunner
target_version = 1 target_version = 1
target_libs = PocoSQLPostgreSQL PocoSQL PocoFoundation PocoCppUnit target_libs = PocoDataPostgreSQL PocoData PocoFoundation CppUnit
include $(POCO_BASE)/build/rules/exec include $(POCO_BASE)/build/rules/exec