Applied patch from Kim Ho at redhat to improve boolean and bit handling

Barry Lind · Barry Lind · commit 0671b65b8188 · 2003-09-17T05:07:38.000Z
in the jdbc driver

 Modified Files:
 	jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
 	jdbc/org/postgresql/jdbc3/AbstractJdbc3Statement.java
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
@@ -26,7 +26,7 @@
 import java.sql.Types;
 import java.util.Vector;
 
-/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Statement.java,v 1.36 2003/09/13 04:02:15 barry Exp $
+/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Statement.java,v 1.37 2003/09/17 05:07:37 barry Exp $
  * This class defines methods of the jdbc1 specification.  This class is
  * extended by org.postgresql.jdbc2.AbstractJdbc2Statement which adds the jdbc2
  * methods.  The real Statement class (for jdbc1) is org.postgresql.jdbc1.Jdbc1Statement
@@ -917,7 +917,7 @@ public void setNull(int parameterIndex, int sqlType) throws SQLException
 	 */
 	public void setBoolean(int parameterIndex, boolean x) throws SQLException
 	{
-		bind(parameterIndex, x ? "'t'" : "'f'", PG_BOOLEAN);
+		bind(parameterIndex, x ? "'1'" : "'0'", PG_BOOLEAN);
 	}
 
 	/*
@@ -1551,11 +1551,15 @@ else if (x instanceof Integer || x instanceof Long ||
 			case Types.BIT:
 				if (x instanceof Boolean)
 				{
-					bind(parameterIndex, ((Boolean)x).booleanValue() ? "TRUE" : "FALSE", PG_TEXT);
+					bind(parameterIndex, ((Boolean)x).booleanValue() ? "'1'" : "'0'", PG_BOOLEAN);
+				}
+				else if (x instanceof String)
+				{
+					bind(parameterIndex, Boolean.valueOf(x.toString()).booleanValue() ? "'1'" : "'0'", PG_BOOLEAN);
 				}
 				else if (x instanceof Number)
 				{
-					bind(parameterIndex, ((Number)x).intValue()==1 ? "TRUE" : "FALSE", PG_TEXT);
+					bind(parameterIndex, ((Number)x).intValue()==1 ? "'1'" : "'0'", PG_BOOLEAN);
 				}
 				else
 				{
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc3/AbstractJdbc3Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc3/AbstractJdbc3Statement.java
@@ -5,7 +5,7 @@
 import java.sql.*;
 import java.util.Calendar;
 
-/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc3/Attic/AbstractJdbc3Statement.java,v 1.2 2002/09/06 21:23:06 momjian Exp $
+/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc3/Attic/AbstractJdbc3Statement.java,v 1.3 2003/09/17 05:07:38 barry Exp $
  * This class defines methods of the jdbc3 specification.  This class extends
  * org.postgresql.jdbc2.AbstractJdbc2Statement which provides the jdbc2
  * methods.  The real Statement class (for jdbc2) is org.postgresql.jdbc3.Jdbc3Statement
@@ -1359,5 +1359,16 @@ public java.net.URL getURL(String parameterName) throws SQLException
 	{
 		throw org.postgresql.Driver.notImplemented();
 	}
+	
+	public void setObject(int parameterIndex, Object x, int targetSqlType, int scale) throws SQLException
+	{
+		switch (targetSqlType)
+		{
+			case Types.BOOLEAN:
+				super.setObject(parameterIndex, x, Types.BIT, scale);
+			default:
+				super.setObject(parameterIndex, x, targetSqlType, scale);
+		}
+	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`import java.sql.Types;`
`27`	`27`	`import java.util.Vector;`
`28`	`28`
`29`		`-/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Statement.java,v 1.36 2003/09/13 04:02:15 barry Exp $`
	`29`	`+/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Statement.java,v 1.37 2003/09/17 05:07:37 barry Exp $`
`30`	`30`	`* This class defines methods of the jdbc1 specification. This class is`
`31`	`31`	`* extended by org.postgresql.jdbc2.AbstractJdbc2Statement which adds the jdbc2`
`32`	`32`	`* methods. The real Statement class (for jdbc1) is org.postgresql.jdbc1.Jdbc1Statement`
`@@ -917,7 +917,7 @@ public void setNull(int parameterIndex, int sqlType) throws SQLException`
`917`	`917`	`*/`
`918`	`918`	`public void setBoolean(int parameterIndex, boolean x) throws SQLException`
`919`	`919`	`{`
`920`		`- bind(parameterIndex, x ? "'t'" : "'f'", PG_BOOLEAN);`
	`920`	`+ bind(parameterIndex, x ? "'1'" : "'0'", PG_BOOLEAN);`
`921`	`921`	`}`
`922`	`922`
`923`	`923`	`/*`
`@@ -1551,11 +1551,15 @@ else if (x instanceof Integer \|\| x instanceof Long \|\|`
`1551`	`1551`	`case Types.BIT:`
`1552`	`1552`	`if (x instanceof Boolean)`
`1553`	`1553`	`{`
`1554`		`- bind(parameterIndex, ((Boolean)x).booleanValue() ? "TRUE" : "FALSE", PG_TEXT);`
	`1554`	`+ bind(parameterIndex, ((Boolean)x).booleanValue() ? "'1'" : "'0'", PG_BOOLEAN);`
	`1555`	`+ }`
	`1556`	`+ else if (x instanceof String)`
	`1557`	`+ {`
	`1558`	`+ bind(parameterIndex, Boolean.valueOf(x.toString()).booleanValue() ? "'1'" : "'0'", PG_BOOLEAN);`
`1555`	`1559`	`}`
`1556`	`1560`	`else if (x instanceof Number)`
`1557`	`1561`	`{`
`1558`		`- bind(parameterIndex, ((Number)x).intValue()==1 ? "TRUE" : "FALSE", PG_TEXT);`
	`1562`	`+ bind(parameterIndex, ((Number)x).intValue()==1 ? "'1'" : "'0'", PG_BOOLEAN);`
`1559`	`1563`	`}`
`1560`	`1564`	`else`
`1561`	`1565`	`{`