Tag: oo_pqsdbc_01 User: jbu Date: 2007-08-26 20:40:43+0000 Modified: dba/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx dba/connectivity/source/drivers/postgresql/pq_statement.cxx dba/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx dba/connectivity/source/drivers/postgresql/pq_baseresultset.hxx dba/connectivity/source/drivers/postgresql/pq_allocator.hxx dba/connectivity/source/drivers/postgresql/makefile.mk dba/connectivity/source/drivers/postgresql/DataAccess.xcu
Log: #i77337, i77336, i80085# build issues + #i52352# native sql queries fail File Changes: Directory: /dba/connectivity/source/drivers/postgresql/ ======================================================= File [changed]: pq_updateableresultset.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +1 -1 ------------------- --- pq_updateableresultset.hxx 2004-05-09 19:47:18+0000 1.1.2.1 +++ pq_updateableresultset.hxx 2007-08-26 20:40:40+0000 1.1.2.2 @@ -50,7 +50,7 @@ { } - rtl::OUString UpdateableResultSet::buildWhereClause(); + rtl::OUString buildWhereClause(); void checkUpdate( sal_Int32 column ); public: File [changed]: pq_statement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/postgresql/pq_statement.cxx?r1=1.1.2.6&r2=1.1.2.7 Delta lines: +7 -3 ------------------- --- pq_statement.cxx 2007-01-07 21:51:26+0000 1.1.2.6 +++ pq_statement.cxx 2007-08-26 20:40:40+0000 1.1.2.7 @@ -2,9 +2,9 @@ * * $RCSfile: pq_statement.cxx,v $ * - * $Revision: 1.1.2.6 $ + * $Revision: 1.1.2.7 $ * - * last change: $Author: jbu $ $Date: 2007/01/07 21:51:26 $ + * last change: $Author: jbu $ $Date: 2007/08/26 20:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -947,7 +947,11 @@ Reference< ::com::sun::star::sdbc::XResultSetMetaData > Statement::getMetaData() throw (SQLException,RuntimeException) { - return Reference< ::com::sun::star::sdbc::XResultSetMetaData > ( m_lastResultset, UNO_QUERY ); + Reference< com::sun::star::sdbc::XResultSetMetaData > ret; + Reference< com::sun::star::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); + if( supplier.is() ) + ret = supplier->getMetaData(); + return ret; } File [changed]: pq_preparedstatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx?r1=1.1.2.8&r2=1.1.2.9 Delta lines: +7 -3 ------------------- --- pq_preparedstatement.cxx 2007-01-07 13:50:37+0000 1.1.2.8 +++ pq_preparedstatement.cxx 2007-08-26 20:40:40+0000 1.1.2.9 @@ -2,9 +2,9 @@ * * $RCSfile: pq_preparedstatement.cxx,v $ * - * $Revision: 1.1.2.8 $ + * $Revision: 1.1.2.9 $ * - * last change: $Author: jbu $ $Date: 2007/01/07 13:50:37 $ + * last change: $Author: jbu $ $Date: 2007/08/26 20:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -737,7 +737,11 @@ Reference< ::com::sun::star::sdbc::XResultSetMetaData > PreparedStatement::getMetaData() throw (SQLException,RuntimeException) { - return Reference< ::com::sun::star::sdbc::XResultSetMetaData > ( m_lastResultset, UNO_QUERY ); + Reference< com::sun::star::sdbc::XResultSetMetaData > ret; + Reference< com::sun::star::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); + if( supplier.is() ) + ret = supplier->getMetaData(); + return ret; } ::cppu::IPropertyArrayHelper & PreparedStatement::getInfoHelper() File [changed]: pq_baseresultset.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/postgresql/pq_baseresultset.hxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +8 -8 ------------------- --- pq_baseresultset.hxx 2004-05-09 19:47:13+0000 1.1.2.2 +++ pq_baseresultset.hxx 2007-08-26 20:40:40+0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: pq_baseresultset.hxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: jbu $ $Date: 2004/05/09 19:47:13 $ + * last change: $Author: jbu $ $Date: 2007/08/26 20:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -134,8 +134,8 @@ throw (com::sun::star::uno::RuntimeException); public: // XCloseable - virtual void SAL_CALL close( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; +// virtual void SAL_CALL close( ) +// throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() @@ -144,8 +144,8 @@ throw( com::sun::star::uno::RuntimeException ); public: // XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; +// virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) +// throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; public: // XResultSet // Methods @@ -232,8 +232,8 @@ throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; +// virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) +// throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); File [changed]: pq_allocator.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/postgresql/pq_allocator.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +11 -3 -------------------- --- pq_allocator.hxx 2003-10-20 20:25:11+0000 1.1.2.1 +++ pq_allocator.hxx 2007-08-26 20:40:40+0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: pq_allocator.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: jbu $ $Date: 2003/10/20 20:25:11 $ + * last change: $Author: jbu $ $Date: 2007/08/26 20:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -204,14 +204,22 @@ /* REQUIRED BY STLPort (see stlport '_alloc.h'): Hack for compilers that do not support member template classes (e.g. MSVC 6) */ +#if defined (_MSC_VER) +#if (_MSC_VER < 1200) // MSVC 6 namespace _STL { +#endif +#endif template<class T, class U> inline pq_sdbc_driver::Allocator<U> & __stl_alloc_rebind ( pq_sdbc_driver::Allocator<T> & a, U const *) { return (pq_sdbc_driver::Allocator<U>&)(a); } +#if defined (_MSC_VER) +#if (_MSC_VER < 1200) // MSVC 6 } +#endif +#endif #endif /* INCLUDED_SAL_INTERNAL_ALLOCATOR_HXX */ File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/postgresql/makefile.mk?r1=1.1.2.11&r2=1.1.2.12 Delta lines: +20 -4 -------------------- --- makefile.mk 2007-02-15 20:04:47+0000 1.1.2.11 +++ makefile.mk 2007-08-26 20:40:40+0000 1.1.2.12 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.2.11 $ +# $Revision: 1.1.2.12 $ # -# last change: $Author: jbu $ $Date: 2007/02/15 20:04:47 $ +# last change: $Author: jbu $ $Date: 2007/08/26 20:40:40 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,7 +71,9 @@ # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.IF "$(SYSTEM_POSTGRESQL)" != "YES" .INCLUDE : $(SOLARINCDIR)$/postgresql/postgresql-version.mk +.ENDIF #------------------------------------------------------------------- # uno component naming scheme @@ -80,8 +82,19 @@ PQ_SDBC_MAJOR=0 PQ_SDBC_MINOR=7 PQ_SDBC_MICRO=4 +.IF "$(SYSTEM_POSTGRESQL)" == "YES" +POSTGRESQL_MAJOR=`pg_config --version | awk '{ print $$2 }' | cut -d. -f1` +POSTGRESQL_MINOR=`pg_config --version | awk '{ print $$2 }' | cut -d. -f2` +POSTGRESQL_MICRO=`pg_config --version | awk '{ print $$2 }' | cut -d. -f3` +.ENDIF + +.IF "$(SYSTEM_POSTGRESQL)" != "YES" +POSTGRESQL_INCLUDES=-I$(SOLARINCDIR)$/postgresql +.ELSE +POSTGRESQL_INCLUDES=-I`pg_config --includedir` +.ENDIF -CFLAGS+=-I$(SOLARINCDIR)$/postgresql \ +CFLAGS+=$(POSTGRESQL_INCLUDES) \ -DPOSTGRESQL_MAJOR=$(POSTGRESQL_MAJOR) \ -DPOSTGRESQL_MINOR=$(POSTGRESQL_MINOR) \ -DPOSTGRESQL_MICRO=$(POSTGRESQL_MICRO) \ @@ -193,7 +206,10 @@ $(DLLDEST)$/DataAccess.xcu : DataAccess.xcu -rm -f $@ - cat DataAccess.xcu > $@ + cat DataAccess.xcu | \ + sed s/PQ_SDBC_MAJOR/$(PQ_SDBC_MAJOR)/ | \ + sed s/PQ_SDBC_MINOR/$(PQ_SDBC_MINOR)/ | \ + sed s/PQ_SDBC_MICRO/$(PQ_SDBC_MICRO)/ > $@ strip : File [changed]: DataAccess.xcu Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/postgresql/DataAccess.xcu?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +1 -1 ------------------- --- DataAccess.xcu 2006-01-22 15:14:25+0000 1.1.2.3 +++ DataAccess.xcu 2007-08-26 20:40:40+0000 1.1.2.4 @@ -3,7 +3,7 @@ <node oor:name="UserDefinedDriverSettings"> <node oor:name="Postgresql Driver" oor:op="replace"> <prop oor:name="DriverPageDisplayName"> - <value>Postgresql-SDBC Driver V 0.7.0</value> + <value>Postgresql-SDBC Driver V PQ_SDBC_MAJOR.PQ_SDBC_MINOR.PQ_SDBC_MICRO</value> </prop> <prop oor:name="DriverTypeDisplayName"> <value>postgresql</value> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
