fix: Issue pgjdbc#2267, version 14 returns UNDEFINED FUNCTION for tes…

…tInvokeFunctionHavingReturnParameter, also add v13, and v14 to Server versions
davecramer · Sep 27, 2021 · b50cf4d · b50cf4d
1 parent 512799b
commit b50cf4d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java b/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java
@@ -28,7 +28,9 @@ public enum ServerVersion implements Version {
   v9_6("9.6.0"),
   v10("10"),
   v11("11"),
-  v12("12")
+  v12("12"),
+  v13("13"),
+  v14("14")
   ;
 
   private final int version;

diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc3/EscapeSyntaxCallModeCallTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc3/EscapeSyntaxCallModeCallTest.java
@@ -11,6 +11,7 @@
 import org.postgresql.PGProperty;
 import org.postgresql.core.ServerVersion;
 import org.postgresql.jdbc.EscapeSyntaxCallMode;
+import org.postgresql.test.TestUtil;
 import org.postgresql.util.PSQLState;
 
 import org.junit.Test;
@@ -60,7 +61,12 @@ public void testInvokeFunctionHavingReturnParameter() throws Throwable {
       cs.execute();
       fail("Should throw an exception");
     } catch (SQLException ex) {
-      assertTrue(ex.getSQLState().equalsIgnoreCase(PSQLState.WRONG_OBJECT_TYPE.getState()));
+      // version 14 changes this to undefined function
+      if (TestUtil.haveMinimumServerVersion(con, ServerVersion.v14)) {
+        assertTrue(ex.getSQLState().equalsIgnoreCase(PSQLState.UNDEFINED_FUNCTION.getState()));
+      } else {
+        assertTrue(ex.getSQLState().equalsIgnoreCase(PSQLState.WRONG_OBJECT_TYPE.getState()));
+      }
     }
   }