generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-30 05:29:41 +01:00
Code Issues Projects Releases Wiki Activity

SF #3567118: Fix Nullable handling in trunk

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2012-09-13 04:04:55 +00:00
parent b6b95b8259
commit 5d93d2bba1
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Data/include/Poco/Data/Extraction.h
View File

@@ -786,7 +786,8 @@ inline Extraction<T>* into(T& t, const Position& pos)
template <typename T> template <typename T>
inline Extraction<T>* into(T& t, const Position& pos, const T& def) inline Extraction<T>* into(T& t, const Position& pos, const T& def)
/// Convenience function to allow for a more compact creation of an extraction object with the given default /// 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); return new Extraction<T>(t, def, pos);
} }

4
Data/include/Poco/Data/StatementImpl.h
View File

@@ -338,7 +338,7 @@ private:
{ {
C* pData = new C; C* pData = new C;
Column<C>* pCol = new Column<C>(mc, pData); Column<C>* pCol = new Column<C>(mc, pData);
return new InternalExtraction<C>(*pData, pCol, static_cast<Poco::UInt32>(currentDataSet())); return new InternalExtraction<C>(*pData, pCol, Position(currentDataSet()));
} }
template <class C> template <class C>
@@ -349,7 +349,7 @@ private:
return new InternalBulkExtraction<C>(*pData, return new InternalBulkExtraction<C>(*pData,
pCol, pCol,
static_cast<Poco::UInt32>(getExtractionLimit()), static_cast<Poco::UInt32>(getExtractionLimit()),
static_cast<Poco::UInt32>(currentDataSet())); Position(currentDataSet()));
} }
template <class T> template <class T>

2
Data/include/Poco/Data/TypeHandler.h
View File

@@ -314,7 +314,7 @@ public:
if (pExt->extract(pos++, val)) if (pExt->extract(pos++, val))
{ {
obj.value(val); obj = val;
} }
else else
{ {

11
Foundation/include/Poco/Nullable.h
View File

@@ -182,6 +182,17 @@ public:
return !(*this == other) && !(*this < other); return !(*this == other) && !(*this < other);
} }
C& value()
/// Returns the Nullable's value.
///
/// Throws a NullValueException if the Nullable is empty.
{
if (!_isNull)
return _value;
else
throw NullValueException();
}
const C& value() const const C& value() const
/// Returns the Nullable's value. /// Returns the Nullable's value.
/// ///