postgresql-jdbc.git / summary / log / commit / refs

commit    e3c8b4cd80726c64bf00fd65069acb17e2c5f9ef
Author:   Dave Cramer <davec@fastcrypt.com>
Date:     Mon May 07 13:10:34 2007 +0000

    added a CallableStatement handler to batch handling to ignore multiple results


 org/postgresql/jdbc2/AbstractJdbc2Statement.java | 78 +++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 3 deletions(-)

diff --git a/org/postgresql/jdbc2/AbstractJdbc2Statement.java b/org/postgresql/jdbc2/AbstractJdbc2Statement.java
index a6e60f39..f29fd063 100644
--- a/org/postgresql/jdbc2/AbstractJdbc2Statement.java
+++ b/org/postgresql/jdbc2/AbstractJdbc2Statement.java
@@ -3,7 +3,7 @@
 * Copyright (c) 2004-2005, PostgreSQL Global Development Group
 *
 * IDENTIFICATION
-*   $PostgreSQL: pgjdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java,v 1.98 2007/02/19 06:00:24 jurka Exp $
+*   $PostgreSQL: pgjdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java,v 1.99 2007/03/29 04:27:52 jurka Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -2541,13 +2541,79 @@ public abstract class AbstractJdbc2Statement implements BaseStatement
                 throw batchException;
         }
     }
+    private class CallableBatchResultHandler implements ResultHandler {
+        private BatchUpdateException batchException = null;
+        private int resultIndex = 0;
+
+        private final Query[] queries;
+        private final ParameterList[] parameterLists;
+        private final int[] updateCounts;
+
+        CallableBatchResultHandler(Query[] queries, ParameterList[] parameterLists, int[] updateCounts) {
+            this.queries = queries;
+            this.parameterLists = parameterLists;
+            this.updateCounts = updateCounts;
+        }
+
+        public void handleResultRows(Query fromQuery, Field[] fields, Vector tuples, ResultCursor cursor) 
+        {
+            
+        }
+
+        public void handleCommandStatus(String status, int updateCount, long insertOID) {
+            if (resultIndex >= updateCounts.length)
+            {
+                handleError(new PSQLException(GT.tr("Too many update results were returned."),
+                                              PSQLState.TOO_MANY_RESULTS));
+                return ;
+            }
+
+            updateCounts[resultIndex++] = updateCount;
+        }
+
+        public void handleWarning(SQLWarning warning) {
+            AbstractJdbc2Statement.this.addWarning(warning);
+        }
+
+        public void handleError(SQLException newError) {
+            if (batchException == null)
+            {
+                int[] successCounts;
+
+                if (resultIndex >= updateCounts.length)
+                    successCounts = updateCounts;
+                else
+                {
+                    successCounts = new int[resultIndex];
+                    System.arraycopy(updateCounts, 0, successCounts, 0, resultIndex);
+                }
+
+                String queryString = "<unknown>";
+                if (resultIndex < queries.length)
+                    queryString = queries[resultIndex].toString(parameterLists[resultIndex]);
+
+                batchException = new BatchUpdateException(GT.tr("Batch entry {0} {1} was aborted.  Call getNextException to see the cause.",
+                                 new Object[]{ new Integer(resultIndex),
+                                               queryString}),
+                                 successCounts);
+            }
+
+            batchException.setNextException(newError);
+        }
 
+        public void handleCompletion() throws SQLException {
+            if (batchException != null)
+                throw batchException;
+        }
+    }
+
+    
     public int[] executeBatch() throws SQLException
     {
         checkClosed();
 
         // Every statement execution clears any previous warnings.
-	clearWarnings();
+        clearWarnings();
 
         if (batchStatements == null || batchStatements.isEmpty())
             return new int[0];
@@ -2565,7 +2631,9 @@ public abstract class AbstractJdbc2Statement implements BaseStatement
         while (firstUnclosedResult != null)
         {
             if (firstUnclosedResult.getResultSet() != null)
+            {
                 firstUnclosedResult.getResultSet().close();
+            }
             firstUnclosedResult = firstUnclosedResult.getNext();
         }
 
@@ -2588,7 +2656,11 @@ public abstract class AbstractJdbc2Statement implements BaseStatement
             flags |= QueryExecutor.QUERY_SUPPRESS_BEGIN;
 
         result = null;
-        BatchResultHandler handler = new BatchResultHandler(queries, parameterLists, updateCounts);
+        
+        ResultHandler handler = isFunction 
+                            ? new CallableBatchResultHandler(queries, parameterLists, updateCounts )
+                            : new BatchResultHandler(queries, parameterLists, updateCounts);
+        
         connection.getQueryExecutor().execute(queries,
                                               parameterLists,
                                               handler,


[parent: dbb8fb934314]