User: hr Date: 2007-09-26 14:28:12+0000 Modified: dba/connectivity/source/commontools/dbmetadata.cxx
Log: INTEGRATION: CWS dba24a (1.5.82); FILE MERGED 2007/08/28 06:58:48 oj 1.5.82.1: #i68858# enable relation for mysql inodb File Changes: Directory: /dba/connectivity/source/commontools/ ================================================ File [changed]: dbmetadata.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbmetadata.cxx?r1=1.5&r2=1.6 Delta lines: +27 -5 -------------------- --- dbmetadata.cxx 2006-12-13 16:13:43+0000 1.5 +++ dbmetadata.cxx 2007-09-26 14:28:09+0000 1.6 @@ -220,7 +220,7 @@ } //-------------------------------------------------------------------- - bool SAL_CALL DatabaseMetaData::supportsSubqueriesInFrom() const + bool DatabaseMetaData::supportsSubqueriesInFrom() const { lcl_checkConnected( *m_pImpl ); @@ -240,19 +240,19 @@ } //-------------------------------------------------------------------- - const ::rtl::OUString& SAL_CALL DatabaseMetaData::getIdentifierQuoteString() const + const ::rtl::OUString& DatabaseMetaData::getIdentifierQuoteString() const { return lcl_getConnectionStringSetting( *m_pImpl, m_pImpl->sCachedIdentifierQuoteString, &XDatabaseMetaData::getIdentifierQuoteString ); } //-------------------------------------------------------------------- - const ::rtl::OUString& SAL_CALL DatabaseMetaData::getCatalogSeparator() const + const ::rtl::OUString& DatabaseMetaData::getCatalogSeparator() const { return lcl_getConnectionStringSetting( *m_pImpl, m_pImpl->sCachedCatalogSeparator, &XDatabaseMetaData::getCatalogSeparator ); } //-------------------------------------------------------------------- - bool SAL_CALL DatabaseMetaData::restrictIdentifiersToSQL92() const + bool DatabaseMetaData::restrictIdentifiersToSQL92() const { lcl_checkConnected( *m_pImpl ); @@ -264,7 +264,7 @@ } //-------------------------------------------------------------------- - bool SAL_CALL DatabaseMetaData::generateASBeforeCorrelationName() const + bool DatabaseMetaData::generateASBeforeCorrelationName() const { bool doGenerate( true ); Any setting; @@ -273,6 +273,28 @@ return doGenerate; } + //-------------------------------------------------------------------- + bool DatabaseMetaData::supportsRelations() const + { + lcl_checkConnected( *m_pImpl ); + bool bSupport = false; + try + { + bSupport = m_pImpl->xConnectionMetaData->supportsIntegrityEnhancementFacility(); + if ( !bSupport ) + { + const ::rtl::OUString url = m_pImpl->xConnectionMetaData->getURL(); + char pMySQL[] = "sdbc:mysql:"; + bSupport = url.matchAsciiL(pMySQL,(sizeof(pMySQL)/sizeof(pMySQL[0]))-1); + } + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + return bSupport; + } + //........................................................................ } // namespace dbtools //........................................................................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
