Tag: cws_src680_hsqldb9 User: oj Date: 2006/08/02 23:17:28 Modified: dba/connectivity/source/commontools/dbtools2.cxx
Log: RESYNC: (1.16-1.17); FILE MERGED File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbtools2.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools2.cxx?r1=1.16.16.1&r2=1.16.16.2 Delta lines: +27 -56 --------------------- --- dbtools2.cxx 2 Aug 2006 06:48:50 -0000 1.16.16.1 +++ dbtools2.cxx 3 Aug 2006 06:17:25 -0000 1.16.16.2 @@ -232,7 +232,7 @@ descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema; descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= sTable; - ::dbtools::composeTableName(xMetaData,sCatalog,sSchema,sTable,sComposedName,sal_True,::dbtools::eInTableDefinitions); + sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); if ( !sComposedName.getLength() ) ::dbtools::throwFunctionSequenceException(_xConnection); @@ -349,7 +349,7 @@ sSchema, sTable, ::dbtools::eInDataManipulation); - ::dbtools::composeTableName(xMetaData,sCatalog, sSchema, sTable,sComposedName,sal_True,::dbtools::eInTableDefinitions); + sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); if ( !sComposedName.getLength() ) @@ -449,9 +449,8 @@ const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); ::rtl::OUString sQuotedName = ::dbtools::quoteName(sQuote,_rName); ::rtl::OUString sComposedName; - sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled(_xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalogInSelect")),sal_True); - sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled(_xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSchemaInSelect")),sal_True); - ::dbtools::composeTableName(xMetaData,getString(_aCatalog),_aSchema,_aTable,sComposedName,sal_True,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); + sComposedName = composeTableNameForSelect( + _xConnection, getString( _aCatalog ), _aSchema, _aTable ); ColumnInformationMap aInfo(_bCase); collectColumnInformation(_xConnection,sComposedName,sQuotedName,aInfo); @@ -568,34 +567,6 @@ return xProp; } // ----------------------------------------------------------------------------- -::rtl::OUString composeTableName(const Reference<XDatabaseMetaData>& _xMetaData, - const Reference<XPropertySet>& _xTable, - sal_Bool _bQuote, - EComposeRule _eComposeRule - , sal_Bool _bUseCatalogInSelect - , sal_Bool _bUseSchemaInSelect) -{ - ::rtl::OUString aComposedName; - ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - Reference< XPropertySetInfo > xInfo = _xTable->getPropertySetInfo(); - if ( xInfo.is() - && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) - && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) - && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) ) - { - - ::rtl::OUString aCatalog; - ::rtl::OUString aSchema; - ::rtl::OUString aTable; - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= aCatalog; - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; - - dbtools::composeTableName(_xMetaData,aCatalog,aSchema,aTable,aComposedName,_bQuote,_eComposeRule,_bUseCatalogInSelect,_bUseSchemaInSelect); - } - return aComposedName; -} -// ----------------------------------------------------------------------------- sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const ::rtl::OUString& _sProperty,sal_Bool _bDefault) { sal_Bool bEnabled = _bDefault; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
