generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 11:06:50 +01:00
Code Issues Projects Releases Wiki Activity

merge Data changes (ODBC Sybase, PostgreSQL etc)

Browse Source
This commit is contained in:
Alex Fabijanic
2016-02-28 11:06:08 -06:00
parent e84d50dfaa
commit 32f3f4a146
79 changed files with 3174 additions and 1545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Data/testsuite/TestSuite_vs120.vcxproj
View File

@@ -129,7 +129,7 @@
<AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck>
@@ -140,6 +140,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -171,6 +172,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -189,7 +191,7 @@
<AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck>
@@ -200,6 +202,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -231,6 +234,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -249,7 +253,7 @@
<AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck>
@@ -260,6 +264,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -291,6 +296,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/>
<CompileAs>Default</CompileAs>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

46
Data/testsuite/src/Binder.cpp
View File

@@ -30,119 +30,119 @@ Binder::~Binder()
}
void Binder::bind(std::size_t pos, const Poco::Int8 &val, Direction dir)
void Binder::bind(std::size_t pos, const Poco::Int8 &val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const Poco::UInt8 &val, Direction dir)
void Binder::bind(std::size_t pos, const Poco::UInt8 &val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const Poco::Int16 &val, Direction dir)
void Binder::bind(std::size_t pos, const Poco::Int16 &val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const Poco::UInt16 &val, Direction dir)
void Binder::bind(std::size_t pos, const Poco::UInt16 &val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const Poco::Int32 &val, Direction dir)
void Binder::bind(std::size_t pos, const Poco::Int32 &val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const Poco::UInt32 &val, Direction dir)
void Binder::bind(std::size_t pos, const Poco::UInt32 &val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const Poco::Int64 &val, Direction dir)
void Binder::bind(std::size_t pos, const Poco::Int64 &val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const Poco::UInt64 &val, Direction dir)
void Binder::bind(std::size_t pos, const Poco::UInt64 &val, Direction dir, const WhenNullCb& nullCb)
{
}
#ifndef POCO_LONG_IS_64_BIT
void Binder::bind(std::size_t pos, const long& val, Direction dir)
void Binder::bind(std::size_t pos, const long& val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const unsigned long& val, Direction dir)
void Binder::bind(std::size_t pos, const unsigned long& val, Direction dir, const WhenNullCb& nullCb)
{
}
#endif
void Binder::bind(std::size_t pos, const bool &val, Direction dir)
void Binder::bind(std::size_t pos, const bool &val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const float &val, Direction dir)
void Binder::bind(std::size_t pos, const float &val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const double &val, Direction dir)
void Binder::bind(std::size_t pos, const double &val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const char &val, Direction dir)
void Binder::bind(std::size_t pos, const char &val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const char* const &pVal, Direction dir)
void Binder::bind(std::size_t pos, const char* const &pVal, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const std::string& val, Direction dir)
void Binder::bind(std::size_t pos, const std::string& val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const Poco::UTF16String& val, Direction dir)
void Binder::bind(std::size_t pos, const Poco::UTF16String& val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const BLOB& val, Direction dir)
void Binder::bind(std::size_t pos, const BLOB& val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const CLOB& val, Direction dir)
void Binder::bind(std::size_t pos, const CLOB& val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const Date& val, Direction dir)
void Binder::bind(std::size_t pos, const Date& val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const Time& val, Direction dir)
void Binder::bind(std::size_t pos, const Time& val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const DateTime& val, Direction dir)
void Binder::bind(std::size_t pos, const DateTime& val, Direction dir, const WhenNullCb& nullCb)
{
}
void Binder::bind(std::size_t pos, const NullData& val, Direction dir)
void Binder::bind(std::size_t pos, const NullData& val, Direction dir, const std::type_info& bindType)
{
}

46
Data/testsuite/src/Binder.h
View File

