postgresql-jdbc.git / summary / log / commit / refs

commit    7f0e200affbf4b6504bfafccaf6cfcdbe3b0219e
Author:   Dave Cramer <davecramer@gmail.com>
Commit:   GitHub <noreply@github.com>
Date:     Thu Nov 22 13:25:30 2018 +0000

    Add support for version 11 and version 12 (#1332)
    
    * Add support for version 11 and version 12
    
    * add tests for ServerVersion
    
    * remove core.ServerVersionTest, move tests into util.ServerVersionTest


 pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java    |  4 +++-
 .../java/org/postgresql/test/util/ServerVersionParseTest.java  |  1 +
 .../test/java/org/postgresql/test/util/ServerVersionTest.java  | 10 ++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java b/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java
index 5eae078d..9348ba13 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java
@@ -24,7 +24,9 @@ public enum ServerVersion implements Version {
   v9_4("9.4.0"),
   v9_5("9.5.0"),
   v9_6("9.6.0"),
-  v10("10")
+  v10("10"),
+  v11("11"),
+  v12("12")
   ;
 
   private final int version;
diff --git a/pgjdbc/src/test/java/org/postgresql/test/util/ServerVersionParseTest.java b/pgjdbc/src/test/java/org/postgresql/test/util/ServerVersionParseTest.java
index 88bbc95c..ffe1a90c 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/util/ServerVersionParseTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/util/ServerVersionParseTest.java
@@ -47,6 +47,7 @@ public class ServerVersionParseTest {
         {"9.6", 90600, null},
         {"10", 100000, null},
         {"11", 110000, null},
+        {"12", 120000, null},
         /* Multidigit */
         {"9.4.10", 90410, null},
         {"9.20.10", 92010, null},
diff --git a/pgjdbc/src/test/java/org/postgresql/test/util/ServerVersionTest.java b/pgjdbc/src/test/java/org/postgresql/test/util/ServerVersionTest.java
index 3e320890..a0a80611 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/util/ServerVersionTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/util/ServerVersionTest.java
@@ -22,4 +22,14 @@ public class ServerVersionTest {
       prev = serverVersion;
     }
   }
+
+  @Test
+  public void testVersions() {
+    Assert.assertEquals(ServerVersion.v12.getVersionNum(), ServerVersion.from("12.0").getVersionNum());
+    Assert.assertEquals(120004, ServerVersion.from("12.4").getVersionNum());
+    Assert.assertEquals(ServerVersion.v11.getVersionNum(), ServerVersion.from("11.0").getVersionNum());
+    Assert.assertEquals(110006, ServerVersion.from("11.6").getVersionNum());
+    Assert.assertEquals(ServerVersion.v10.getVersionNum(), ServerVersion.from("10.0").getVersionNum());
+    Assert.assertTrue(ServerVersion.v9_6.getVersionNum() < ServerVersion.from("9.6.4").getVersionNum());
+  }
 }


[parent: 2ad1ac3fc0e0]