Index: src/interfaces/jdbc/org/postgresql/errors.properties
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/errors.properties,v
retrieving revision 1.6
diff -c -r1.6 errors.properties
*** src/interfaces/jdbc/org/postgresql/errors.properties	2001/08/21 00:37:23	1.6
--- src/interfaces/jdbc/org/postgresql/errors.properties	2001/08/26 18:20:15
***************
*** 61,67 ****
  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.empty:The batch is empty. There is nothing to execute.
  postgresql.stat.batch.error:Batch entry {0} {1} was aborted.
  postgresql.stat.maxfieldsize:An attempt to setMaxFieldSize() failed - compile time default in force.
  postgresql.stat.noresult:No results were returned by the query.
--- 61,66 ----
Index: src/interfaces/jdbc/org/postgresql/errors_de.properties
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/errors_de.properties,v
retrieving revision 1.1
diff -c -r1.1 errors_de.properties
*** src/interfaces/jdbc/org/postgresql/errors_de.properties	2001/07/09 20:25:44	1.1
--- src/interfaces/jdbc/org/postgresql/errors_de.properties	2001/08/26 18:20:15
***************
*** 65,71 ****
  postgresql.serial.noclass:Keine Klasse für Typ »{0}« gefunden
  postgresql.serial.table:Keine Tabelle für Typ »{0}« in der Datenbank gefunden. Die Datenbank ist in einem unbeständigen Zustand.
  postgresql.serial.underscore:Zu serialisierende Klassennamen dürfen keine Unterstriche (_) enthälten. Der angegebene Name war »{0}«.
- postgresql.stat.batch.empty:Der Anweisungs-Batch ist leer.
  postgresql.stat.batch.error:Batch-Anweisung Nummer {0} ({1}) wurde abgebrochen.
  postgresql.stat.maxfieldsize:setMaxFieldSize() is nicht möglich; die Grenze ist fest eingebaut.
  postgresql.stat.noresult:Die Abfrage ergab kein Ergebnis.