@@ -34,75 +34,75 @@ public:
~Binder();
/// Destroys the Binder.
void bind(std::size_t pos, const Poco::Int8 &val, Direction dir);
void bind(std::size_t pos, const Poco::Int8 &val, Direction dir, const WhenNullCb& cb);
/// Binds an Int8.
void bind(std::size_t pos, const Poco::UInt8 &val, Direction dir);
void bind(std::size_t pos, const Poco::UInt8 &val, Direction dir, const WhenNullCb& cb);
/// Binds an UInt8.
void bind(std::size_t pos, const Poco::Int16 &val, Direction dir);
void bind(std::size_t pos, const Poco::Int16 &val, Direction dir, const WhenNullCb& cb);
/// Binds an Int16.
void bind(std::size_t pos, const Poco::UInt16 &val, Direction dir);
void bind(std::size_t pos, const Poco::UInt16 &val, Direction dir, const WhenNullCb& cb);
/// Binds an UInt16.
void bind(std::size_t pos, const Poco::Int32 &val, Direction dir);
void bind(std::size_t pos, const Poco::Int32 &val, Direction dir, const WhenNullCb& cb);
/// Binds an Int32.
void bind(std::size_t pos, const Poco::UInt32 &val, Direction dir);
void bind(std::size_t pos, const Poco::UInt32 &val, Direction dir, const WhenNullCb& cb);
/// Binds an UInt32.
void bind(std::size_t pos, const Poco::Int64 &val, Direction dir);
void bind(std::size_t pos, const Poco::Int64 &val, Direction dir, const WhenNullCb& cb);
/// Binds an Int64.
void bind(std::size_t pos, const Poco::UInt64 &val, Direction dir);
void bind(std::size_t pos, const Poco::UInt64 &val, Direction dir, const WhenNullCb& cb);
/// Binds an UInt64.
#ifndef POCO_LONG_IS_64_BIT
void bind(std::size_t pos, const long& val, Direction dir);
void bind(std::size_t pos, const long& val, Direction dir, const WhenNullCb& cb);
/// Binds a long.
void bind(std::size_t pos, const unsigned long& val, Direction dir);
void bind(std::size_t pos, const unsigned long& val, Direction dir, const WhenNullCb& cb);
/// Binds an unsigned long.
#endif
void bind(std::size_t pos, const bool &val, Direction dir);
void bind(std::size_t pos, const bool &val, Direction dir, const WhenNullCb& cb);
/// Binds a boolean.
void bind(std::size_t pos, const float &val, Direction dir);
void bind(std::size_t pos, const float &val, Direction dir, const WhenNullCb& cb);
/// Binds a float.
void bind(std::size_t pos, const double &val, Direction dir);
void bind(std::size_t pos, const double &val, Direction dir, const WhenNullCb& cb);
/// Binds a double.
void bind(std::size_t pos, const char &val, Direction dir);
void bind(std::size_t pos, const char &val, Direction dir, const WhenNullCb& cb);
/// Binds a single character.
void bind(std::size_t pos, const char* const &pVal, Direction dir);
void bind(std::size_t pos, const char* const &pVal, Direction dir, const WhenNullCb& cb);
/// Binds a const char ptr.
void bind(std::size_t pos, const std::string& val, Direction dir);
void bind(std::size_t pos, const std::string& val, Direction dir, const WhenNullCb& cb);
/// Binds a string.
void bind(std::size_t pos, const Poco::UTF16String& val, Direction dir);
void bind(std::size_t pos, const Poco::UTF16String& val, Direction dir, const WhenNullCb& cb);
/// Binds a UTF16String.
void bind(std::size_t pos, const BLOB& val, Direction dir);
void bind(std::size_t pos, const BLOB& val, Direction dir, const WhenNullCb& cb);
/// Binds a BLOB.
void bind(std::size_t pos, const CLOB& val, Direction dir);
void bind(std::size_t pos, const CLOB& val, Direction dir, const WhenNullCb& cb);
/// Binds a CLOB.
void bind(std::size_t pos, const Date& val, Direction dir);
void bind(std::size_t pos, const Date& val, Direction dir, const WhenNullCb& cb);
/// Binds a Date.
void bind(std::size_t pos, const Time& val, Direction dir);
void bind(std::size_t pos, const Time& val, Direction dir, const WhenNullCb& cb);
/// Binds a Time.
void bind(std::size_t pos, const DateTime& val, Direction dir);
void bind(std::size_t pos, const DateTime& val, Direction dir, const WhenNullCb& cb);
/// Binds a DateTime.
void bind(std::size_t pos, const NullData& val, Direction dir);
void bind(std::size_t pos, const NullData& val, Direction dir, const std::type_info& bindType);
/// Binds a DateTime.
void reset();

5
Data/testsuite/src/DataTest.cpp
View File

@@ -904,6 +904,11 @@ void DataTest::testRow()
assert (row[3] == 3);
assert (row[4] == 4);
const Row& cr = row;
assert(cr["field0"] == 0);
assert(cr[0] == 0);
assert(cr.get(0) == 0);
try
{
int i; i = row[5].convert<int>(); // to silence gcc

2
Data/testsuite/src/TestStatementImpl.cpp
View File

@@ -72,7 +72,7 @@ std::size_t TestStatementImpl::columnsReturned() const
}
const MetaColumn& TestStatementImpl::metaColumn(std::size_t pos) const
const MetaColumn& TestStatementImpl::metaColumn(std::size_t pos, std::size_t /*rsPos*/) const
{
static MetaColumn c(pos, "", MetaColumn::FDT_BOOL, 0);
return c;

2
Data/testsuite/src/TestStatementImpl.h
View File

@@ -50,7 +50,7 @@ protected:
/// 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;
const MetaColumn& metaColumn(std::size_t pos, std::size_t rsPos) const;
/// Returns column meta data.
bool hasNext();