diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-03 16:14:43 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-03 16:14:43 +0000 |
| commit | 7966eece1997e7aa059d2a01fdba350ceec485ec (patch) | |
| tree | 0719741b2cc1c9b1194bc51ca1ee359c6bcabbf2 /connectivity | |
| parent | 629a3ecb18ae9d85cd6c524b20ded8996f60f432 (diff) | |
INTEGRATION: CWS nomysqlversion (1.33.8); FILE MERGED
2006/02/01 08:38:42 fs 1.33.8.1: #i60273# optional driver setting to prevent calls to getVersionColumns
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/odbc/OConnection.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index 266eeedbdb9b..fa3a19c3dc02 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -4,9 +4,9 @@ * * $RCSfile: OConnection.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: obo $ $Date: 2006-01-16 15:04:15 $ + * last change: $Author: kz $ $Date: 2006-02-03 17:14:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -99,6 +99,7 @@ OConnection::OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver) ,m_nStatementCount(0) ,m_bParameterSubstitution(sal_False) ,m_bIgnoreDriverPrivileges(sal_False) + ,m_bPreventGetVersionColumns(sal_False) { m_pDriver->acquire(); ModuleContext::AddRef(); @@ -235,6 +236,7 @@ SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< Prop const char* pCharSet = "CharSet"; const char* pParaName = "ParameterNameSubstitution"; const char* pPrivName = "IgnoreDriverPrivileges"; + const char* pVerColName = "PreventGetVersionColumns"; // #i60273# const char* pRetrieving = "IsAutoRetrievingEnabled"; const char* pRetriStmt = "AutoRetrievingStatement"; @@ -250,6 +252,8 @@ SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< Prop pBegin->Value >>= bSilent; else if(!pBegin->Name.compareToAscii(pPrivName)) pBegin->Value >>= m_bIgnoreDriverPrivileges; + else if(!pBegin->Name.compareToAscii(pVerColName)) + pBegin->Value >>= m_bPreventGetVersionColumns; else if(!pBegin->Name.compareToAscii(pParaName)) pBegin->Value >>= m_bParameterSubstitution; else if(!pBegin->Name.compareToAscii(pRetrieving)) |