? build.local.properties
? logmoretypeinfo.patch
Index: org/postgresql/core/v3/QueryExecutorImpl.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/core/v3/QueryExecutorImpl.java,v
retrieving revision 1.35
diff -c -r1.35 QueryExecutorImpl.java
*** org/postgresql/core/v3/QueryExecutorImpl.java	27 Jul 2007 10:15:29 -0000	1.35
--- org/postgresql/core/v3/QueryExecutorImpl.java	20 Sep 2007 17:13:22 -0000
***************
*** 904,910 ****
  
          if (logger.logDebug())
          {
!             logger.debug(" FE=> Describe(statement=" + query.getStatementName()+")");
          }
  
          byte[] encodedStatementName = query.getEncodedStatementName();
--- 904,915 ----
  
          if (logger.logDebug())
          {
!             StringBuffer buf = new StringBuffer(" FE=> Describe(statement=" + query.getStatementName()+") param types =");
!             int oids[] = params.getTypeOIDs();
!             for (int i=0; i<oids.length; i++) {
!                 buf.append(" ").append(oids[i]);
!             }
!             logger.debug(buf.toString());
          }
  
          byte[] encodedStatementName = query.getEncodedStatementName();
***************
*** 1185,1193 ****
              case 't':    // ParameterDescription
                  pgStream.ReceiveInteger4(); // len, discarded
  
-                 if (logger.logDebug())
-                     logger.debug(" <=BE ParameterDescription");
- 
                  {
                      Object describeData[] = (Object[])pendingDescribeStatementQueue.get(describeIndex);
                      SimpleQuery query = (SimpleQuery)describeData[0];
--- 1190,1195 ----
***************
*** 1195,1204 ****
                      boolean describeOnly = ((Boolean)describeData[2]).booleanValue();
  
                      int numParams = pgStream.ReceiveInteger2();
!                     for (int i=1; i<=numParams; i++) {
!                         int typeOid = pgStream.ReceiveInteger4();
!                         params.setResolvedType(i, typeOid);
                      }
                      query.setStatementTypes((int[])params.getTypeOIDs().clone());
  
                      if (describeOnly)
--- 1197,1233 ----
                      boolean describeOnly = ((Boolean)describeData[2]).booleanValue();
  
                      int numParams = pgStream.ReceiveInteger2();
!                     int typeOids[] = new int[numParams];
!                     for (int i=0; i<numParams; i++) {
!                         typeOids[i] = pgStream.ReceiveInteger4();
!                     }
! 
!                     if (logger.logDebug()) {
!                         StringBuffer buf = new StringBuffer(" <=BE ParameterDescription");
!                         for (int i=0; i<typeOids.length; i++) {
!                             buf.append(" ").append(typeOids[i]);
!                         }
!                         logger.debug(buf.toString());
                      }
+ 
+                     int origTypeOids[] = (int[])params.getTypeOIDs().clone();
+ 
+                     for (int i=0; i<numParams; i++) {
+                         if (!params.setResolvedType(i+1, typeOids[i])) {
+                             StringBuffer buf = new StringBuffer("Can't change resolved type for parameter: ");
+                             buf.append(i+1).append(" ");
+                             buf.append("Orig types: ");
+                             for (int j=0; j<origTypeOids.length; j++) {
+                                 buf.append(origTypeOids[j]).append(" ");
+                             }
+                             buf.append("New Types: ");
+                             for (int j=0; j<typeOids.length; j++) {
+                                 buf.append(typeOids[j]).append(" ");
+                             }
+                             throw new IllegalArgumentException(buf.toString());
+                         }
+                     }
+ 
                      query.setStatementTypes((int[])params.getTypeOIDs().clone());
  
                      if (describeOnly)
Index: org/postgresql/core/v3/SimpleParameterList.java
===================================================================
RCS file: /usr/local/cvsroot/pgjdbc/pgjdbc/org/postgresql/core/v3/SimpleParameterList.java,v
retrieving revision 1.14
diff -c -r1.14 SimpleParameterList.java
*** org/postgresql/core/v3/SimpleParameterList.java	13 Jun 2007 07:25:01 -0000	1.14
--- org/postgresql/core/v3/SimpleParameterList.java	20 Sep 2007 17:13:22 -0000
***************
*** 188,200 ****
          return false;
      }
  
!     void setResolvedType(int index, int oid) {
          // only allow overwriting an unknown value
          if (paramTypes[index-1] == Oid.UNSPECIFIED) {
              paramTypes[index-1] = oid;
          } else if (paramTypes[index-1] != oid) {
!             throw new IllegalArgumentException("Can't change resolved type for param: " + index + " from " + paramTypes[index-1] + " to " + oid);
          }
      }
  
      boolean isNull(int index) {
--- 188,201 ----
          return false;
      }
  
!     boolean setResolvedType(int index, int oid) {
          // only allow overwriting an unknown value
          if (paramTypes[index-1] == Oid.UNSPECIFIED) {
              paramTypes[index-1] = oid;
          } else if (paramTypes[index-1] != oid) {
!             return false;
          }
+         return true;
      }
  
      boolean isNull(int index) {