Small jdbc patch from Kim Ho at RedHat to fix some boolean problems

Barry Lind · Barry Lind · commit 7da6afef26a1 · 2003-09-18T04:09:02.000Z
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
@@ -9,7 +9,7 @@
  * Copyright (c) 2003, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.19 2003/09/17 07:00:24 barry Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.20 2003/09/18 04:09:02 barry Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -798,7 +798,18 @@ public static boolean toBoolean(String s)
 		if (s != null)
 		{
 			s = s.trim();
-			return (s.equalsIgnoreCase("true") || s.equals("1") || s.equalsIgnoreCase("t"));
+
+			if (s.equalsIgnoreCase("true") || s.equalsIgnoreCase("t"))
+				return true;
+
+			try
+			{
+				if (Double.parseDouble(s)==1)
+					return true;
+			}
+			catch (NumberFormatException e)
+			{
+			}
 		}
 		return false;		// SQL NULL
 	}

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* Copyright (c) 2003, PostgreSQL Global Development Group`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.19 2003/09/17 07:00:24 barry Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1ResultSet.java,v 1.20 2003/09/18 04:09:02 barry Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -798,7 +798,18 @@ public static boolean toBoolean(String s)`
`798`	`798`	`if (s != null)`
`799`	`799`	`{`
`800`	`800`	`s = s.trim();`
`801`		`- return (s.equalsIgnoreCase("true") \|\| s.equals("1") \|\| s.equalsIgnoreCase("t"));`
	`801`	`+`
	`802`	`+ if (s.equalsIgnoreCase("true") \|\| s.equalsIgnoreCase("t"))`
	`803`	`+ return true;`
	`804`	`+`
	`805`	`+ try`
	`806`	`+ {`
	`807`	`+ if (Double.parseDouble(s)==1)`
	`808`	`+ return true;`
	`809`	`+ }`
	`810`	`+ catch (NumberFormatException e)`
	`811`	`+ {`
	`812`	`+ }`
`802`	`813`	`}`
`803`	`814`	`return false; // SQL NULL`
`804`	`815`	`}`