fix: binary decoding of bool values (#2640)

* fix: binary decoding of bool values * fix: PreparedStatementTest + code formatting * fix: simple mode will always use text
pgjdbc · Oct 12, 2022 · 56a487c · 56a487c
1 parent b738991
commit 56a487c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
@@ -2297,7 +2297,7 @@ public boolean getBoolean(@Positive int columnIndex) throws SQLException {
     int col = columnIndex - 1;
     if (Oid.BOOL == fields[col].getOID()) {
       final byte[] v = value;
-      return (1 == v.length) && (116 == v[0]); // 116 = 't'
+      return (1 == v.length) && ((116 == v[0] && !isBinary(columnIndex)) || (1 == v[0] && isBinary(columnIndex))); // 116 = 't'
     }
 
     if (isBinary(columnIndex)) {

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/BaseTest4.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/BaseTest4.java
@@ -7,6 +7,7 @@
 
 import org.postgresql.PGConnection;
 import org.postgresql.PGProperty;
+import org.postgresql.core.Oid;
 import org.postgresql.core.Version;
 import org.postgresql.jdbc.PreferQueryMode;
 import org.postgresql.test.TestUtil;
@@ -39,7 +40,7 @@ public enum StringType {
   }
 
   protected Connection con;
-  private BinaryMode binaryMode;
+  protected BinaryMode binaryMode;
   private ReWriteBatchedInserts reWriteBatchedInserts;
   protected PreferQueryMode preferQueryMode;
   private StringType stringType;
@@ -58,6 +59,7 @@ protected void updateProperties(Properties props) {
 
   protected void forceBinary(Properties props) {
     PGProperty.PREPARE_THRESHOLD.set(props, -1);
+    PGProperty.BINARY_TRANSFER_ENABLE.set(props, Oid.BOOL);
   }
 
   public final void setBinaryMode(BinaryMode binaryMode) {

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java
@@ -505,14 +505,17 @@ public void testDoubleQuestionMark() throws SQLException {
     st = con.prepareStatement("select ??- lseg '((-1,0),(1,0))';");
     rs = st.executeQuery();
     assertTrue(rs.next());
-    assertEquals("t", rs.getString(1));
+    // Bool values in binary mode are first converted to their Java type (Boolean), and then
+    // converted to String, which means that we receive 'true'. Bool values in text mode are
+    // returned as the same text value that was returned by the server, i.e. 't'.
+    assertEquals(binaryMode == BinaryMode.FORCE && preferQueryMode != PreferQueryMode.SIMPLE ? "true" : "t", rs.getString(1));
     assertFalse(rs.next());
     st.close();
 
     st = con.prepareStatement("select lseg '((-1,0),(1,0))' ??# box '((-2,-2),(2,2))';");
     rs = st.executeQuery();
     assertTrue(rs.next());
-    assertEquals("t", rs.getString(1));
+    assertEquals(binaryMode == BinaryMode.FORCE && preferQueryMode != PreferQueryMode.SIMPLE ? "true" : "t", rs.getString(1));
     assertFalse(rs.next());
     st.close();
   }

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ResultSetTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/ResultSetTest.java
@@ -72,6 +72,10 @@ public void setUp() throws Exception {
     stmt.executeUpdate("INSERT INTO testint VALUES (12345)");
 
     // Boolean Tests
+    TestUtil.createTable(con, "testbool", "a boolean, b int");
+    stmt.executeUpdate("INSERT INTO testbool VALUES(true, 1)");
+    stmt.executeUpdate("INSERT INTO testbool VALUES(false, 0)");
+
     TestUtil.createTable(con, "testboolstring", "a varchar(30), b boolean");
     stmt.executeUpdate("INSERT INTO testboolstring VALUES('1 ', true)");
     stmt.executeUpdate("INSERT INTO testboolstring VALUES('0', false)");
@@ -284,6 +288,14 @@ public void testMaxFieldSize() throws SQLException {
     assertEquals("12", new String(rs.getBytes(1)));
   }
 
+  @Test
+  public void testBooleanBool() throws SQLException {
+    testBoolean("testbool", 0);
+    testBoolean("testbool", 1);
+    testBoolean("testbool", 5);
+    testBoolean("testbool", -1);
+  }
+
   @Test
   public void testBooleanString() throws SQLException {
     testBoolean("testboolstring", 0);
@@ -332,7 +344,7 @@ public void testBoolean(String table, int prepareThreshold) throws SQLException
   }
 
   @Test
-  public void testgetBooleanJDBCCompliance() throws SQLException {
+  public void testGetBooleanJDBCCompliance() throws SQLException {
     // The JDBC specification in Table B-6 "Use of ResultSet getter Methods to Retrieve JDBC Data Types"
     // the getBoolean have this Supported JDBC Type: TINYINT, SMALLINT, INTEGER, BIGINT, REAL, FLOAT,
     // DOUBLE, DECIMAL, NUMERIC, BIT, BOOLEAN, CHAR, VARCHAR, LONGVARCHAR