Improved error message and added some log messages in batch update functionality

Barry Lind · Barry Lind · commit 77ce53580bbf · 2003-03-14T01:21:47.000Z
Modified Files:
 	jdbc/org/postgresql/errors.properties
 	jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
 	jdbc/org/postgresql/util/PSQLException.java
diff --git a/src/interfaces/jdbc/org/postgresql/errors.properties b/src/interfaces/jdbc/org/postgresql/errors.properties
@@ -69,7 +69,7 @@ postgresql.serial.namelength:Class & Package name length cannot be longer than 6
 postgresql.serial.noclass:No class found for {0}
 postgresql.serial.table:The table for {0} is not in the database. Contact the DBA, as the database is in an inconsistent state.
 postgresql.serial.underscore:Class names may not have _ in them. You supplied {0}.
-postgresql.stat.batch.error:Batch entry {0} {1} was aborted.
+postgresql.stat.batch.error:Batch entry {0} {1} was aborted. Call getNextException() to see the cause.
 postgresql.stat.maxfieldsize:An attempt to setMaxFieldSize() failed - compile time default in force.
 postgresql.stat.noresult:No results were returned by the query.
 postgresql.stat.result:A result was returned when none was expected.
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
@@ -9,7 +9,7 @@
 import org.postgresql.largeobject.*;
 import org.postgresql.util.PSQLException;
 
-/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Attic/AbstractJdbc2Statement.java,v 1.12 2003/03/07 18:39:45 barry Exp $
+/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Attic/AbstractJdbc2Statement.java,v 1.13 2003/03/14 01:21:47 barry Exp $
  * This class defines methods of the jdbc2 specification.  This class extends
  * org.postgresql.jdbc1.AbstractJdbc1Statement which provides the jdbc1
  * methods.  The real Statement class (for jdbc2) is org.postgresql.jdbc2.Jdbc2Statement
@@ -105,7 +105,7 @@ public int[] executeBatch() throws SQLException
 
 			PBatchUpdateException updex =
 				new PBatchUpdateException("postgresql.stat.batch.error",
-										  new Integer(i), batch.elementAt(i), resultSucceeded);
+										  new Integer(i), m_sqlFragments[0], resultSucceeded);
 			updex.setNextException(e);
 
 			throw updex;
diff --git a/src/interfaces/jdbc/org/postgresql/util/PSQLException.java b/src/interfaces/jdbc/org/postgresql/util/PSQLException.java
@@ -7,7 +7,7 @@
  * Copyright (c) 2003, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/util/Attic/PSQLException.java,v 1.10 2003/03/08 06:06:55 barry Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/util/Attic/PSQLException.java,v 1.11 2003/03/14 01:21:47 barry Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,6 +16,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
 import java.sql.SQLException;
+import org.postgresql.Driver;
 
 public class PSQLException extends SQLException
 {
@@ -29,6 +30,8 @@ public PSQLException(String error)
 	{
 		super();
 		translate(error, null);
+		if (Driver.logDebug)
+			Driver.debug("Exception: " + this);
 	}
 
 	/*
@@ -40,6 +43,8 @@ public PSQLException(String error, Object[] args)
 	{
 		super();
 		translate(error, args);
+		if (Driver.logDebug)
+			Driver.debug("Exception: " + this);
 	}
 
 	/*
@@ -51,6 +56,8 @@ public PSQLException(String error, Object arg)
 		Object[] argv = new Object[1];
 		argv[0] = arg;
 		translate(error, argv);
+		if (Driver.logDebug)
+			Driver.debug("Exception: " + this);
 	}
 
 	/*
@@ -82,6 +89,8 @@ public PSQLException(String error, Exception ex)
 		}
 
 		translate(error, argv);
+		if (Driver.logDebug)
+			Driver.debug("Exception: " + this);
 	}
 
 	/*
@@ -94,6 +103,8 @@ public PSQLException(String error, Object arg1, Object arg2)
 		argv[0] = arg1;
 		argv[1] = arg2;
 		translate(error, argv);
+		if (Driver.logDebug)
+			Driver.debug("Exception: " + this);
 	}
 
 	private void translate(String error, Object[] args)

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Copyright (c) 2003, PostgreSQL Global Development Group`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/util/Attic/PSQLException.java,v 1.10 2003/03/08 06:06:55 barry Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/util/Attic/PSQLException.java,v 1.11 2003/03/14 01:21:47 barry Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -16,6 +16,7 @@`
`16`	`16`	`import java.io.ByteArrayOutputStream;`
`17`	`17`	`import java.io.PrintWriter;`
`18`	`18`	`import java.sql.SQLException;`
	`19`	`+import org.postgresql.Driver;`
`19`	`20`
`20`	`21`	`public class PSQLException extends SQLException`
`21`	`22`	`{`
`@@ -29,6 +30,8 @@ public PSQLException(String error)`
`29`	`30`	`{`
`30`	`31`	`super();`
`31`	`32`	`translate(error, null);`
	`33`	`+ if (Driver.logDebug)`
	`34`	`+ Driver.debug("Exception: " + this);`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`/*`
`@@ -40,6 +43,8 @@ public PSQLException(String error, Object[] args)`
`40`	`43`	`{`
`41`	`44`	`super();`
`42`	`45`	`translate(error, args);`
	`46`	`+ if (Driver.logDebug)`
	`47`	`+ Driver.debug("Exception: " + this);`
`43`	`48`	`}`
`44`	`49`
`45`	`50`	`/*`
`@@ -51,6 +56,8 @@ public PSQLException(String error, Object arg)`
`51`	`56`	`Object[] argv = new Object[1];`
`52`	`57`	`argv[0] = arg;`
`53`	`58`	`translate(error, argv);`
	`59`	`+ if (Driver.logDebug)`
	`60`	`+ Driver.debug("Exception: " + this);`
`54`	`61`	`}`
`55`	`62`
`56`	`63`	`/*`
`@@ -82,6 +89,8 @@ public PSQLException(String error, Exception ex)`
`82`	`89`	`}`
`83`	`90`
`84`	`91`	`translate(error, argv);`
	`92`	`+ if (Driver.logDebug)`
	`93`	`+ Driver.debug("Exception: " + this);`
`85`	`94`	`}`
`86`	`95`
`87`	`96`	`/*`
`@@ -94,6 +103,8 @@ public PSQLException(String error, Object arg1, Object arg2)`
`94`	`103`	`argv[0] = arg1;`
`95`	`104`	`argv[1] = arg2;`
`96`	`105`	`translate(error, argv);`
	`106`	`+ if (Driver.logDebug)`
	`107`	`+ Driver.debug("Exception: " + this);`
`97`	`108`	`}`
`98`	`109`
`99`	`110`	`private void translate(String error, Object[] args)`