mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#105154# insert the handling for BLOB and CLOB

Browse Source
This commit is contained in:
Ocke Janssen
2002-11-15 08:00:16 +00:00
parent 935c95d3e4
commit 269152823b
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dbaccess/source/core/api/CacheSet.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: CacheSet.cxx,v $ * $RCSfile: CacheSet.cxx,v $
* *
* $Revision: 1.30 $ * $Revision: 1.31 $
* *
* last change: $Author: oj $ $Date: 2002-10-07 12:57:29 $ * last change: $Author: oj $ $Date: 2002-11-15 09:00:15 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -565,6 +565,7 @@ void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
for(sal_Int32 i=1;aIter != _rRow->end();++aIter,++i) for(sal_Int32 i=1;aIter != _rRow->end();++aIter,++i)
{ {
sal_Int32 nType = m_xSetMetaData->getColumnType(i); sal_Int32 nType = m_xSetMetaData->getColumnType(i);
sal_Bool bReadData = sal_True;
switch(nType) switch(nType)
{ {
@@ -611,10 +612,17 @@ void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
case DataType::INTEGER: case DataType::INTEGER:
(*aIter) = getInt(i); (*aIter) = getInt(i);
break; break;
case DataType::CLOB:
(*aIter) = makeAny(getCharacterStream(i));
break;
case DataType::BLOB:
(*aIter) = makeAny(getBinaryStream(i));
break;
default: default:
bReadData = sal_False;
OSL_ENSURE(0,"ORowSetValue::makeAny(): UNSPUPPORTED TYPE!"); OSL_ENSURE(0,"ORowSetValue::makeAny(): UNSPUPPORTED TYPE!");
} }
if(wasNull()) if ( bReadData && wasNull() )
aIter->setNull(); aIter->setNull();
if(nType != aIter->getTypeKind()) if(nType != aIter->getTypeKind())
{ {

13
dbaccess/source/core/api/KeySet.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: KeySet.cxx,v $ * $RCSfile: KeySet.cxx,v $
* *
* $Revision: 1.39 $ * $Revision: 1.40 $
* *
* last change: $Author: oj $ $Date: 2002-10-11 07:23:16 $ * last change: $Author: oj $ $Date: 2002-11-15 09:00:16 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -1286,6 +1286,7 @@ void OKeySet::setExternParameters(const connectivity::ORowVector< ORowSetValue >
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void OKeySet::fetchValue(sal_Int32 _nPos,sal_Int32 _nType,const Reference<XRow>& _xRow,ORowSetValue& _rValue) void OKeySet::fetchValue(sal_Int32 _nPos,sal_Int32 _nType,const Reference<XRow>& _xRow,ORowSetValue& _rValue)
{ {
sal_Bool bReadData = sal_True;
switch(_nType) switch(_nType)
{ {
case DataType::CHAR: case DataType::CHAR:
@@ -1339,8 +1340,11 @@ void OKeySet::fetchValue(sal_Int32 _nPos,sal_Int32 _nType,const Reference<XRow>&
_rValue = makeAny(_xRow->getBinaryStream(_nPos)); _rValue = makeAny(_xRow->getBinaryStream(_nPos));
_rValue.setTypeKind(DataType::BLOB); _rValue.setTypeKind(DataType::BLOB);
break; break;
default:
bReadData = sal_False;
break;
} }
if(_xRow->wasNull()) if ( bReadData && _xRow->wasNull() )
_rValue.setNull(); _rValue.setNull();
_rValue.setTypeKind(_nType); _rValue.setTypeKind(_nType);
} }
@@ -1391,6 +1395,9 @@ namespace dbaccess
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.39 2002/10/11 07:23:16 oj
#i6529# use real table name instead of alias for update,delete and insert statements
Revision 1.38 2002/10/08 12:46:28 oj Revision 1.38 2002/10/08 12:46:28 oj
#i3289# correct table name quoting so that in every situation the correct schema, catalog is used #i3289# correct table name quoting so that in every situation the correct schema, catalog is used