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

commit    d98b56becf9171aa75ec848d4a5ec2bfa80381d2
Author:   Dave Cramer <davecramer@gmail.com>
Commit:   GitHub <noreply@github.com>
Date:     Mon Oct 14 18:28:20 2024 +0000

    Added way to check for major server version, fixed check for RULE (#3402)


 pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java    | 10 ++++++++++
 pgjdbc/src/main/java/org/postgresql/core/Version.java          |  1 +
 .../src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java  |  2 +-
 3 files changed, 12 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 6cc5a755..213ef11a 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/ServerVersion.java
@@ -57,6 +57,11 @@ public enum ServerVersion implements Version {
     return version;
   }
 
+  @Override
+  public int getMajorVersionNumber() {
+    return version / 10000;
+  }
+
   /**
    * Attempt to parse the server version string into an XXYYZZ form version number into a
    * {@link Version}.
@@ -74,6 +79,11 @@ public enum ServerVersion implements Version {
         return versionNum;
       }
 
+      @Override
+      public int getMajorVersionNumber() {
+        return versionNum / 10000;
+      }
+
       @Override
       public boolean equals(@Nullable Object obj) {
         if (obj instanceof Version) {
diff --git a/pgjdbc/src/main/java/org/postgresql/core/Version.java b/pgjdbc/src/main/java/org/postgresql/core/Version.java
index 639226a1..d1925316 100644
--- a/pgjdbc/src/main/java/org/postgresql/core/Version.java
+++ b/pgjdbc/src/main/java/org/postgresql/core/Version.java
@@ -14,4 +14,5 @@ public interface Version {
    */
   int getVersionNum();
 
+  int getMajorVersionNumber();
 }
diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java
index 711399f2..d4af5b5c 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java
@@ -1477,7 +1477,7 @@ public class PgDatabaseMetaData implements DatabaseMetaData {
      */
     String privileges = " 'SELECT, INSERT, UPDATE, DELETE, REFERENCES, TRIGGER')";
 
-    if ( connection.getServerMajorVersion() < ServerVersion.v18.getVersionNum()) {
+    if ( connection.getServerMajorVersion() < ServerVersion.v18.getMajorVersionNumber()) {
       privileges = " 'SELECT, INSERT, UPDATE, DELETE, RULE, REFERENCES, TRIGGER')";
     }
 


[parent: fcc13e70e6b6]