--- 65,70 ----
Index: src/interfaces/jdbc/org/postgresql/errors_it.properties
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/errors_it.properties,v
retrieving revision 1.1
diff -c -r1.1 errors_it.properties
*** src/interfaces/jdbc/org/postgresql/errors_it.properties	2000/10/12 08:55:24	1.1
--- src/interfaces/jdbc/org/postgresql/errors_it.properties	2001/08/26 18:20:15
***************
*** 60,66 ****
  postgresql.serial.noclass:Nessuna classe trovata per {0}.
  postgresql.serial.table:La tabella per {0} non è nel database. Contattare il DBA, visto che il database è in uno stato incosistente.
  postgresql.serial.underscore:Il nome di una classe non può contenere il carattere ``_''. E` stato fornito {0}.
- postgresql.stat.batch.empty:La sequenza di operazioni è vuota. Non c'è niente da eseguire.
  postgresql.stat.batch.error:L'operazione {0} {1} della sequenza è stata annullata.
  postgresql.stat.maxfieldsize:Fallito un tentativo a setMaxFieldSize() - verrà utilizzato il valore predefinito a tempo di compilazione.
  postgresql.stat.noresult:Nessun risultato è stato restituito dalla query.
--- 60,65 ----
Index: src/interfaces/jdbc/org/postgresql/errors_nl.properties
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/errors_nl.properties,v
retrieving revision 1.1
diff -c -r1.1 errors_nl.properties
*** src/interfaces/jdbc/org/postgresql/errors_nl.properties	2000/04/26 05:39:32	1.1
--- src/interfaces/jdbc/org/postgresql/errors_nl.properties	2001/08/26 18:20:15
***************
*** 54,60 ****
  postgresql.serial.noclass:Geen class gevonden voor {0}.

  postgresql.serial.table:De tabel voor {0} is niet in de database. Neem contact op met de DBA, omdat de database in een inconsistente staat verkeert.

  postgresql.serial.underscore:Class namen mogen geen _ in zich hebben. Jij voerde {0} in.

- postgresql.stat.batch.empty:De batch is leeg. Er is niets om uit te voeren.

  postgresql.stat.batch.error:Batch invoer {0} {1} werd afgebroken.

  postgresql.stat.maxfieldsize:Een poging om setMaxFieldSize() faalde - compiletime standaardwaarde van kracht.

  postgresql.stat.noresult:Geen resultaten werden teruggegeven door de query.

--- 54,59 ----
Index: src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java,v
retrieving revision 1.31
diff -c -r1.31 DatabaseMetaData.java
*** src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java	2001/08/24 16:50:17	1.31
--- src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java	2001/08/26 18:20:15
***************
*** 2836,2842 ****
      }
  
      /**
!      * New in 7.1 - If this is for PreparedStatement yes, ResultSet no
       */
      public boolean supportsBatchUpdates() throws SQLException
      {
--- 2836,2842 ----
      }
  
      /**
!      * Indicates whether the driver supports batch updates.
       */
      public boolean supportsBatchUpdates() throws SQLException
      {
Index: src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java,v
retrieving revision 1.11
diff -c -r1.11 Statement.java
*** src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java	2001/08/10 14:42:07	1.11
--- src/interfaces/jdbc/org/postgresql/jdbc2/Statement.java	2001/08/26 18:20:17
***************
*** 179,198 ****
  
      public int[] executeBatch() throws SQLException
      {
! 	if(batch==null || batch.isEmpty())
! 	    throw new PSQLException("postgresql.stat.batch.empty");
! 
  	int size=batch.size();
  	int[] result=new int[size];
  	int i=0;
- 	this.execute("begin"); // PTM: check this when autoCommit is false
  	try {
  	    for(i=0;i<size;i++)
  		result[i]=this.executeUpdate((String)batch.elementAt(i));
- 	    this.execute("commit"); // PTM: check this
  	} catch(SQLException e) {
! 	    this.execute("abort"); // PTM: check this
! 	    throw new PSQLException("postgresql.stat.batch.error",new Integer(i),batch.elementAt(i));
  	}
  	return result;
      }
--- 179,204 ----
  
      public int[] executeBatch() throws SQLException
      {
! 	if(batch==null)
! 	    batch=new Vector();
  	int size=batch.size();
  	int[] result=new int[size];
  	int i=0;
  	try {
  	    for(i=0;i<size;i++)
  		result[i]=this.executeUpdate((String)batch.elementAt(i));
  	} catch(SQLException e) {
! 		int[] resultSucceeded = new int[i];
! 		System.arraycopy(result,0,resultSucceeded,0,i);
! 
! 		PBatchUpdateException updex =
! 			new PBatchUpdateException("postgresql.stat.batch.error",
! 			    new Integer(i), batch.elementAt(i), resultSucceeded);
! 		updex.setNextException(e);
! 
! 		throw updex;
! 	} finally {
! 	    batch.removeAllElements();
  	}
  	return result;
      }
Index: src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java,v
retrieving revision 1.4
diff -c -r1.4 JDBC2Tests.java
*** src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java	2001/07/21 18:52:11	1.4
--- src/interfaces/jdbc/org/postgresql/test/JDBC2Tests.java	2001/08/26 18:20:17
***************
*** 205,210 ****
--- 205,214 ----
      suite.addTestSuite(TimestampTest.class);
  
      // PreparedStatement
+     suite.addTestSuite(BatchExecuteTest.class);
+ 
+ 	// BatchExecute
+ 
  
      // MetaData
  
Index: src/interfaces/jdbc/org/postgresql/util/PSQLException.java
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/util/PSQLException.java,v
retrieving revision 1.4
diff -c -r1.4 PSQLException.java
*** src/interfaces/jdbc/org/postgresql/util/PSQLException.java	2001/01/25 09:16:36	1.4
--- src/interfaces/jdbc/org/postgresql/util/PSQLException.java	2001/08/26 18:20:17
***************
*** 2,9 ****
  
  import java.io.*;
  import java.sql.*;
- import java.text.*;
- import java.util.*;
  
  /**
   * This class extends SQLException, and provides our internationalisation handling
--- 2,7 ----
***************
*** 12,20 ****
  {
      private String message;
  
-     // Cache for future errors
-     static ResourceBundle bundle;
- 
      /**
       * This provides the same functionality to SQLException
       * @param error Error string
--- 10,15 ----
***************
*** 86,122 ****
  	translate(error,argv);
      }
  
!     /**
!      * This does the actual translation
!      */
!     private void translate(String id,Object[] args)
!     {
! 	if(bundle == null) {
! 	    try {
! 		bundle = ResourceBundle.getBundle("org.postgresql.errors");
! 	    } catch(MissingResourceException e) {
!                 // translation files have not been installed.
!                 message = id;
! 	    }
  	}
  
-         if (bundle != null) {
- 	// Now look up a localized message. If one is not found, then use
- 	// the supplied message instead.
- 	    message = null;
- 	    try {
- 	        message = bundle.getString(id);
- 	    } catch(MissingResourceException e) {
- 	        message = id;
- 	    }
-         }
- 
- 	// Expand any arguments
- 	if(args!=null && message != null)
- 	    message = MessageFormat.format(message,args);
- 
-     }
- 
      /**
       * Overides Throwable
       */
--- 81,90 ----
  	translate(error,argv);
      }
  
! 	private void translate(String error, Object[] args) {
! 		message = MessageTranslator.translate(error,args);
  	}
  
      /**
       * Overides Throwable
       */
***************
*** 140,144 ****
      {
  	return message;
      }
- 
  }
--- 108,111 ----