diff options
author | Barry Lind <barry@xythos.com> | 2002-10-19 22:10:36 +0000 |
---|---|---|
committer | Barry Lind <barry@xythos.com> | 2002-10-19 22:10:36 +0000 |
commit | 30c2b5ec7212c7b6881a7a25ca604ffe5229059d (patch) | |
tree | 903ef7270db47d0c47d701c50306a1b602bba580 /src | |
parent | 78b13fee45a499f65a0769fa8f0cc1d5a1fdb550 (diff) | |
download | postgresql-30c2b5ec7212c7b6881a7a25ca604ffe5229059d.tar.gz postgresql-30c2b5ec7212c7b6881a7a25ca604ffe5229059d.zip |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java index c415e55da55..f75ab70d16c 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java @@ -13,7 +13,7 @@ import org.postgresql.largeobject.*; import org.postgresql.util.PGbytea; import org.postgresql.util.PSQLException; -/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.6 2002/09/06 21:23:06 momjian Exp $ +/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.7 2002/10/19 22:10:36 barry Exp $ * This class defines methods of the jdbc1 specification. This class is * extended by org.postgresql.jdbc2.AbstractJdbc2ResultSet which adds the jdbc2 * methods. The real ResultSet class (for jdbc1) is org.postgresql.jdbc1.Jdbc1ResultSet @@ -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; } |