From e10ba6858bcb931a2a8613cd507c3d9048f64ed1 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sun, 24 Mar 2019 20:00:04 +0300
Subject: [PATCH] #5548 Database description reading fix (pg >= 9.4)

Former-commit-id: b20db0bca0a2c923dda9581f39e0374c8830429c
---
 .../jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java  | 1 +
 .../dbeaver/ext/postgresql/model/PostgreServerExtension.java | 2 ++
 .../postgresql/model/impls/PostgreServerExtensionBase.java   | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
index 93f06b8720..5d53ec2bc1 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
@@ -237,6 +237,7 @@ public class PostgreDatabase extends JDBCRemoteInstance<PostgreDataSource>
 
     @Property(viewable = true, multiline = true, order = 100)
     public String getDescription(DBRProgressMonitor monitor) throws DBException {
+        if (getDataSource().getServerType().supportsDatabaseDescription())
         if (description != null) {
             return description;
         }
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreServerExtension.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreServerExtension.java
index 799d19bb4d..2ab43d9657 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreServerExtension.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreServerExtension.java
@@ -99,4 +99,6 @@ public interface PostgreServerExtension
     boolean supportsExplainPlanXML();
 
     boolean supportsExplainPlanVerbose();
+
+    boolean supportsDatabaseDescription();
 }
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerExtensionBase.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerExtensionBase.java
index d985331181..ae986c6d00 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerExtensionBase.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerExtensionBase.java
@@ -317,6 +317,11 @@ public abstract class PostgreServerExtensionBase implements PostgreServerExtensi
         return true;
     }
 
+    @Override
+    public boolean supportsDatabaseDescription() {
+        return dataSource.isServerVersionAtLeast(9, 4);
+    }
+
     public String createWithClause(PostgreTableRegular table, PostgreTableBase tableBase) {
         StringBuilder withClauseBuilder = new StringBuilder();
 
-- 
GitLab