c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Modified Files:
 	jdbc/org/postgresql/errors.properties
 	jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
 	jdbc/org/postgresql/util/PSQLException.java
This commit is contained in:
Barry Lind 2003-03-14 01:21:47 +00:00
parent 7931bfa764
commit 77ce53580b
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/interfaces/jdbc/org/postgresql/errors.properties
View file

@ -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.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.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.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.maxfieldsize:An attempt to setMaxFieldSize() failed - compile time default in force.
postgresql.stat.noresult:No results were returned by the query. postgresql.stat.noresult:No results were returned by the query.
postgresql.stat.result:A result was returned when none was expected. postgresql.stat.result:A result was returned when none was expected.

4
src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
View file

@ -9,7 +9,7 @@ import org.postgresql.Driver;
import org.postgresql.largeobject.*; import org.postgresql.largeobject.*;
import org.postgresql.util.PSQLException; 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 * This class defines methods of the jdbc2 specification. This class extends
* org.postgresql.jdbc1.AbstractJdbc1Statement which provides the jdbc1 * org.postgresql.jdbc1.AbstractJdbc1Statement which provides the jdbc1
* methods. The real Statement class (for jdbc2) is org.postgresql.jdbc2.Jdbc2Statement * methods. The real Statement class (for jdbc2) is org.postgresql.jdbc2.Jdbc2Statement
@ -105,7 +105,7 @@ public abstract class AbstractJdbc2Statement extends org.postgresql.jdbc1.Abstra
PBatchUpdateException updex = PBatchUpdateException updex =
new PBatchUpdateException("postgresql.stat.batch.error", new PBatchUpdateException("postgresql.stat.batch.error",
new Integer(i), batch.elementAt(i), resultSucceeded); new Integer(i), m_sqlFragments[0], resultSucceeded);
updex.setNextException(e); updex.setNextException(e);
throw updex; throw updex;

13
src/interfaces/jdbc/org/postgresql/util/PSQLException.java
View file

@ -7,7 +7,7 @@
* Copyright (c) 2003, PostgreSQL Global Development Group * Copyright (c) 2003, PostgreSQL Global Development Group
* *
* IDENTIFICATION * 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 @@ package org.postgresql.util;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.sql.SQLException; import java.sql.SQLException;
import org.postgresql.Driver;
public class PSQLException extends SQLException public class PSQLException extends SQLException
{ {
@ -29,6 +30,8 @@ public class PSQLException extends SQLException
{ {
super(); super();
translate(error, null); translate(error, null);
if (Driver.logDebug)
Driver.debug("Exception: " + this);
} }
/* /*
@ -40,6 +43,8 @@ public class PSQLException extends SQLException
{ {
super(); super();
translate(error, args); translate(error, args);
if (Driver.logDebug)
Driver.debug("Exception: " + this);
} }
/* /*
@ -51,6 +56,8 @@ public class PSQLException extends SQLException
Object[] argv = new Object[1]; Object[] argv = new Object[1];
argv[0] = arg; argv[0] = arg;
translate(error, argv); translate(error, argv);
if (Driver.logDebug)
Driver.debug("Exception: " + this);
} }
/* /*
@ -82,6 +89,8 @@ public class PSQLException extends SQLException
} }
translate(error, argv); translate(error, argv);
if (Driver.logDebug)
Driver.debug("Exception: " + this);
} }
/* /*
@ -94,6 +103,8 @@ public class PSQLException extends SQLException
argv[0] = arg1; argv[0] = arg1;
argv[1] = arg2; argv[1] = arg2;
translate(error, argv); translate(error, argv);
if (Driver.logDebug)
Driver.debug("Exception: " + this);
} }
private void translate(String error, Object[] args) private void translate(String error, Object[] args)