User: ihi Date: 2006/10/18 06:09:17 Modified: dba/connectivity/source/drivers/mozab/MStatement.cxx
Log: INTEGRATION: CWS dba205b (1.14.6); FILE MERGED 2006/08/09 19:52:37 fs 1.14.6.1: refactored the OColumnAlias class, in preparation of fixing #b6248060# File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MStatement.cxx?r1=1.15&r2=1.16 Delta lines: +5 -7 ------------------- --- MStatement.cxx 17 Sep 2006 02:57:57 -0000 1.15 +++ MStatement.cxx 18 Oct 2006 13:09:15 -0000 1.16 @@ -245,10 +245,7 @@ xCreateColumn = m_pSQLIterator->getCreateColumns(); OSL_ENSURE(xCreateColumn.isValid(), "Need the Columns!!"); - const OColumnAlias & xColumnAlias = m_pConnection->getColumnAlias(); - //OSL_ENSURE( !xColumnAlias.empty(), "Need Column Alias"); - const ::std::map< ::rtl::OUString, ::rtl::OUString> & xAliasMap = xColumnAlias.getAliasMap(); - //OSL_ENSURE( !xAliasMap.empty(), "Need Column Alias Map"); + const OColumnAlias& aColumnAlias = m_pConnection->getColumnAlias(); OSQLColumns::const_iterator aIter = xCreateColumn->begin(); const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); @@ -256,10 +253,11 @@ for (sal_Int32 i = 1; aIter != xCreateColumn->end();++aIter, i++) { (*aIter)->getPropertyValue(sProprtyName) >>= sName; - if (xAliasMap.find(sName) == xAliasMap.end()) + if ( !aColumnAlias.hasAlias( sName ) ) { - ::dbtools::throwGenericSQLException(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Driver does not support column name:")) - + sName ,NULL); + ::dbtools::throwGenericSQLException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Driver does not support column name: " ) ) + sName, + NULL ); } } MDatabaseMetaDataHelper _aDbHelper; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
