From b34563159390b99b434a57f8c22b921d1300651f Mon Sep 17 00:00:00 2001
From: LonwoLonwo <anvolka@yandex.ru>
Date: Fri, 25 Sep 2020 17:31:19 +0300
Subject: [PATCH]  #4644 extra options added in table DDL

---
 .../postgresql/model/PostgreTableBase.java    |  2 +-
 .../impls/PostgreServerExtensionBase.java     | 24 +++++++++++++++++--
 .../properties/TabbedFolderPageForm.java      |  4 +++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTableBase.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTableBase.java
index cf434d646c..0373fe3ded 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTableBase.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTableBase.java
@@ -129,7 +129,7 @@ public abstract class PostgreTableBase extends JDBCTable<PostgreDataSource, Post
         return this.oid;
     }
 
-    @Property(order = 90)
+    @Property(viewable = true, multiline = true, order = 90)
     @Nullable
     public String[] getRelOptions() {
         return relOptions;
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 e2af8acb31..9832c81e65 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
@@ -30,6 +30,7 @@ import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -394,8 +395,27 @@ public abstract class PostgreServerExtensionBase implements PostgreServerExtensi
     public String createWithClause(PostgreTableRegular table, PostgreTableBase tableBase) {
         StringBuilder withClauseBuilder = new StringBuilder();
 
-        if (table.getDataSource().getServerType().supportsOids() && table.isHasOids() && table.getDataSource().getServerType().supportsHasOidsColumn()) {
-            withClauseBuilder.append("\nWITH (\n\tOIDS=").append(table.isHasOids() ? "TRUE" : "FALSE");
+        boolean hasExtraOptions = dataSource.isServerVersionAtLeast(8, 2) && table.getRelOptions() != null;
+        boolean tableSupportOids = table.getDataSource().getServerType().supportsOids() && table.isHasOids() && table.getDataSource().getServerType().supportsHasOidsColumn();
+
+        List<String> extraOptions = new ArrayList<>();
+
+        if (tableSupportOids) {
+            extraOptions.add("OIDS=TRUE");
+        }
+        if (hasExtraOptions) {
+            extraOptions.addAll(Arrays.asList(table.getRelOptions()));
+        }
+
+        if (!CommonUtils.isEmpty(extraOptions)) {
+            withClauseBuilder.append("\nWITH (\n\t");
+            for (int i = 0; i < extraOptions.size(); i++) {
+                if (i == 0) {
+                    withClauseBuilder.append(extraOptions.get(i));
+                } else {
+                    withClauseBuilder.append(",\n\t").append(extraOptions.get(i));
+                }
+            }
             withClauseBuilder.append("\n)");
         }
 
diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/properties/TabbedFolderPageForm.java b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/properties/TabbedFolderPageForm.java
index e0d6836905..723442706a 100644
--- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/properties/TabbedFolderPageForm.java
+++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/editors/entity/properties/TabbedFolderPageForm.java
@@ -719,7 +719,9 @@ public class TabbedFolderPageForm extends TabbedFolderPage implements IRefreshab
     }
 
     private static boolean isTextPropertyType(Class<?> propertyType) {
-        return propertyType == null || CharSequence.class.isAssignableFrom(propertyType) || BeanUtils.isNumericType(propertyType);
+        return propertyType == null || CharSequence.class.isAssignableFrom(propertyType) ||
+                (propertyType.getComponentType() != null && CharSequence.class.isAssignableFrom(propertyType.getComponentType())) ||
+                BeanUtils.isNumericType(propertyType);
     }
 
     private List<DBPPropertyDescriptor> filterProperties(DBPPropertyDescriptor[] props) {
-- 
GitLab