diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 16:38:07 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 16:38:07 +0000 |
| commit | fe8ddb9ea254afefa0bf96bc6972eb535a26da84 (patch) | |
| tree | 84fb8a594ec8791a2d4b4b2c8df3cb025754923b /extensions/source/bibliography/datman.cxx | |
| parent | 27427312e612a904f00be2d1077d525775cdb4f2 (diff) | |
INTEGRATION: CWS insight01 (1.30.182); FILE MERGED
2004/07/06 09:17:13 oj 1.30.182.3: RESYNC: (1.31-1.32); FILE MERGED
2004/05/28 19:27:46 oj 1.30.182.2: RESYNC: (1.30-1.31); FILE MERGED
2004/04/23 06:23:11 oj 1.30.182.1: new switch to disable catalog and schema
Diffstat (limited to 'extensions/source/bibliography/datman.cxx')
| -rw-r--r-- | extensions/source/bibliography/datman.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 81289b68f..c8cf55b8f 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -2,9 +2,9 @@ * * $RCSfile: datman.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: rt $ $Date: 2004-06-17 16:15:30 $ + * last change: $Author: hr $ $Date: 2004-08-02 17:38:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1157,7 +1157,9 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) m_xParser = xFactory->createQueryComposer(); rtl::OUString aString(C2U("SELECT * FROM ")); - aString += ::dbtools::quoteTableName(xMetaData,aActiveDataTable,::dbtools::eInDataManipulation); + sal_Bool bUseCatalogInSelect = ::dbtools::isDataSourcePropertyEnabled(xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalogInSelect")),sal_True); + sal_Bool bUseSchemaInSelect = ::dbtools::isDataSourcePropertyEnabled(xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSchemaInSelect")),sal_True); + aString += ::dbtools::quoteTableName(xMetaData,aActiveDataTable,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); m_xParser->setQuery(aString); BibConfig* pConfig = BibModul::GetConfig(); pConfig->setQueryField(getQueryField()); @@ -1352,7 +1354,9 @@ void BibDataManager::setActiveDataSource(const rtl::OUString& rURL) // quote the table name which may contain catalog.schema.table Reference<XDatabaseMetaData> xMetaData(xConnection->getMetaData(),UNO_QUERY); aQuoteChar = xMetaData->getIdentifierQuoteString(); - aString += ::dbtools::quoteTableName(xMetaData,aActiveDataTable,::dbtools::eInDataManipulation); + sal_Bool bUseCatalogInSelect = ::dbtools::isDataSourcePropertyEnabled(xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalogInSelect")),sal_True); + sal_Bool bUseSchemaInSelect = ::dbtools::isDataSourcePropertyEnabled(xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSchemaInSelect")),sal_True); + aString += ::dbtools::quoteTableName(xMetaData,aActiveDataTable,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); m_xParser->setQuery(aString); BibConfig* pConfig = BibModul::GetConfig(); pConfig->setQueryField(getQueryField()); @@ -1419,7 +1423,9 @@ void BibDataManager::setActiveDataTable(const rtl::OUString& rTable) m_xParser = xFactory->createQueryComposer(); rtl::OUString aString(C2U("SELECT * FROM ")); - aString += ::dbtools::quoteTableName(xMetaData,aActiveDataTable,::dbtools::eInDataManipulation); + sal_Bool bUseCatalogInSelect = ::dbtools::isDataSourcePropertyEnabled(xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalogInSelect")),sal_True); + sal_Bool bUseSchemaInSelect = ::dbtools::isDataSourcePropertyEnabled(xConnection,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSchemaInSelect")),sal_True); + aString += ::dbtools::quoteTableName(xMetaData,aActiveDataTable,::dbtools::eInDataManipulation,bUseCatalogInSelect,bUseSchemaInSelect); m_xParser->setQuery(aString); BibConfig* pConfig = BibModul::GetConfig(); |