Some more including the patch to DatabaseMetaData backed out by Bruce.

Tue Feb 13 16:33:00 GMT 2001 peter@retep.org.uk
        - More TestCases implemented. Refined the test suite api's.
        - Removed need for SimpleDateFormat in ResultSet.getDate() improving
          performance.
        - Rewrote ResultSet.getTime() so that it uses JDK api's better.

Tue Feb 13 10:25:00 GMT 2001 peter@retep.org.uk
        - Added MiscTest to hold reported problems from users.
        - Fixed PGMoney.
        - JBuilder4/JDBCExplorer now works with Money fields. Patched Field &
          ResultSet (lots of methods) for this one. Also changed cash/money to
          return type DOUBLE not DECIMAL. This broke JBuilder as zero scale
          BigDecimal's can't have decimal places!
        - When a Statement is reused, the previous ResultSet is now closed.
        - Removed deprecated call in ResultSet.getTime()

Thu Feb 08 18:53:00 GMT 2001 peter@retep.org.uk
        - Changed a couple of settings in DatabaseMetaData where 7.1 now
          supports those features
        - Implemented the DatabaseMetaData TestCase.

Wed Feb 07 18:06:00 GMT 2001 peter@retep.org.uk
        - Added comment to Connection.isClosed() explaining why we deviate from
          the JDBC2 specification.
        - Fixed bug where the Isolation Level is lost while in autocommit mode.
        - Fixed bug where several calls to getTransactionIsolationLevel()
          returned the first call's result.

Author: Peter Mount

src/interfaces/jdbc/CHANGELOG

@@ -1,3 +1,31 @@
+Tue Feb 13 16:33:00 GMT 2001 peter@retep.org.uk
+        - More TestCases implemented. Refined the test suite api's.
+        - Removed need for SimpleDateFormat in ResultSet.getDate() improving
+          performance.
+        - Rewrote ResultSet.getTime() so that it uses JDK api's better.
+
+Tue Feb 13 10:25:00 GMT 2001 peter@retep.org.uk
+        - Added MiscTest to hold reported problems from users.
+        - Fixed PGMoney.
+        - JBuilder4/JDBCExplorer now works with Money fields. Patched Field &
+          ResultSet (lots of methods) for this one. Also changed cash/money to
+          return type DOUBLE not DECIMAL. This broke JBuilder as zero scale
+          BigDecimal's can't have decimal places!
+        - When a Statement is reused, the previous ResultSet is now closed.
+        - Removed deprecated call in ResultSet.getTime()
+
+Thu Feb 08 18:53:00 GMT 2001 peter@retep.org.uk
+        - Changed a couple of settings in DatabaseMetaData where 7.1 now
+          supports those features
+        - Implemented the DatabaseMetaData TestCase.
+
+Wed Feb 07 18:06:00 GMT 2001 peter@retep.org.uk
+        - Added comment to Connection.isClosed() explaining why we deviate from
+          the JDBC2 specification.
+        - Fixed bug where the Isolation Level is lost while in autocommit mode.
+        - Fixed bug where several calls to getTransactionIsolationLevel()
+          returned the first call's result.
+
 Tue Feb 06 19:00:00 GMT 2001 peter@retep.org.uk
         - Completed first two TestCase's for the test suite. JUnit is now
           recognised by ant.

src/interfaces/jdbc/org/postgresql/Field.java

@@ -16,12 +16,12 @@ public class Field
   public int oid;		// OID of the type
   public int mod;		// type modifier of this field
   public String name;		// Name of this field
-  
+
   protected Connection conn;	// Connection Instantation
-  
+
   public int sql_type = -1;	// The entry in java.sql.Types for this field
   public String type_name = null;// The sql type name
-  
+
   /**
    * Construct a field based on the information fed to it.
    *
@@ -38,7 +38,7 @@ public Field(Connection conn, String name, int oid, int length,int mod)
     this.length = length;
     this.mod = mod;
   }
-  
+
     /**
      * Constructor without mod parameter.
      *
@@ -51,15 +51,15 @@ public Field(Connection conn, String name, int oid, int length)
     {
 	this(conn,name,oid,length,0);
     }
-    
+
   /**
    * @return the oid of this Field's data type
    */
   public int getOID()
   {
     return oid;
   }
