Tag: cws_src680_dba22b User: fs Date: 2006/12/05 06:47:40 Modified: dba/connectivity/source/drivers/odbc/ODriver.cxx dba/connectivity/source/drivers/odbc/OConnection.cxx dba/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
Log: #i72252# allow to retrieve the property values which were used to construct the connection File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: ODriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/ODriver.cxx?r1=1.15&r2=1.15.50.1 Delta lines: +21 -14 --------------------- --- ODriver.cxx 17 Sep 2006 03:06:07 -0000 1.15 +++ ODriver.cxx 5 Dec 2006 14:47:37 -0000 1.15.50.1 @@ -4,9 +4,9 @@ * * $RCSfile: ODriver.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.15.50.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 03:06:07 $ + * last change: $Author: fs $ $Date: 2006/12/05 14:47:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -154,9 +154,9 @@ { ::std::vector< DriverPropertyInfo > aDriverInfo; - Sequence< ::rtl::OUString > aBoolean(2); - aBoolean[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")); - aBoolean[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")); + Sequence< ::rtl::OUString > aBooleanValues(2); + aBooleanValues[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ); + aBooleanValues[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ); aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet")) @@ -169,8 +169,8 @@ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCatalog")) ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Use catalog for file-based databases.")) ,sal_False - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) - ,aBoolean) + ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) + ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SystemDriverSettings")) @@ -183,22 +183,22 @@ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParameterNameSubstitution")) ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Change named parameters with '?'.")) ,sal_False - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) - ,aBoolean) + ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) + ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreDriverPrivileges")) ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ignore the privileges from the database driver.")) ,sal_False - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) - ,aBoolean) + ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) + ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled")) ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Retrieve generated values.")) ,sal_False - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) - ,aBoolean) + ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) + ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoRetrievingStatement")) @@ -206,6 +206,13 @@ ,sal_False ,::rtl::OUString() ,Sequence< ::rtl::OUString >()) + ); + aDriverInfo.push_back(DriverPropertyInfo( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GenerateASBeforeCorrelationName")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Generate AS before table correlation names.")) + ,sal_False + ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) + ,aBooleanValues) ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } File [changed]: OConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OConnection.cxx?r1=1.38&r2=1.38.50.1 Delta lines: +3 -4 ------------------- --- OConnection.cxx 17 Sep 2006 03:05:16 -0000 1.38 +++ OConnection.cxx 5 Dec 2006 14:47:37 -0000 1.38.50.1 @@ -4,9 +4,9 @@ * * $RCSfile: OConnection.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.38.50.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 03:05:16 $ + * last change: $Author: fs $ $Date: 2006/12/05 14:47:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -415,7 +415,6 @@ { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); - Reference< XDatabaseMetaData > xMetaData = m_xMetaData; if(!xMetaData.is()) File [changed]: ODatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx?r1=1.32&r2=1.32.50.1 Delta lines: +4 -3 ------------------- --- ODatabaseMetaData.cxx 17 Sep 2006 03:05:31 -0000 1.32 +++ ODatabaseMetaData.cxx 5 Dec 2006 14:47:38 -0000 1.32.50.1 @@ -4,9 +4,9 @@ * * $RCSfile: ODatabaseMetaData.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.32.50.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 03:05:31 $ + * last change: $Author: fs $ $Date: 2006/12/05 14:47:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -92,6 +92,7 @@ } osl_decrementInterlockedCount( &m_refCount ); } + setConnectionInfo( _pCon->getConnectionInfo() ); } // ------------------------------------------------------------------------- ODatabaseMetaData::~ODatabaseMetaData() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
