From 8bf82c5b21f996853fe670c52e3f3f6382506e0f Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Fri, 27 Dec 2019 19:31:10 +0300
Subject: [PATCH] #7432 Add constraint: use UNIQUE instead of UNIQUE KEY by
 default

Former-commit-id: bddff826b762b12c6de0419b6c483c7d29181935
---
 .../dbeaver/ext/db2/manager/DB2UniqueKeyManager.java   |  9 ---------
 .../ext/mssql/edit/SQLServerUniqueKeyManager.java      | 10 ----------
 .../dbeaver/ext/mysql/edit/MySQLConstraintManager.java | 10 ++++++++++
 .../ext/oracle/edit/OracleConstraintManager.java       |  9 ---------
 .../ext/postgresql/edit/PostgreConstraintManager.java  |  9 ---------
 .../impl/sql/edit/struct/SQLConstraintManager.java     |  4 ++++
 6 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2UniqueKeyManager.java b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2UniqueKeyManager.java
index d1275b4a32..7097af21d5 100644
--- a/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2UniqueKeyManager.java
+++ b/plugins/org.jkiss.dbeaver.ext.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2UniqueKeyManager.java
@@ -17,7 +17,6 @@
  */
 package org.jkiss.dbeaver.ext.db2.manager;
 
-import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.ext.db2.DB2Messages;
 import org.jkiss.dbeaver.ext.db2.model.DB2Table;
@@ -121,12 +120,4 @@ public class DB2UniqueKeyManager extends SQLConstraintManager<DB2TableUniqueKey,
         }
     }
 
-    @NotNull
-    protected String getAddConstraintTypeClause(DB2TableUniqueKey constraint)
-    {
-        if (constraint.getConstraintType() == DBSEntityConstraintType.UNIQUE_KEY) {
-            return "UNIQUE"; //$NON-NLS-1$
-        }
-        return super.getAddConstraintTypeClause(constraint);
-    }
 }
diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerUniqueKeyManager.java b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerUniqueKeyManager.java
index 8fdff614bf..6df7886c6d 100644
--- a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerUniqueKeyManager.java
+++ b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerUniqueKeyManager.java
@@ -16,7 +16,6 @@
  */
 package org.jkiss.dbeaver.ext.mssql.edit;
 
-import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.ext.mssql.model.SQLServerTable;
 import org.jkiss.dbeaver.ext.mssql.model.SQLServerTableUniqueKey;
@@ -56,13 +55,4 @@ public class SQLServerUniqueKeyManager extends SQLConstraintManager<SQLServerTab
             false);
     }
 
-    @NotNull
-    protected String getAddConstraintTypeClause(SQLServerTableUniqueKey constraint) {
-        if (constraint.getConstraintType() == DBSEntityConstraintType.UNIQUE_KEY) {
-            return "UNIQUE";
-        } else {
-            return super.getAddConstraintTypeClause(constraint);
-        }
-    }
-
 }
diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLConstraintManager.java b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLConstraintManager.java
index b29501c326..8dd2ce625c 100644
--- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLConstraintManager.java
+++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLConstraintManager.java
@@ -17,6 +17,7 @@
  */
 package org.jkiss.dbeaver.ext.mysql.edit;
 
+import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLTable;
@@ -54,6 +55,15 @@ public class MySQLConstraintManager extends SQLConstraintManager<MySQLTableConst
             false);
     }
 
+    @NotNull
+    @Override
+    protected String getAddConstraintTypeClause(MySQLTableConstraint constraint) {
+        if (constraint.getConstraintType() == DBSEntityConstraintType.UNIQUE_KEY) {
+            return "UNIQUE KEY"; //$NON-NLS-1$
+        }
+        return super.getAddConstraintTypeClause(constraint);
+    }
+
     @Override
     protected String getDropConstraintPattern(MySQLTableConstraint constraint)
     {
diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleConstraintManager.java b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleConstraintManager.java
index a7d3e316a7..0d1bb7b360 100644
--- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleConstraintManager.java
+++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleConstraintManager.java
@@ -17,7 +17,6 @@
  */
 package org.jkiss.dbeaver.ext.oracle.edit;
 
-import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.ext.oracle.model.OracleObjectStatus;
 import org.jkiss.dbeaver.ext.oracle.model.OracleTableBase;
@@ -77,14 +76,6 @@ public class OracleConstraintManager extends SQLConstraintManager<OracleTableCon
         return "ALTER TABLE " + PATTERN_ITEM_TABLE +" DROP " + clause + " " + PATTERN_ITEM_CONSTRAINT; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
-    @NotNull
-    protected String getAddConstraintTypeClause(OracleTableConstraint constraint) {
-        if (constraint.getConstraintType() == DBSEntityConstraintType.UNIQUE_KEY) {
-            return "UNIQUE"; //$NON-NLS-1$
-        }
-        return super.getAddConstraintTypeClause(constraint);
-    }
-    
     @Override
     protected void addObjectCreateActions(DBRProgressMonitor monitor, List<DBEPersistAction> actions,
                                           ObjectCreateCommand command, Map<String, Object> options)
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreConstraintManager.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreConstraintManager.java
index f74475abdf..f2a4b82e63 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreConstraintManager.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreConstraintManager.java
@@ -16,7 +16,6 @@
  */
 package org.jkiss.dbeaver.ext.postgresql.edit;
 
-import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreTableBase;
@@ -80,14 +79,6 @@ public class PostgreConstraintManager extends SQLConstraintManager<PostgreTableC
         return super.getNestedDeclaration(monitor, owner, command, options);
     }
 
-    @NotNull
-    protected String getAddConstraintTypeClause(PostgreTableConstraintBase constraint) {
-        if (constraint.getConstraintType() == DBSEntityConstraintType.UNIQUE_KEY) {
-            return "UNIQUE"; //$NON-NLS-1$
-        }
-        return super.getAddConstraintTypeClause(constraint);
-    }
-
     @Override
     protected void appendConstraintDefinition(StringBuilder decl, DBECommandAbstract<PostgreTableConstraintBase> command) {
         if (command.getObject().getConstraintType() == DBSEntityConstraintType.CHECK) {
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLConstraintManager.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLConstraintManager.java
index f82263f78b..edc8693f79 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLConstraintManager.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/struct/SQLConstraintManager.java
@@ -32,6 +32,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
 import org.jkiss.dbeaver.model.struct.DBSEntityAttributeRef;
+import org.jkiss.dbeaver.model.struct.DBSEntityConstraintType;
 
 import java.util.List;
 import java.util.Locale;
@@ -124,6 +125,9 @@ public abstract class SQLConstraintManager<OBJECT_TYPE extends JDBCTableConstrai
 
     @NotNull
     protected String getAddConstraintTypeClause(OBJECT_TYPE constraint) {
+        if (constraint.getConstraintType() == DBSEntityConstraintType.UNIQUE_KEY) {
+            return "UNIQUE"; //$NON-NLS-1$
+        }
         return constraint.getConstraintType().getName().toUpperCase(Locale.ENGLISH);
     }
 
-- 
GitLab