Applied patch submitted by Kris Jurka to result in a better error message

under some circumstances and handle negative money values better.

 Modified Files:
 	jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
index 878502410aca0e74feebd9c4fccdc2a65d4cd391..4a835f213f71aec3df2dcf1429d60650b35be2fa 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
@@ -646,6 +646,10 @@ public abstract class AbstractJdbc1ResultSet
                if (wasNullFlag)
                        return null;
 
+               // if we don't have at least 2 characters it can't be money.
+               if (s.length() < 2)
+                       return s;
+
                // Handle Money
                if (s.charAt(0) == '(')
                {
@@ -655,6 +659,10 @@ public abstract class AbstractJdbc1ResultSet
                {
                        s = s.substring(1);
                }
+               else if (s.charAt(0) == '-' && s.charAt(1) == '$')
+               {
+                       s = "-" + s.substring(2);
+               }
 
                return s;
        }