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

#86914# use of rowsetvalue instead of any

Browse source
This commit is contained in:
Ocke Janssen 2001-05-28 05:45:42 +00:00
parent 6a1dfe2bee
commit d0c319a994
2 changed files with 40 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,9 @@
* *
* $RCSfile: OResultSet.cxx,v $ * $RCSfile: OResultSet.cxx,v $
* *
* $Revision: 1.24 $ * $Revision: 1.25 $
* *
* last change: $Author: oj $ $Date: 2001-05-21 14:30:18 $ * last change: $Author: oj $ $Date: 2001-05-28 06:45:17 $
* *
* 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
@ -427,7 +427,7 @@ sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLExcep
{ {
if(columnIndex > m_nLastColumnPos) if(columnIndex > m_nLastColumnPos)
fillRow(columnIndex); fillRow(columnIndex);
return any2bool(m_aRow[columnIndex]); return m_aRow[columnIndex];
} }
@ -451,7 +451,7 @@ sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLExceptio
if(columnIndex > m_nLastColumnPos) if(columnIndex > m_nLastColumnPos)
fillRow(columnIndex); fillRow(columnIndex);
m_aRow[columnIndex] >>= nRet; nRet = m_aRow[columnIndex];
} }
else else
OTools::getValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,SQL_C_CHAR,m_bWasNull,**this,&nRet,sizeof nRet); OTools::getValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,SQL_C_CHAR,m_bWasNull,**this,&nRet,sizeof nRet);
@ -472,13 +472,15 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro
if(columnIndex > m_nLastColumnPos) if(columnIndex > m_nLastColumnPos)
fillRow(columnIndex); fillRow(columnIndex);
Sequence< sal_Int8 > nRet; Sequence< sal_Int8 > nRet;
if(!(m_aRow[columnIndex] >>= nRet) && m_aRow[columnIndex].hasValue()) if(m_aRow[columnIndex].getTypeKind() != DataType::BINARY && m_aRow[columnIndex].getTypeKind() != DataType::VARBINARY)
{ // something went wrong so we have another type here { // something went wrong so we have another type here
OSL_ENSURE(TypeClass_STRING == m_aRow[columnIndex].getValueTypeClass(),"ONLY string types supported!"); // OSL_ENSURE(TypeClass_STRING == m_aRow[columnIndex].getValueTypeClass(),"ONLY string types supported!");
::rtl::OUString sRet; ::rtl::OUString sRet;
m_aRow[columnIndex] >>= sRet; sRet = m_aRow[columnIndex].getString();
nRet = Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>(sRet.getStr()),sizeof(sal_Unicode)*sRet.getLength()); nRet = Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>(sRet.getStr()),sizeof(sal_Unicode)*sRet.getLength());
} }
else
nRet = m_aRow[columnIndex];
return nRet; return nRet;
} }
@ -510,7 +512,7 @@ Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, R
if(columnIndex > m_nLastColumnPos) if(columnIndex > m_nLastColumnPos)
fillRow(columnIndex); fillRow(columnIndex);
m_aRow[columnIndex] >>= nRet; nRet = m_aRow[columnIndex];
} }
else else
{ {
@ -539,7 +541,7 @@ double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLExceptio
if(columnIndex > m_nLastColumnPos) if(columnIndex > m_nLastColumnPos)
fillRow(columnIndex); fillRow(columnIndex);
m_aRow[columnIndex] >>= nRet; nRet = m_aRow[columnIndex];
} }
else else
@ -573,7 +575,7 @@ sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLExceptio
{ {
if(columnIndex > m_nLastColumnPos) if(columnIndex > m_nLastColumnPos)
fillRow(columnIndex); fillRow(columnIndex);
m_aRow[columnIndex] >>= nRet; nRet = m_aRow[columnIndex];
} }
else else
OTools::getValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,SQL_C_LONG,m_bWasNull,**this,&nRet,sizeof nRet); OTools::getValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,SQL_C_LONG,m_bWasNull,**this,&nRet,sizeof nRet);
@ -686,7 +688,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept
if(columnIndex > m_nLastColumnPos) if(columnIndex > m_nLastColumnPos)
fillRow(columnIndex); fillRow(columnIndex);
m_aRow[columnIndex] >>= nRet; nRet = m_aRow[columnIndex];
} }
else else
@ -708,7 +710,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept
{ {
if(columnIndex > m_nLastColumnPos) if(columnIndex > m_nLastColumnPos)
fillRow(columnIndex); fillRow(columnIndex);
m_aRow[columnIndex] >>= nRet; nRet = m_aRow[columnIndex];
} }
else else
nRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,(SWORD)getMetaData()->getColumnType(columnIndex),m_bWasNull,**this,m_nTextEncoding); nRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,(SWORD)getMetaData()->getColumnType(columnIndex),m_bWasNull,**this,m_nTextEncoding);
@ -728,7 +730,7 @@ Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, R
{ {
if(columnIndex > m_nLastColumnPos) if(columnIndex > m_nLastColumnPos)
fillRow(columnIndex); fillRow(columnIndex);
m_aRow[columnIndex] >>= nRet; nRet = m_aRow[columnIndex];
} }
else else
{ {
@ -755,7 +757,7 @@ DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLExc
if(columnIndex > m_nLastColumnPos) if(columnIndex > m_nLastColumnPos)
fillRow(columnIndex); fillRow(columnIndex);
m_aRow[columnIndex] >>= nRet; nRet = m_aRow[columnIndex];
// return nRet; // return nRet;
} }
else else
@ -973,7 +975,7 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException)
checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
return m_bFetchData ? !m_aRow[m_nLastColumnPos].hasValue() : m_bWasNull; return m_bFetchData ? m_aRow[m_nLastColumnPos].isNull() : m_bWasNull;
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@ -1652,7 +1654,10 @@ void OResultSet::getFastPropertyValue(
void OResultSet::fillRow(sal_Int32 _nToColumn) void OResultSet::fillRow(sal_Int32 _nToColumn)
{ {
if((sal_Int32)m_aRow.size() <= _nToColumn) if((sal_Int32)m_aRow.size() <= _nToColumn)
{
m_aRow.resize(_nToColumn+1); m_aRow.resize(_nToColumn+1);
m_aRow[_nToColumn].setBound(sal_True);
}
m_bFetchData = sal_False; m_bFetchData = sal_False;
Reference< XResultSetMetaData > xMeta = getMetaData(); Reference< XResultSetMetaData > xMeta = getMetaData();
for(sal_Int32 i=m_nLastColumnPos+1;i <= _nToColumn; ++i) for(sal_Int32 i=m_nLastColumnPos+1;i <= _nToColumn; ++i)
@ -1661,49 +1666,49 @@ void OResultSet::fillRow(sal_Int32 _nToColumn)
{ {
case DataType::CHAR: case DataType::CHAR:
case DataType::VARCHAR: case DataType::VARCHAR:
m_aRow[i] <<= getString(i); m_aRow[i] = getString(i);
break; break;
case DataType::DECIMAL: case DataType::DECIMAL:
case DataType::NUMERIC: case DataType::NUMERIC:
case DataType::BIGINT: case DataType::BIGINT:
m_aRow[i] <<= getString(i); m_aRow[i] = getString(i);
break; break;
case DataType::DOUBLE: case DataType::DOUBLE:
m_aRow[i] <<= getDouble(i); m_aRow[i] = getDouble(i);
break; break;
case DataType::LONGVARCHAR: case DataType::LONGVARCHAR:
m_aRow[i] <<= getString(i); m_aRow[i] = getString(i);
break; break;
case DataType::LONGVARBINARY: case DataType::LONGVARBINARY:
m_aRow[i] <<= getBytes(i); m_aRow[i] = getBytes(i);
break; break;
case DataType::DATE: case DataType::DATE:
m_aRow[i] <<= getDate(i); m_aRow[i] = getDate(i);
break; break;
case DataType::TIME: case DataType::TIME:
m_aRow[i] <<= getTime(i); m_aRow[i] = getTime(i);
break; break;
case DataType::TIMESTAMP: case DataType::TIMESTAMP:
m_aRow[i] <<= getTimestamp(i); m_aRow[i] = getTimestamp(i);
break; break;
case DataType::BIT: case DataType::BIT:
m_aRow[i] = bool2any(getBoolean(i)); m_aRow[i] = getBoolean(i);
break; break;
case DataType::TINYINT: case DataType::TINYINT:
m_aRow[i] <<= getByte(i); m_aRow[i] = getByte(i);
break; break;
case DataType::SMALLINT: case DataType::SMALLINT:
m_aRow[i] <<= getShort(i); m_aRow[i] = getShort(i);
break; break;
case DataType::INTEGER: case DataType::INTEGER:
m_aRow[i] <<= getInt(i); m_aRow[i] = getInt(i);
break; break;
case DataType::REAL: case DataType::REAL:
m_aRow[i] <<= getFloat(i); m_aRow[i] = getFloat(i);
break; break;
case DataType::BINARY: case DataType::BINARY:
case DataType::VARBINARY: case DataType::VARBINARY:
m_aRow[i] <<= getBytes(i); m_aRow[i] = getBytes(i);
break; break;
} }
} }

9
connectivity/source/inc/odbc/OResultSet.hxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: OResultSet.hxx,v $ * $RCSfile: OResultSet.hxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: oj $ $Date: 2001-05-17 06:46:47 $ * last change: $Author: oj $ $Date: 2001-05-28 06:45:42 $
* *
* 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
@ -110,6 +110,9 @@
#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
#include "connectivity/CommonTools.hxx" #include "connectivity/CommonTools.hxx"
#endif #endif
#ifndef _CONNECTIVITY_FILE_VALUE_HXX_
#include "FValue.hxx"
#endif
namespace connectivity namespace connectivity
{ {
@ -147,7 +150,7 @@ namespace connectivity
TVoidVector m_aBindVector; TVoidVector m_aBindVector;
::std::vector<sal_Int32> m_aLengthVector; ::std::vector<sal_Int32> m_aLengthVector;
::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime
::std::vector< ::com::sun::star::uno::Any> m_aRow; // only used when SQLGetData can't be called in any order ::std::vector< ORowSetValue> m_aRow; // only used when SQLGetData can't be called in any order
SQLHANDLE m_aStatementHandle; SQLHANDLE m_aStatementHandle;
SQLHANDLE m_aConnectionHandle; SQLHANDLE m_aConnectionHandle;
OStatement_Base* m_pStatement; OStatement_Base* m_pStatement;