User: kz Date: 06/02/03 09:14:59 Modified: /dba/connectivity/source/drivers/odbc/ ODatabaseMetaData.cxx
Log: INTEGRATION: CWS nomysqlversion (1.29.66); FILE MERGED 2006/02/01 08:38:43 fs 1.29.66.1: #i60273# optional driver setting to prevent calls to getVersionColumns File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: ODatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx?r1=1.29&r2=1.30 Delta lines: +14 -5 -------------------- --- ODatabaseMetaData.cxx 8 Sep 2005 06:33:39 -0000 1.29 +++ ODatabaseMetaData.cxx 3 Feb 2006 17:14:56 -0000 1.30 @@ -274,20 +274,29 @@ const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) { Reference< XResultSet > xRef; + bool bSuccess = false; try { + if ( !m_pConnection->preventGetVersionColumns() ) + { ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(m_pConnection); xRef = pResult; pResult->openVersionColumns(m_bUseCatalog ? catalog : Any(),schema,table); + bSuccess = true; + } } catch(SQLException&) { + } + + if ( !bSuccess ) + { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(); xRef = pResult; pResult->setVersionColumnsMap(); } - return xRef; + return xRef; } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
