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

Merge commit 'ooo/OOO330_m12'

Browse Source
This commit is contained in:
Jan Holesovsky
2010-10-24 15:26:09 +02:00
parent 66d6b3fdcf 24f16a97de
commit c0101e8841
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,7 +151,8 @@ void OKeySet::initColumns()
void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable,
const ::rtl::OUString& i_rUpdateTableName,
const Reference<XDatabaseMetaData>& i_xMeta,
const Reference<XNameAccess>& i_xQueryColumns)
const Reference<XNameAccess>& i_xQueryColumns,
::std::auto_ptr<SelectColumnsMetaData>& o_pKeyColumnNames)
{
// first ask the database itself for the best columns which can be used
Sequence< ::rtl::OUString> aBestColumnNames;
@@ -193,17 +194,17 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable,
sUpdateTableName = dbtools::composeTableName( i_xMeta, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation );
}
::dbaccess::getColumnPositions(i_xQueryColumns,aBestColumnNames,sUpdateTableName,(*m_pKeyColumnNames),true);
::dbaccess::getColumnPositions(i_xQueryColumns,aBestColumnNames,sUpdateTableName,(*o_pKeyColumnNames),true);
::dbaccess::getColumnPositions(i_xQueryColumns,xTblColumns->getElementNames(),sUpdateTableName,(*m_pColumnNames),true);
::dbaccess::getColumnPositions(i_xQueryColumns,aParameterColumns,sUpdateTableName,(*m_pParameterNames),true);
if ( m_pKeyColumnNames->empty() )
if ( o_pKeyColumnNames->empty() )
{
::dbtools::throwGenericSQLException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not find any key column." ) ), *this );
}
for ( SelectColumnsMetaData::const_iterator keyColumn = m_pKeyColumnNames->begin();
keyColumn != m_pKeyColumnNames->end();
for ( SelectColumnsMetaData::const_iterator keyColumn = o_pKeyColumnNames->begin();
keyColumn != o_pKeyColumnNames->end();
++keyColumn
)
{
@@ -249,7 +250,7 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O
Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
Reference<XColumnsSupplier> xQueryColSup(m_xComposer,UNO_QUERY);
const Reference<XNameAccess> xQueryColumns = xQueryColSup->getColumns();
findTableColumnsMatching_throw(makeAny(m_xTable),m_sUpdateTableName,xMeta,xQueryColumns);
findTableColumnsMatching_throw(makeAny(m_xTable),m_sUpdateTableName,xMeta,xQueryColumns,m_pKeyColumnNames);
// the first row is empty because it's now easier for us to distinguish when we are beforefirst or first
// without extra varaible to be set