strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#86723# wrong type for binary types

Browse source
This commit is contained in:
Ocke Janssen 2001-05-28 08:09:29 +00:00
parent 32c8936a33
commit c68bdab700
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
connectivity/source/drivers/odbc/OPreparedStatement.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: OPreparedStatement.cxx,v $
*
* $Revision: 1.19 $
* $Revision: 1.20 $
*
* last change: $Author: oj $ $Date: 2001-05-21 14:30:18 $
* last change: $Author: oj $ $Date: 2001-05-28 09:09:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -775,14 +775,7 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ
if(!isPrepared())
prepareStatement();
if ( x.getLength() > 2000 )
{
// setBinaryStream (parameterIndex, new java.io.ByteArrayInputStream(x), x.length);
}
else
{
setBinary (parameterIndex, DataType::BINARY, x);
}
setBinary (parameterIndex, DataType::BINARY, x);
}
// -------------------------------------------------------------------------

28
connectivity/source/drivers/odbc/OResultSet.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: OResultSet.cxx,v $
*
* $Revision: 1.25 $
* $Revision: 1.26 $
*
* last change: $Author: oj $ $Date: 2001-05-28 06:45:17 $
* last change: $Author: oj $ $Date: 2001-05-28 09:09:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -472,15 +472,20 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro
if(columnIndex > m_nLastColumnPos)
fillRow(columnIndex);
Sequence< sal_Int8 > nRet;
if(m_aRow[columnIndex].getTypeKind() != DataType::BINARY && m_aRow[columnIndex].getTypeKind() != DataType::VARBINARY)
{ // something went wrong so we have another type here
// OSL_ENSURE(TypeClass_STRING == m_aRow[columnIndex].getValueTypeClass(),"ONLY string types supported!");
::rtl::OUString sRet;
sRet = m_aRow[columnIndex].getString();
nRet = Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>(sRet.getStr()),sizeof(sal_Unicode)*sRet.getLength());
switch(m_aRow[columnIndex].getTypeKind())
{
case DataType::BINARY:
case DataType::VARBINARY:
case DataType::LONGVARBINARY:
nRet = m_aRow[columnIndex];
break;
default:
{
::rtl::OUString sRet;
sRet = m_aRow[columnIndex].getString();
nRet = Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>(sRet.getStr()),sizeof(sal_Unicode)*sRet.getLength());
}
}
else
nRet = m_aRow[columnIndex];
return nRet;
}
@ -1662,7 +1667,8 @@ void OResultSet::fillRow(sal_Int32 _nToColumn)
Reference< XResultSetMetaData > xMeta = getMetaData();
for(sal_Int32 i=m_nLastColumnPos+1;i <= _nToColumn; ++i)
{
switch (xMeta->getColumnType(i))
m_aRow[_nToColumn].setTypeKind(xMeta->getColumnType(i));
switch (m_aRow[_nToColumn].getTypeKind())
{
case DataType::CHAR:
case DataType::VARCHAR: