Tag: cws_src680_dba24lms User: oj Date: 2007-11-14 12:52:18+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/JStatement.cxx dba/connectivity/source/drivers/jdbc/PreparedStatement.cxx dba/connectivity/source/drivers/jdbc/ResultSet.cxx dba/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx dba/connectivity/source/inc/java/sql/Connection.hxx dba/connectivity/source/inc/java/sql/ResultSet.hxx dba/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
Log: #i11746# insert Ignore Currency 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&r2=1.26.56.1 Delta lines: +10 -10 --------------------- --- DatabaseMetaData.cxx 2007-07-24 11:50:25+0000 1.26 +++ DatabaseMetaData.cxx 2007-11-14 12:52:15+0000 1.26.56.1 @@ -4,9 +4,9 @@ * * $RCSfile: DatabaseMetaData.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.26.56.1 $ * - * last change: $Author: rt $ $Date: 2007/07/24 11:50:25 $ + * last change: $Author: oj $ $Date: 2007/11/14 12:52:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -247,7 +247,7 @@ return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, cMethodName ); - return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedureColumns( @@ -405,7 +405,7 @@ return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, cMethodName ); - return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier( @@ -448,7 +448,7 @@ return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, cMethodName ); - return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( @@ -578,7 +578,7 @@ return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, cMethodName ); - return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection); } // ------------------------------------------------------------------------- @@ -728,7 +728,7 @@ return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, _pMethodName ); - return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection); } // ------------------------------------------------------------------------- @@ -800,7 +800,7 @@ return NULL; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, _pMethodName ); - return new java_sql_ResultSet( t.pEnv, out, m_aLogger ); + return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection); } // ------------------------------------------------------------------------- @@ -1596,7 +1596,7 @@ } } - return out ? new java_sql_ResultSet( t.pEnv, out, m_aLogger ) : 0; + 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) File [changed]: JConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JConnection.cxx?r1=1.7&r2=1.7.8.1 Delta lines: +24 -51 --------------------- --- JConnection.cxx 2007-11-01 14:50:54+0000 1.7 +++ JConnection.cxx 2007-11-14 12:52:15+0000 1.7.8.1 @@ -4,9 +4,9 @@ * * $RCSfile: JConnection.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.8.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 14:50:54 $ + * last change: $Author: oj $ $Date: 2007/11/14 12:52:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,7 +76,7 @@ #include "resource/jdbc_log.hrc" #include "com/sun/star/uno/XComponentContext.hpp" #include "jvmaccess/classpath.hxx" - +#include <comphelper/sequenceashashmap.hxx> #include <jni.h> #include <list> @@ -210,6 +210,7 @@ ,m_aLogger( _rDriver.getLogger() ) ,m_bParameterSubstitution(sal_False) ,m_bIgnoreDriverPrivileges(sal_True) + ,m_bIgnoreCurrency(sal_False) { } // ----------------------------------------------------------------------------- @@ -816,80 +817,42 @@ return Any(); } // ----------------------------------------------------------------------------- -void java_sql_Connection::loadDriverFromProperties( - const Sequence< PropertyValue >& info, ::rtl::OUString& _rsGeneratedValueStatement, - sal_Bool& _rbAutoRetrievingEnabled, sal_Bool& _bParameterSubstitution, sal_Bool& _bIgnoreDriverPrivileges ) +void java_sql_Connection::loadDriverFromProperties(const ::rtl::OUString& _sDriverClass,const ::rtl::OUString& _sDriverClassPath) { // first try if the jdbc driver is alraedy registered at the driver manager SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); try { - const PropertyValue* pJavaDriverClass = 0; - const PropertyValue* pJavaDriverClassPath = 0; - const PropertyValue* pBegin = info.getConstArray(); - const PropertyValue* pEnd = pBegin + info.getLength(); - for(;pBegin != pEnd;++pBegin) - { - if (!pBegin->Name.compareToAscii("JavaDriverClass")) - { - pJavaDriverClass = pBegin; - } - else if (!pBegin->Name.compareToAscii("JavaDriverClassPath")) - { - pJavaDriverClassPath = pBegin; - } - else if(!pBegin->Name.compareToAscii("IsAutoRetrievingEnabled")) - { - OSL_VERIFY( pBegin->Value >>= _rbAutoRetrievingEnabled ); - } - else if(!pBegin->Name.compareToAscii("AutoRetrievingStatement")) - { - OSL_VERIFY( pBegin->Value >>= _rsGeneratedValueStatement ); - } - else if(!pBegin->Name.compareToAscii("ParameterNameSubstitution")) - { - OSL_VERIFY( pBegin->Value >>= _bParameterSubstitution ); - } - else if(!pBegin->Name.compareToAscii("IgnoreDriverPrivileges")) - { - OSL_VERIFY( pBegin->Value >>= _bIgnoreDriverPrivileges ); - } - } - if ( !object && pJavaDriverClass != 0 ) + if ( !object && _sDriverClass.getLength() ) { // here I try to find the class for jdbc driver java_sql_SQLException_BASE::getMyClass(); java_lang_Throwable::getMyClass(); - ::rtl::OUString aStr; - OSL_VERIFY( pJavaDriverClass->Value >>= aStr ); - OSL_ASSERT( aStr.getLength()); - if ( !aStr.getLength() ) + OSL_ASSERT( _sDriverClass.getLength()); + if ( !_sDriverClass.getLength() ) { m_aLogger.log( LogLevel::SEVERE, STR_LOG_NO_DRIVER_CLASS ); throw SQLException(::rtl::OUString::createFromAscii("The specified driver was empty!"),*this,::rtl::OUString(),1000,Any()); } else { - m_aLogger.log( LogLevel::INFO, STR_LOG_LOADING_DRIVER, aStr ); + m_aLogger.log( LogLevel::INFO, STR_LOG_LOADING_DRIVER, _sDriverClass ); // the driver manager holds the class of the driver for later use ::std::auto_ptr< java_lang_Class > pDrvClass; - if ( pJavaDriverClassPath == 0 ) + if ( !_sDriverClassPath.getLength() ) { // if forName didn't find the class it will throw an exception - pDrvClass = ::std::auto_ptr< java_lang_Class >(java_lang_Class::forName(aStr)); + pDrvClass = ::std::auto_ptr< java_lang_Class >(java_lang_Class::forName(_sDriverClass)); } else { - ::rtl::OUString classpath; - OSL_VERIFY( pJavaDriverClassPath->Value >>= classpath ); - pDrvClass.reset( new java_lang_Class( t.pEnv, loadClass( m_pDriver->getContext().getUNOContext(), - t.pEnv, classpath, aStr + t.pEnv, _sDriverClassPath, _sDriverClass ) ) ); @@ -939,7 +902,17 @@ ::rtl::OUString sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values sal_Bool bAutoRetrievingEnabled = sal_False; // set to <TRUE/> when we should allow to query for generated values - loadDriverFromProperties(info,sGeneratedValueStatement,bAutoRetrievingEnabled,m_bParameterSubstitution,m_bIgnoreDriverPrivileges); + ::comphelper::SequenceAsHashMap aMap(info); + ::rtl::OUString sDriverClassPath,sDriverClass; + sDriverClass = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass")),sDriverClass); + sDriverClassPath = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClassPath")),sDriverClassPath); + bAutoRetrievingEnabled = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled")),bAutoRetrievingEnabled); + sGeneratedValueStatement = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoRetrievingStatement")),sGeneratedValueStatement); + m_bParameterSubstitution = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParameterNameSubstitution")),m_bParameterSubstitution); + m_bIgnoreDriverPrivileges = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreDriverPrivileges")),m_bIgnoreDriverPrivileges); + m_bIgnoreCurrency = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreCurrency")),m_bIgnoreCurrency); + + loadDriverFromProperties(sDriverClass,sDriverClassPath); enableAutoRetrievingEnabled(bAutoRetrievingEnabled); setAutoRetrievingStatement(sGeneratedValueStatement); File [changed]: JDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JDriver.cxx?r1=1.38&r2=1.38.64.1 Delta lines: +10 -3 -------------------- --- JDriver.cxx 2007-06-27 14:36:14+0000 1.38 +++ JDriver.cxx 2007-11-14 12:52:15+0000 1.38.64.1 @@ -4,9 +4,9 @@ * * $RCSfile: JDriver.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.38.64.1 $ * - * last change: $Author: hr $ $Date: 2007/06/27 14:36:14 $ + * last change: $Author: oj $ $Date: 2007/11/14 12:52:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -214,6 +214,13 @@ ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) ,aBooleanValues) ); + aDriverInfo.push_back(DriverPropertyInfo( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreCurrency")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ignore the currency field from the ResultsetMetaData.")) + ,sal_False + ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) ) + ,aBooleanValues) + ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } ::dbtools::throwGenericSQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid URL!")) ,*this); File [changed]: JStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/JStatement.cxx?r1=1.3&r2=1.3.66.1 Delta lines: +6 -6 ------------------- --- JStatement.cxx 2007-06-27 14:36:28+0000 1.3 +++ JStatement.cxx 2007-11-14 12:52:15+0000 1.3.66.1 @@ -4,9 +4,9 @@ * * $RCSfile: JStatement.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.66.1 $ * - * last change: $Author: hr $ $Date: 2007/06/27 14:36:28 $ + * last change: $Author: oj $ $Date: 2007/11/14 12:52:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -254,7 +254,7 @@ } } else - xRes = new java_sql_ResultSet( t.pEnv, out, m_aLogger, this ); + xRes = new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection, this ); return xRes; } @@ -370,7 +370,7 @@ } //mID } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, this ); + return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this ); } // ------------------------------------------------------------------------- Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection( ) throw(SQLException, RuntimeException) @@ -490,7 +490,7 @@ } //mID } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, this ); + return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this ); } // ------------------------------------------------------------------------- File [changed]: PreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/PreparedStatement.cxx?r1=1.18&r2=1.18.66.1 Delta lines: +5 -5 ------------------- --- PreparedStatement.cxx 2007-06-27 14:36:57+0000 1.18 +++ PreparedStatement.cxx 2007-11-14 12:52:15+0000 1.18.66.1 @@ -4,9 +4,9 @@ * * $RCSfile: PreparedStatement.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.18.66.1 $ * - * last change: $Author: hr $ $Date: 2007/06/27 14:36:57 $ + * last change: $Author: oj $ $Date: 2007/11/14 12:52:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -242,7 +242,7 @@ } } - return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger ); + return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this); } // ------------------------------------------------------------------------- @@ -814,7 +814,7 @@ } } - return out==0 ? 0 : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger ); + return out==0 ? 0 : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger,*m_pConnection ); } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- File [changed]: ResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/ResultSet.cxx?r1=1.31&r2=1.31.66.1 Delta lines: +6 -5 ------------------- --- ResultSet.cxx 2007-06-27 14:37:11+0000 1.31 +++ ResultSet.cxx 2007-11-14 12:52:15+0000 1.31.66.1 @@ -4,9 +4,9 @@ * * $RCSfile: ResultSet.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.31.66.1 $ * - * last change: $Author: hr $ $Date: 2007/06/27 14:37:11 $ + * last change: $Author: oj $ $Date: 2007/11/14 12:52:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,11 +112,12 @@ //************************************************************** jclass java_sql_ResultSet::theClass = 0; -java_sql_ResultSet::java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger, java_sql_Statement_Base* pStmt) +java_sql_ResultSet::java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger,java_sql_Connection& _rConnection, java_sql_Statement_Base* pStmt) :java_sql_ResultSet_BASE(m_aMutex) ,java_lang_Object( pEnv, myObj ) ,OPropertySetHelper(java_sql_ResultSet_BASE::rBHelper) ,m_aLogger( _rParentLogger, java::sql::ConnectionLog::RESULTSET ) + ,m_pConnection(&_rConnection) { SDBThreadAttach::addRef(); osl_incrementInterlockedCount(&m_refCount); @@ -510,7 +511,7 @@ } } - return out==0 ? 0 : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger ); + return out==0 ? 0 : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger,*m_pConnection ); } // ------------------------------------------------------------------------- Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) File [changed]: ResultSetMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx?r1=1.11&r2=1.11.66.1 Delta lines: +8 -4 ------------------- --- ResultSetMetaData.cxx 2007-06-27 14:37:27+0000 1.11 +++ ResultSetMetaData.cxx 2007-11-14 12:52:15+0000 1.11.66.1 @@ -4,9 +4,9 @@ * * $RCSfile: ResultSetMetaData.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.66.1 $ * - * last change: $Author: hr $ $Date: 2007/06/27 14:37:27 $ + * last change: $Author: oj $ $Date: 2007/11/14 12:52:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,6 +39,7 @@ #ifndef _CONNECTIVITY_JAVA_SQL_RESULTSETMETADATA_HXX_ #include "java/sql/ResultSetMetaData.hxx" #endif +#include "java/sql/Connection.hxx" #ifndef _CONNECTIVITY_JAVA_TOOLS_HXX_ #include "java/tools.hxx" #endif @@ -54,9 +55,10 @@ //************************************************************** jclass java_sql_ResultSetMetaData::theClass = 0; -java_sql_ResultSetMetaData::java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger ) +java_sql_ResultSetMetaData::java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon ) :java_lang_Object( pEnv, myObj ) ,m_aLogger( _rResultSetLogger ) + ,m_pConnection( &_rCon ) { SDBThreadAttach::addRef(); } @@ -347,6 +349,8 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) { + if ( m_pConnection->isIgnoreCurrencyEnabled() ) + return sal_False; jboolean out(sal_False); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); if( t.pEnv ){ Directory: /dba/connectivity/source/inc/java/sql/ ================================================= File [changed]: Connection.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/java/sql/Connection.hxx?r1=1.15&r2=1.15.66.1 Delta lines: +6 -4 ------------------- --- Connection.hxx 2007-06-27 14:38:25+0000 1.15 +++ Connection.hxx 2007-11-14 12:52:15+0000 1.15.66.1 @@ -4,9 +4,9 @@ * * $RCSfile: Connection.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.15.66.1 $ * - * last change: $Author: hr $ $Date: 2007/06/27 14:38:25 $ + * last change: $Author: oj $ $Date: 2007/11/14 12:52:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -83,6 +83,7 @@ m_aLogger; sal_Bool m_bParameterSubstitution; sal_Bool m_bIgnoreDriverPrivileges; + sal_Bool m_bIgnoreCurrency; /** transform named parameter into unnamed one. @param _sSQL @@ -91,7 +92,7 @@ The new statement witgh unnamed parameters. */ ::rtl::OUString transFormPreparedStatement(const ::rtl::OUString& _sSQL); - void loadDriverFromProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info,::rtl::OUString& _rsGeneratedValueStatement,sal_Bool& _rbAutoRetrievingEnabled,sal_Bool& _bParameterSubstitution,sal_Bool& _bIgnore); + void loadDriverFromProperties(const ::rtl::OUString& _sDriverClass,const ::rtl::OUString& _sDriverClassPath); protected: // statische Daten fuer die Klasse static jclass theClass; @@ -112,6 +113,7 @@ getConnectionInfo() const { return m_aConnectionInfo; } inline sal_Bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges;} + inline sal_Bool isIgnoreCurrencyEnabled() const { return m_bIgnoreCurrency; } const java::sql::ConnectionLog& getLogger() const { return m_aLogger; } File [changed]: ResultSet.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/java/sql/ResultSet.hxx?r1=1.11&r2=1.11.66.1 Delta lines: +6 -4 ------------------- --- ResultSet.hxx 2007-06-27 14:39:55+0000 1.11 +++ ResultSet.hxx 2007-11-14 12:52:15+0000 1.11.66.1 @@ -4,9 +4,9 @@ * * $RCSfile: ResultSet.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.66.1 $ * - * last change: $Author: hr $ $Date: 2007/06/27 14:39:55 $ + * last change: $Author: oj $ $Date: 2007/11/14 12:52:15 $ * * 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 @@ ::com::sun::star::sdbc::XColumnLocate, ::com::sun::star::lang::XServiceInfo> java_sql_ResultSet_BASE; + class java_sql_Connection; class java_sql_ResultSet : public comphelper::OBaseMutex, public java_sql_ResultSet_BASE, public java_lang_Object, @@ -108,6 +109,7 @@ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; java::sql::ConnectionLog m_aLogger; + java_sql_Connection* m_pConnection; sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -148,7 +150,7 @@ DECLARE_SERVICE_INFO(); static jclass getMyClass(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger, + java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger,java_sql_Connection& _rConnection, java_sql_Statement_Base* pStmt = NULL ); // ::cppu::OComponentHelper File [changed]: ResultSetMetaData.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/java/sql/ResultSetMetaData.hxx?r1=1.4&r2=1.4.66.1 Delta lines: +7 -6 ------------------- --- ResultSetMetaData.hxx 2007-06-27 14:40:13+0000 1.4 +++ ResultSetMetaData.hxx 2007-11-14 12:52:15+0000 1.4.66.1 @@ -4,9 +4,9 @@ * * $RCSfile: ResultSetMetaData.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.66.1 $ * - * last change: $Author: hr $ $Date: 2007/06/27 14:40:13 $ + * last change: $Author: oj $ $Date: 2007/11/14 12:52:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,12 +51,13 @@ //************************************************************** //************ Class: java.sql.ResultSetMetaData //************************************************************** - + class java_sql_Connection; class java_sql_ResultSetMetaData : public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData>, public java_lang_Object { protected: java::sql::ConnectionLog m_aLogger; + java_sql_Connection* m_pConnection; // statische Daten fuer die Klasse static jclass theClass; @@ -67,7 +68,7 @@ static jclass getMyClass(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger ); + java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon ); virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
