User: kz Date: 2006/10/05 05:44:43 Modified: dba/connectivity/source/commontools/dbtools.cxx
Log: INTEGRATION: CWS hsqlcsvstage1 (1.64.2); FILE MERGED 2006/09/20 11:06:19 fs 1.64.2.1: #i69696#, being stage 1 of issue #i69526#: merging changes from CWS hsqlcsv herein File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbtools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools.cxx?r1=1.64&r2=1.65 Delta lines: +4 -4 ------------------- --- dbtools.cxx 17 Sep 2006 02:02:59 -0000 1.64 +++ dbtools.cxx 5 Oct 2006 12:44:40 -0000 1.65 @@ -964,13 +964,13 @@ void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaData, const ::rtl::OUString& _rQualifiedName, ::rtl::OUString& _rCatalog, ::rtl::OUString& _rSchema, ::rtl::OUString& _rName,EComposeRule _eComposeRule) { OSL_ENSURE(_rxConnMetaData.is(), "QualifiedNameComponents : invalid meta data!"); - OSL_ENSURE( _eComposeRule == eInDataManipulation, "qualifiedNameComponents: un-implemented case!" ); - OSL_UNUSED( _eComposeRule ); + OSL_ENSURE( ( _eComposeRule == eInDataManipulation ) || ( _eComposeRule == eComplete ), "qualifiedNameComponents: un-implemented case!" ); + bool bComplete = ( _eComposeRule == eComplete ); ::rtl::OUString sSeparator = _rxConnMetaData->getCatalogSeparator(); ::rtl::OUString sName(_rQualifiedName); // do we have catalogs ? - if ( _rxConnMetaData->supportsCatalogsInDataManipulation() ) + if ( bComplete || _rxConnMetaData->supportsCatalogsInDataManipulation() ) { if (_rxConnMetaData->isCatalogAtStart()) { @@ -994,7 +994,7 @@ } } - if ( _rxConnMetaData->supportsSchemasInDataManipulation() ) + if ( bComplete || _rxConnMetaData->supportsSchemasInDataManipulation() ) { sal_Int32 nIndex = sName.indexOf((sal_Unicode)'.'); // OSL_ENSURE(-1 != nIndex, "QualifiedNameComponents : no schema separator!"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
