From owner-freebsd-ports Tue May 8 20:10:10 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9493137B423 for ; Tue, 8 May 2001 20:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f493A1Z76239; Tue, 8 May 2001 20:10:01 -0700 (PDT) (envelope-from gnats) Received: from palle.girgensohn.se (c213.89.164.11.cm-upc.chello.se [213.89.164.11]) by hub.freebsd.org (Postfix) with ESMTP id 12D7837B423 for ; Tue, 8 May 2001 20:08:12 -0700 (PDT) (envelope-from girgen@palle.girgensohn.se) Received: (from girgen@localhost) by palle.girgensohn.se (8.11.3/8.11.3) id f49389H38103; Wed, 9 May 2001 05:08:09 +0200 (CEST) (envelope-from girgen) Message-Id: <200105090308.f49389H38103@palle.girgensohn.se> Date: Wed, 9 May 2001 05:08:09 +0200 (CEST) From: girgen@partitur.se Reply-To: girgen@partitur.se To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/27220: [patch] update databases/postgresql to 7.1.1 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 27220 >Category: ports >Synopsis: [maintainer patch] update databases/postgresql to 7.1.1 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue May 08 20:10:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: User & >Release: FreeBSD 4.3-RELEASE i386 >Organization: Partitur >Environment: System: FreeBSD palle.girgensohn.se 4.3-RELEASE FreeBSD 4.3-RELEASE #8: Mon Apr 23 04:00:26 CEST 2001 girgen@palle.girgensohn.se:/usr/obj/usr/src/sys/STORDATAN i386 >Description: Update postgresql to 7.1.1 and fix a jdbc bug where getDate and getTime wouldn't work on SQL Timestamps >How-To-Repeat: >Fix: apply the patch, and don't forget do cvs add files/patch-jdbc-getdate Index: Makefile =================================================================== RCS file: /home/ncvs/ports/databases/postgresql7/Makefile,v retrieving revision 1.79 diff -u -u -r1.79 Makefile --- Makefile 2001/04/25 17:17:55 1.79 +++ Makefile 2001/05/08 23:06:00 @@ -6,8 +6,7 @@ # PORTNAME= postgresql -PORTVERSION= 7.1 -PORTREVISION= 2 +PORTVERSION= 7.1.1 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/databases/postgresql7/distinfo,v retrieving revision 1.17 diff -u -u -r1.17 distinfo --- distinfo 2001/04/21 11:34:32 1.17 +++ distinfo 2001/05/08 23:08:30 @@ -1,3 +1,3 @@ -MD5 (postgresql/postgresql-base-7.1.tar.gz) = fce51e036ea8aadafe42f35841e50cc6 -MD5 (postgresql/postgresql-opt-7.1.tar.gz) = dca8a70020caab1024afe4d0f203fef1 -MD5 (postgresql/postgresql-docs-7.1.tar.gz) = 8fd7a862909663a6034d4aeb70ea7b71 +MD5 (postgresql/postgresql-base-7.1.1.tar.gz) = 7f579a6274d5b5e251b256c7525f861b +MD5 (postgresql/postgresql-opt-7.1.1.tar.gz) = 3b06dc74de6721a3fcd7c9d8c4c0bce8 +MD5 (postgresql/postgresql-docs-7.1.1.tar.gz) = 9daf2d044b0805aa2d47df769cfa4069 Index: pkg-plist.doc =================================================================== RCS file: /home/ncvs/ports/databases/postgresql7/pkg-plist.doc,v retrieving revision 1.3 diff -u -u -r1.3 pkg-plist.doc --- pkg-plist.doc 2001/04/21 11:34:32 1.3 +++ pkg-plist.doc 2001/05/09 00:08:52 @@ -152,12 +152,12 @@ share/doc/postgresql/html/libpqpp-exec.html share/doc/postgresql/html/libpqpp-notify.html share/doc/postgresql/html/lisp.html -share/doc/postgresql/html/ln11307.html +share/doc/postgresql/html/ln11330.html share/doc/postgresql/html/ln1274.html -share/doc/postgresql/html/ln15103.html +share/doc/postgresql/html/ln15154.html share/doc/postgresql/html/ln24.html -share/doc/postgresql/html/ln24896.html -share/doc/postgresql/html/ln37046.html +share/doc/postgresql/html/ln24983.html +share/doc/postgresql/html/ln37149.html share/doc/postgresql/html/ln8.html share/doc/postgresql/html/lo-funcs.html share/doc/postgresql/html/lo-implementation.html @@ -471,6 +471,7 @@ share/doc/postgresql/html/wal-configuration.html share/doc/postgresql/html/wal-implementation.html share/doc/postgresql/html/wal.html +share/doc/postgresql/html/x14487.html share/doc/postgresql/html/xact-read-committed.html share/doc/postgresql/html/xact-serializable.html share/doc/postgresql/html/xaggr.html --- /dev/null Wed May 9 04:42:00 2001 +++ files/patch-jdbc-getdate Wed May 9 04:40:26 2001 @@ -0,0 +1,34 @@ +--- src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java~ Fri Feb 23 19:12:23 2001 ++++ src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java Wed May 9 04:31:11 2001 +@@ -423,8 +423,13 @@ + String s = getString(columnIndex); + if(s==null) + return null; +- +- return java.sql.Date.valueOf(s); ++ // length == 10: SQL Date ++ // length > 10: SQL Timestamp, assumes PGDATESTYLE=ISO ++ try { ++ return java.sql.Date.valueOf((s.length() == 10) ? s : s.substring(0,10)); ++ } catch (NumberFormatException e) { ++ throw new PSQLException("postgresql.res.baddate", s); ++ } + } + + /** +@@ -441,8 +446,13 @@ + + if(s==null) + return null; // SQL NULL +- +- return java.sql.Time.valueOf(s); ++ // length == 8: SQL Time ++ // length > 8: SQL Timestamp ++ try { ++ return java.sql.Time.valueOf((s.length() == 8) ? s : s.substring(11,19)); ++ } catch (NumberFormatException e) { ++ throw new PSQLException("postgresql.res.badtime",s); ++ } + } + + /** >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message