fix: setNull for types not in java.sql.Types (e.g. uuid)

pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java

@@ -1232,9 +1232,25 @@ public void setClob(int i, Clob x) throws SQLException {
     setLong(i, oid);
   }
 
-  public void setNull(int i, int t, String s) throws SQLException {
+  public void setNull(int parameterIndex, int t, String typeName) throws SQLException {
+
+    if ( typeName == null ) {
+      setNull(parameterIndex, t);
+      return;
+    }
+
     checkClosed();
-    setNull(i, t);
+
+    TypeInfo typeInfo = connection.getTypeInfo();
+
+    int oid = typeInfo.getPGType(typeName);
+
+    if (adjustIndex) {
+      parameterIndex--;
+    }
+
+    preparedParameters.setNull(parameterIndex, oid);
+
   }
 
   public void setRef(int i, Ref x) throws SQLException {

pgjdbc/src/test/java/org/postgresql/test/jdbc2/PreparedStatementTest.java

@@ -12,6 +12,8 @@
 import static org.junit.Assert.fail;
 
 import org.postgresql.PGStatement;
+import org.postgresql.core.ServerVersion;
+import org.postgresql.core.Version;
 import org.postgresql.jdbc.PgStatement;
 import org.postgresql.jdbc.PreferQueryMode;
 import org.postgresql.test.TestUtil;
@@ -39,6 +41,7 @@
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Handler;
@@ -285,6 +288,20 @@ public void testSetNull() throws SQLException {
     pstmt.executeUpdate();
 
     pstmt.close();
+
+    assumeMinimumServerVersion(ServerVersion.v8_3);
+    pstmt = con.prepareStatement("select 'ok' where ?=? or (? is null) ");
+    pstmt.setObject(1, UUID.randomUUID(), Types.OTHER);
+    pstmt.setNull(2, Types.OTHER, "uuid");
+    pstmt.setNull(3, Types.OTHER, "uuid");
+    ResultSet rs = pstmt.executeQuery();
+
+    assertTrue(rs.next());
+    assertEquals("ok",rs.getObject(1));
+
+    rs.close();
+    pstmt.close();
+
   }
 
   @Test

pgjdbc/src/test/java/org/postgresql/test/jdbc4/ArrayTest.java

@@ -560,7 +560,7 @@ public void testToString() throws SQLException {
   public void nullArray() throws SQLException {
     PreparedStatement ps = con.prepareStatement("INSERT INTO arrtest(floatarr) VALUES (?)");
 
-    ps.setNull(1, Types.ARRAY, "float8");
+    ps.setNull(1, Types.ARRAY, "float8[]");
     ps.execute();
 
     ps.close();