postgrespro
diff --git a/‎src/interfaces/jdbc/CHANGELOG
Lines changed: 16 additions & 7 deletions b/‎src/interfaces/jdbc/CHANGELOG
Lines changed: 16 additions & 7 deletions
diff --git a/‎src/interfaces/jdbc/Makefile
Lines changed: 1 addition & 2 deletions b/‎src/interfaces/jdbc/Makefile
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/interfaces/jdbc/postgresql/CallableStatement.java
Lines changed: 0 additions & 303 deletions b/‎src/interfaces/jdbc/postgresql/CallableStatement.java
Lines changed: 0 additions & 303 deletions
diff --git a/‎src/interfaces/jdbc/postgresql/Driver.java
Lines changed: 4 additions & 2 deletions b/‎src/interfaces/jdbc/postgresql/Driver.java
Lines changed: 4 additions & 2 deletions
@@ -1,6 +1,14 @@
-Web May 19 00:20:00 BST 1999
-	- Internationalisation now done. Surprising that there's 68 error messages
-	  in the driver ;-)
+Wed Jun 23 06:50:00 BST 1999
+	- Fixed error in errors.properties where the arguments are 0 based not
+	  1 based
+	- Fixed bug in postgresql.Driver where exception is thrown, then
+	  intercepted rather than being passed to the calling application.
+	- Removed the file postgresql/CallableStatement, as it's not used and
+	  really exists in the jdbc1 & jdbc2 sub packages only.
+
+Wed May 19 00:20:00 BST 1999
+	- Internationalisation now done. Surprising that there's 68 error
+	  messages in the driver ;-)
 
 Tue May 18 07:00:00 BST 1999
 	- Set the ImageViewer application to use transactions
@@ -12,14 +20,15 @@ Tue May 18 00:00:00 BST 1999
 Mon May 17 23:40:00 BST 1999
 	- PG_Stream.close() now attempts to send the close connection message
 	  to the backend before closing the streams
-	- Added batch support in the JDBC2, supplied by Yutaka Tanida <yutaka@marin.or.jp>
+	- Added batch support in the JDBC2, supplied by Yutaka Tanida
+	  <yutaka@marin.or.jp>
 	- Removed the old datestyle code. Now the driver uses only ISO.
 	- Removed some files in the postgresql directory still in CVS that were
 	  moved since 6.4.x (DatabaseMetaData.java PreparedStatement.java
 	  ResultSetMetaData.java Statement.java)
-	- Internationalisation of the error messages is partially implemented, however
-	  it's not enabled as it only works when the jar file is _not_ used, and
-	  work needs to be done.
+	- Internationalisation of the error messages is partially implemented,
+	  however it's not enabled as it only works when the jar file is
+	  _not_ used, and work needs to be done.
 
 Sun Apr 11 17:00:00 BST 1999
 	- getUpdateCount() now returns the actual update count (before it
 
@@ -4,7 +4,7 @@
 #    Makefile for Java JDBC interface
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.13 1999/05/17 22:58:18 peter Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.14 1999/06/23 05:56:17 peter Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -161,7 +161,6 @@ clean:
 # Java is unlike C in that one source file can generate several
 # _Different_ file names
 #
-postgresql/CallableStatement.class:	postgresql/CallableStatement.java
 postgresql/Connection.class:		postgresql/Connection.java
 postgresql/DatabaseMetaData.class:	postgresql/DatabaseMetaData.java
 postgresql/Driver.class:		postgresql/Driver.java
 
@@ -104,11 +104,13 @@ public java.sql.Connection connect(String url, Properties info) throws SQLExcept
 	return (java.sql.Connection)con;
     } catch(ClassNotFoundException ex) {
 	throw new PSQLException("postgresql.jvm.version",ex);
+    } catch(PSQLException(ex1) {
+	// re-throw the exception, otherwise it will be caught next, and a
+	// postgresql.unusual error will be returned instead.
+	throw ex1;
     } catch(Exception ex2) {
 	throw new PSQLException("postgresql.unusual",ex2);
     }
-    // The old call - remove before posting
-    //return new Connection (host(), port(), props, database(), url, this);
   }
 
   /**
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Makefile for Java JDBC interface`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.13 1999/05/17 22:58:18 peter Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.14 1999/06/23 05:56:17 peter Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -161,7 +161,6 @@ clean:`
`161`	`161`	`# Java is unlike C in that one source file can generate several`
`162`	`162`	`# _Different_ file names`
`163`	`163`	`#`
`164`		`-postgresql/CallableStatement.class: postgresql/CallableStatement.java`
`165`	`164`	`postgresql/Connection.class: postgresql/Connection.java`
`166`	`165`	`postgresql/DatabaseMetaData.class: postgresql/DatabaseMetaData.java`
`167`	`166`	`postgresql/Driver.class: postgresql/Driver.java`