Tag: cws_src680_dba24d User: oj Date: 2007-11-21 12:40:54+0000 Modified: dba/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx dba/connectivity/source/drivers/jdbc/JConnection.cxx dba/connectivity/source/drivers/jdbc/JDriver.cxx dba/connectivity/source/drivers/jdbc/tools.cxx
Log: #i68854# impl TypeSettingInfo for Oracle and some clean up File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: DatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx?r1=1.26.44.1&r2=1.26.44.2 Delta lines: +5 -13 -------------------- --- DatabaseMetaData.cxx 2007-11-06 09:04:02+0000 1.26.44.1 +++ DatabaseMetaData.cxx 2007-11-21 12:40:51+0000 1.26.44.2 @@ -4,9 +4,9 @@ * * $RCSfile: DatabaseMetaData.cxx,v $ * - * $Revision: 1.26.44.1 $ + * $Revision: 1.26.44.2 $ * - * last change: $Author: oj $ $Date: 2007/11/06 09:04:02 $ + * last change: $Author: oj $ $Date: 2007/11/21 12:40:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -100,13 +100,12 @@ } // ----------------------------------------------------------------------------- java_sql_DatabaseMetaData::java_sql_DatabaseMetaData( JNIEnv * pEnv, jobject myObj, java_sql_Connection& _rConnection ) - :ODatabaseMetaDataBase( &_rConnection ) + :ODatabaseMetaDataBase( &_rConnection,_rConnection.getConnectionInfo() ) ,java_lang_Object( pEnv, myObj ) ,m_pConnection( &_rConnection ) ,m_aLogger( _rConnection.getLogger() ) { SDBThreadAttach::addRef(); - setConnectionInfo( _rConnection.getConnectionInfo() ); } // ------------------------------------------------------------------------- @@ -118,7 +117,7 @@ theClass = pClass; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTypeInfo( ) throw(SQLException, RuntimeException) +Reference< XResultSet > java_sql_DatabaseMetaData::impl_getTypeInfo_throw( ) { static jmethodID mID = NULL; return impl_callResultSetMethod( "getTypeInfo", mID ); @@ -498,10 +497,9 @@ } // fill our own resultset - ODatabaseMetaDataResultSet* pNewPrivRes = new ODatabaseMetaDataResultSet(); + ODatabaseMetaDataResultSet* pNewPrivRes = new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); Reference< XResultSet > xTemp = xReturn; xReturn = pNewPrivRes; - pNewPrivRes->setTablePrivilegesMap(); ODatabaseMetaDataResultSet::ORows aRows; Reference< XRow > xRow(xTemp,UNO_QUERY); ::rtl::OUString sValue; @@ -1599,9 +1597,3 @@ return out ? new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection ) : 0; } // ------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL java_sql_DatabaseMetaData::getConnection( ) throw(SQLException, RuntimeException) -{ - return (Reference< XConnection >)m_pConnection; -} -// ------------------------------------------------------------------------- - File [changed]: JConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JConnection.cxx?r1=1.6.18.2&r2=1.6.18.3 Delta lines: +4 -18 -------------------- --- JConnection.cxx 2007-11-06 10:58:37+0000 1.6.18.2 +++ JConnection.cxx 2007-11-21 12:40:51+0000 1.6.18.3 @@ -4,9 +4,9 @@ * * $RCSfile: JConnection.cxx,v $ * - * $Revision: 1.6.18.2 $ + * $Revision: 1.6.18.3 $ * - * last change: $Author: oj $ $Date: 2007/11/06 10:58:37 $ + * last change: $Author: oj $ $Date: 2007/11/21 12:40:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -203,7 +203,6 @@ java_sql_Connection::java_sql_Connection( const java_sql_Driver& _rDriver ) :java_lang_Object( _rDriver.getContext().getLegacyServiceFactory() ) ,OSubComponent<java_sql_Connection, java_sql_Connection_BASE>((::cppu::OWeakObject*)(&_rDriver), this) - ,m_xMetaData(NULL) ,m_pDriver( &_rDriver ) ,m_pDriverobject(NULL) ,m_Driver_theClass(NULL) @@ -250,19 +249,6 @@ dispose_ChildImpl(); java_sql_Connection_BASE::disposing(); - for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i) - { - try - { - Reference< XComponent > xComp(i->get(), UNO_QUERY); - if (xComp.is()) - xComp->dispose(); - } - catch(Exception&){} - } - m_aStatements.clear(); - - m_xMetaData = WeakReference< XDatabaseMetaData>(); if ( object ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -823,7 +809,7 @@ SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); try { - if ( !object && _sDriverClass.getLength() ) + if ( !object ) { // here I try to find the class for jdbc driver java_sql_SQLException_BASE::getMyClass(); File [changed]: JDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JDriver.cxx?r1=1.38.54.1&r2=1.38.54.2 Delta lines: +10 -2 -------------------- --- JDriver.cxx 2007-11-06 09:04:43+0000 1.38.54.1 +++ JDriver.cxx 2007-11-21 12:40:51+0000 1.38.54.2 @@ -4,9 +4,9 @@ * * $RCSfile: JDriver.cxx,v $ * - * $Revision: 1.38.54.1 $ + * $Revision: 1.38.54.2 $ * - * last change: $Author: oj $ $Date: 2007/11/06 09:04:43 $ + * last change: $Author: oj $ $Date: 2007/11/21 12:40:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,6 +70,7 @@ #include "resource/jdbc_log.hrc" #include <comphelper/componentcontext.hxx> +#include <com/sun/star/beans/Pair.hpp> using namespace connectivity; using namespace ::com::sun::star::uno; @@ -221,6 +222,13 @@ ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) ,aBooleanValues) ); + aDriverInfo.push_back(DriverPropertyInfo( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Defines how the type info of the database metadata should be manipulated.")) + ,sal_False + ,::rtl::OUString( ) + ,Sequence< ::rtl::OUString > ()) + ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } ::dbtools::throwGenericSQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid URL!")) ,*this); File [changed]: tools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/tools.cxx?r1=1.25&r2=1.25.80.1 Delta lines: +5 -3 ------------------- --- tools.cxx 2007-03-12 10:41:24+0000 1.25 +++ tools.cxx 2007-11-21 12:40:51+0000 1.25.80.1 @@ -4,9 +4,9 @@ * * $RCSfile: tools.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.80.1 $ * - * last change: $Author: obo $ $Date: 2007/03/12 10:41:24 $ + * last change: $Author: oj $ $Date: 2007/11/21 12:40:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -179,6 +179,8 @@ pBegin->Name.compareToAscii("EnableSQL92Check") && pBegin->Name.compareToAscii("EnableOuterJoinEscape") && pBegin->Name.compareToAscii("BooleanComparisonMode") && + pBegin->Name.compareToAscii("IgnoreCurrency") && + pBegin->Name.compareToAscii("TypeInfoSettings") && pBegin->Name.compareToAscii("IgnoreDriverPrivileges")) { ::rtl::OUString aStr; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
