Tag: oo_pqsdbc_01 User: jbu Date: 06/05/27 04:32:16 Modified: /dba/connectivity/source/drivers/postgresql/ makefile.mk, pq_databasemetadata.cxx, pq_resultsetmetadata.cxx
Log: added missing from clauses, now using pqftype instead of pqfmod for resultset meta data File Changes: Directory: /dba/connectivity/source/drivers/postgresql/ ======================================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/postgresql/makefile.mk?r1=1.1.2.8&r2=1.1.2.9 Delta lines: +3 -3 ------------------- --- makefile.mk 1 May 2006 19:19:05 -0000 1.1.2.8 +++ makefile.mk 27 May 2006 11:32:13 -0000 1.1.2.9 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.2.8 $ +# $Revision: 1.1.2.9 $ # -# last change: $Author: jbu $ $Date: 2006/05/01 19:19:05 $ +# last change: $Author: jbu $ $Date: 2006/05/27 11:32:13 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -79,7 +79,7 @@ PQ_SDBC_MAJOR=0 PQ_SDBC_MINOR=7 -PQ_SDBC_MICRO=1 +PQ_SDBC_MICRO=2 CFLAGS+=-I$(SOLARINCDIR)$/postgresql \ -DPOSTGRESQL_MAJOR=$(POSTGRESQL_MAJOR) \ File [changed]: pq_databasemetadata.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx?r1=1.1.2.9&r2=1.1.2.10 Delta lines: +7 -2 ------------------- --- pq_databasemetadata.cxx 1 May 2006 19:19:05 -0000 1.1.2.9 +++ pq_databasemetadata.cxx 27 May 2006 11:32:13 -0000 1.1.2.10 @@ -2,9 +2,9 @@ * * $RCSfile: pq_databasemetadata.cxx,v $ * - * $Revision: 1.1.2.9 $ + * $Revision: 1.1.2.10 $ * - * last change: $Author: jbu $ $Date: 2006/05/01 19:19:05 $ + * last change: $Author: jbu $ $Date: 2006/05/27 11:32:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1743,6 +1743,10 @@ OUString nameB; a[0 /*TYPE_NAME*/] >>= nameA; b[0 /*TYPE_NAME*/] >>= nameB; + if( nameA.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "int4" ) ) == 0 ) + return 1; + if( nameB.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "int4" ) ) == 0 ) + return 0; return nameA.compareTo( nameB ) < 0; } @@ -1900,6 +1904,7 @@ "pg_type.typlen AS typlen," //3 "pg_type.typnotnull AS typnotnull," //4 "pg_type.typname AS typname " //5 + "FROM pg_type " "WHERE pg_type.typtype = 'b' " "OR pg_type.typtype = 'p'" ) ); File [changed]: pq_resultsetmetadata.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx?r1=1.1.2.6&r2=1.1.2.7 Delta lines: +3 -3 ------------------- --- pq_resultsetmetadata.cxx 1 May 2006 19:19:06 -0000 1.1.2.6 +++ pq_resultsetmetadata.cxx 27 May 2006 11:32:13 -0000 1.1.2.7 @@ -2,9 +2,9 @@ * * $RCSfile: pq_resultsetmetadata.cxx,v $ * - * $Revision: 1.1.2.6 $ + * $Revision: 1.1.2.7 $ * - * last change: $Author: jbu $ $Date: 2006/05/01 19:19:06 $ + * last change: $Author: jbu $ $Date: 2006/05/27 11:32:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -178,7 +178,7 @@ & ( m_colDesc[col].scale ) ); char *name = PQfname( pResult, col ); m_colDesc[col].name = OUString( name, strlen(name) , (*m_ppSettings)->encoding ); - m_colDesc[col].typeOid = PQfmod( pResult, col ); + m_colDesc[col].typeOid = PQftype( pResult, col ); m_colDesc[col].type = com::sun::star::sdbc::DataType::LONGVARCHAR; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