-  
+
   /**
    * the ResultSet and ResultMetaData both need to handle the SQL
    * type, which is gained from another query.  Note that we cannot
@@ -72,7 +72,7 @@ public int getSQLType() throws SQLException
   {
     if(sql_type == -1) {
       type_name = (String)conn.fieldCache.get(new Integer(oid));
-      
+
       // it's not in the cache, so perform a query, and add the result to
       // the cache
       if(type_name==null) {
@@ -84,12 +84,12 @@ public int getSQLType() throws SQLException
 	conn.fieldCache.put(new Integer(oid),type_name);
 	result.close();
       }
-      
+
       sql_type = getSQLType(type_name);
     }
     return sql_type;
   }
-  
+
   /**
    * This returns the SQL type. It is called by the Field and DatabaseMetaData classes
    * @param type_name PostgreSQL type name
@@ -103,7 +103,7 @@ public static int getSQLType(String type_name)
 	sql_type=typei[i];
     return sql_type;
   }
-  
+
   /**
    * This table holds the org.postgresql names for the types supported.
    * Any types that map to Types.OTHER (eg POINT) don't go into this table.
@@ -128,7 +128,7 @@ public static int getSQLType(String type_name)
     "time",
     "abstime","timestamp"
   };
-  
+
   /**
    * This table holds the JDBC type for each entry above.
    *
@@ -140,7 +140,7 @@ public static int getSQLType(String type_name)
     Types.SMALLINT,
     Types.INTEGER,Types.INTEGER,
     Types.BIGINT,
-    Types.DECIMAL,Types.DECIMAL,
+    Types.DOUBLE,Types.DOUBLE,
     Types.NUMERIC,
     Types.REAL,
     Types.DOUBLE,
@@ -151,7 +151,7 @@ public static int getSQLType(String type_name)
     Types.TIME,
     Types.TIMESTAMP,Types.TIMESTAMP
   };
-  
+
   /**
    * We also need to get the type name as returned by the back end.
    * This is held in type_name AFTER a call to getSQLType.  Since

src/interfaces/jdbc/org/postgresql/ResultSet.java

@@ -25,11 +25,11 @@ public abstract class ResultSet
   protected Connection connection;	// the connection which we returned from
   protected SQLWarning warnings = null;	// The warning chain
   protected boolean wasNullFlag = false;	// the flag for wasNull()
-  
+
   //  We can chain multiple resultSets together - this points to
   // next resultSet in the chain.
   protected ResultSet next = null;
-  
+
   /**
    * Create a new ResultSet - Note that we create ResultSets to
    * represent the results of everything.
@@ -52,8 +52,8 @@ public ResultSet(Connection conn, Field[] fields, Vector tuples, String status,
     this.this_row = null;
     this.current_row = -1;
   }
-    
-  
+
+
   /**
    * Create a new ResultSet - Note that we create ResultSets to
    * represent the results of everything.
@@ -69,7 +69,7 @@ public ResultSet(Connection conn, Field[] fields, Vector tuples, String status,
   {
       this(conn,fields,tuples,status,updateCount,0);
   }
-    
+
   /**
    * We at times need to know if the resultSet we are working
    * with is the result of an UPDATE, DELETE or INSERT (in which
@@ -83,7 +83,7 @@ public boolean reallyResultSet()
   {
     return (fields != null);
   }
-  
+
   /**
    * Since ResultSets can be chained, we need some method of
    * finding the next one in the chain.  The method getNext()
@@ -95,7 +95,7 @@ public java.sql.ResultSet getNext()
   {
     return (java.sql.ResultSet)next;
   }
-  
+
   /**
    * This following method allows us to add a ResultSet object
    * to the end of the current chain.
@@ -109,7 +109,7 @@ public void append(ResultSet r)
     else
       next.append(r);
   }
-  
+
   /**
    * If we are just a place holder for results, we still need
    * to get an updateCount.  This method returns it.
@@ -120,7 +120,7 @@ public int getResultCount()
   {
     return updateCount;
   }
-  
+
   /**
    * We also need to provide a couple of auxiliary functions for
    * the implementation of the ResultMetaData functions.  In
@@ -133,7 +133,7 @@ public int getTupleCount()
   {
     return rows.size();
   }
-  
+
   /**
    * getColumnCount returns the number of columns
    *
@@ -143,7 +143,7 @@ public int getColumnCount()
   {
     return fields.length;
   }
-   
+
    /**
     * Returns the status message from the backend.<p>
     * It is used internally by the driver.
@@ -154,7 +154,7 @@ public String getStatusString()
    {
      return status;
    }
-   
+
    /**
     * returns the OID of a field.<p>
     * It is used internally by the driver.
@@ -166,20 +166,44 @@ public int getColumnOID(int field)
    {
      return fields[field-1].getOID();
    }
-  
+
     /**
      * returns the OID of the last inserted row
      */
     public int getInsertedOID()
     {
 	return insertOID;
     }
-    
+
     /**
      * This is part of the JDBC API, but is required by org.postgresql.Field
      */
     public abstract void close() throws SQLException;
     public abstract boolean next() throws SQLException;
     public abstract String getString(int i) throws SQLException;
+
+    /**
+     * This is used to fix get*() methods on Money fields. It should only be
+     * used by those methods!
+     *
+     * It converts ($##.##) to -##.## and $##.## to ##.##
+     */
+    public String getFixedString(int col) throws SQLException {
+      String s = getString(col);
+
+      // Handle SQL Null
+      if(s==null)
+        return null;
+
+      // Handle Money
+      if(s.charAt(0)=='(') {
+        s="-"+org.postgresql.util.PGtokenizer.removePara(s).substring(1);
+      }
+      if(s.charAt(0)=='$') {
+        s=s.substring(1);
+      }
+
+      return s;
+    }
 }