Merge pull request #5476 from riednyko/#146_mariadb_constraints_fix

dbeaver-corp/dbeaver-i18n#146 fix1

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/messages/ModelMessages.java

@@ -126,11 +126,24 @@ public class ModelMessages extends NLS {
 
 	public static String model_navigator_Root;
 
-	public static String model_struct_Cascade;
+	public static String model_struct_Association;
+    public static String model_struct_Cascade;
 	public static String model_struct_Check;
 	public static String model_struct_Clustered;
-	public static String model_struct_Foreign_Key;
+	public static String model_struct_constraint_type_association;
+    public static String model_struct_constraint_type_check;
+    public static String model_struct_constraint_type_foreign_key;
+    public static String model_struct_constraint_type_index;
+    public static String model_struct_constraint_type_inheritance;
+    public static String model_struct_constraint_type_not_null;
+    public static String model_struct_constraint_type_primary_key;
+    public static String model_struct_constraint_type_pseudo;
+    public static String model_struct_constraint_type_unique_key;
+    public static String model_struct_constraint_type_virtual_key;
+    public static String model_struct_Foreign_Key;
 	public static String model_struct_Hashed;
+    public static String model_struct_Index;
+    public static String model_struct_Inheritance;
 	public static String model_struct_No_Action;
 	public static String model_struct_Not_NULL;
 	public static String model_struct_Other;

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/messages/ModelResources.properties

@@ -99,11 +99,24 @@ model_navigator_Model_root=Model root
 model_navigator_Name=Name
 model_navigator_Project=Project
 model_navigator_Root=Root
+model_struct_Association=Association
 model_struct_Cascade=Cascade
 model_struct_Check=Check
 model_struct_Clustered=Clustered
+model_struct_constraint_type_association=Association
+model_struct_constraint_type_check=CHECK
+model_struct_constraint_type_foreign_key=FOREIGN KEY
+model_struct_constraint_type_index=Index
+model_struct_constraint_type_inheritance=Inheritance
+model_struct_constraint_type_not_null=NOT NULL
+model_struct_constraint_type_primary_key=PRIMARY KEY
+model_struct_constraint_type_pseudo=PSEUDO
+model_struct_constraint_type_unique_key=UNIQUE KEY
+model_struct_constraint_type_virtual_key=VIRTUAL KEY
 model_struct_Foreign_Key=Foreign Key
 model_struct_Hashed=Hashed
+model_struct_Index=Index
+model_struct_Inheritance=Inheritance
 model_struct_No_Action=No Action
 model_struct_Not_NULL=Not NULL
 model_struct_Other=Other

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/messages/ModelResources_ru.properties

@@ -36,6 +36,14 @@ model_struct_Restrict=\u0417\u0430\u043F\u0440\u0435\u0442
 model_struct_Set_Default=\u041F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E
 model_struct_Set_NULL=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0432 NULL
 model_struct_Cascade=\u041A\u0430\u0441\u043A\u0430\u0434
+model_struct_constraint_type_check=\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430
+model_struct_constraint_type_foreign_key=\u0412\u043D\u0435\u0448\u043D\u0438\u0439 \u043A\u043B\u044E\u0447
+model_struct_constraint_type_primary_key=\u041F\u0435\u0440\u0432\u0438\u0447\u043D\u044B\u0439 \u043A\u043B\u044E\u0447
+model_struct_constraint_type_unique_key=\u0423\u043D\u0438\u043A\u0430\u043B\u044C\u043D\u044B\u0439 \u043A\u043B\u044E\u0447
+model_struct_constraint_type_index=\u0418\u043D\u0434\u0435\u043A\u0441
+model_struct_constraint_type_inheritance=\u041D\u0430\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u043D\u0438\u0435
+model_struct_constraint_type_virtual_key=\u0412\u0438\u0440\u0442\u0443\u0430\u043B\u044C\u043D\u044B\u0439 \u043A\u043B\u044E\u0447
+model_struct_constraint_type_association=\u0410\u0441\u0441\u043E\u0446\u0438\u0430\u0446\u0438\u0438
 
 model_jdbc_Database=\u0411\u0430\u0437\u0430 \u0434\u0430\u043D\u043D\u044B\u0445
 model_connection_events_event_after_connect=\u041F\u043E\u0441\u043B\u0435 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBSEntityConstraintType.java

@@ -23,16 +23,16 @@ import org.jkiss.dbeaver.model.messages.ModelMessages;
  */
 public class DBSEntityConstraintType
 {
-    public static final DBSEntityConstraintType FOREIGN_KEY = new DBSEntityConstraintType("fk", "FOREIGN KEY", ModelMessages.model_struct_Foreign_Key, true, false, false); //$NON-NLS-1$
-    public static final DBSEntityConstraintType PRIMARY_KEY = new DBSEntityConstraintType("pk", "PRIMARY KEY", ModelMessages.model_struct_Primary_Key, false, true, false); //$NON-NLS-1$
-    public static final DBSEntityConstraintType UNIQUE_KEY = new DBSEntityConstraintType("unique", "UNIQUE KEY", ModelMessages.model_struct_Unique_Key, false, true, false); //$NON-NLS-1$
-    public static final DBSEntityConstraintType VIRTUAL_KEY = new DBSEntityConstraintType("virtual", "VIRTUAL KEY", ModelMessages.model_struct_Virtual_Key, false, true, false); //$NON-NLS-1$
-    public static final DBSEntityConstraintType PSEUDO_KEY = new DBSEntityConstraintType("pseudo", "PSEUDO", ModelMessages.model_struct_Pseudo_Key, false, true, false); //$NON-NLS-1$
-    public static final DBSEntityConstraintType CHECK = new DBSEntityConstraintType("check", "CHECK", ModelMessages.model_struct_Check, false, false, true); //$NON-NLS-1$
-    public static final DBSEntityConstraintType NOT_NULL = new DBSEntityConstraintType("notnull", "NOT NULL", ModelMessages.model_struct_Not_NULL, false, false, false); //$NON-NLS-1$
-    public static final DBSEntityConstraintType INDEX = new DBSEntityConstraintType("index", "Index", "Index", false, false, false); //$NON-NLS-1$
-    public static final DBSEntityConstraintType ASSOCIATION = new DBSEntityConstraintType("association", "Association", "Association", true, false, false); //$NON-NLS-1$
-    public static final DBSEntityConstraintType INHERITANCE = new DBSEntityConstraintType("inheritance", "Inheritance", "Inheritance", true, false, false); //$NON-NLS-1$
+    public static final DBSEntityConstraintType FOREIGN_KEY = new DBSEntityConstraintType("fk", ModelMessages.model_struct_constraint_type_foreign_key, ModelMessages.model_struct_Foreign_Key, true, false, false); //$NON-NLS-1$
+    public static final DBSEntityConstraintType PRIMARY_KEY = new DBSEntityConstraintType("pk", ModelMessages.model_struct_constraint_type_primary_key, ModelMessages.model_struct_Primary_Key, false, true, false); //$NON-NLS-1$
+    public static final DBSEntityConstraintType UNIQUE_KEY = new DBSEntityConstraintType("unique", ModelMessages.model_struct_constraint_type_unique_key, ModelMessages.model_struct_Unique_Key, false, true, false); //$NON-NLS-1$
+    public static final DBSEntityConstraintType VIRTUAL_KEY = new DBSEntityConstraintType("virtual", ModelMessages.model_struct_constraint_type_virtual_key, ModelMessages.model_struct_Virtual_Key, false, true, false); //$NON-NLS-1$
+    public static final DBSEntityConstraintType PSEUDO_KEY = new DBSEntityConstraintType("pseudo", ModelMessages.model_struct_constraint_type_pseudo, ModelMessages.model_struct_Pseudo_Key, false, true, false); //$NON-NLS-1$
+    public static final DBSEntityConstraintType CHECK = new DBSEntityConstraintType("check", ModelMessages.model_struct_constraint_type_check, ModelMessages.model_struct_Check, false, false, true); //$NON-NLS-1$
+    public static final DBSEntityConstraintType NOT_NULL = new DBSEntityConstraintType("notnull", ModelMessages.model_struct_constraint_type_not_null, ModelMessages.model_struct_Not_NULL, false, false, false); //$NON-NLS-1$
+    public static final DBSEntityConstraintType INDEX = new DBSEntityConstraintType("index", ModelMessages.model_struct_constraint_type_index, ModelMessages.model_struct_Index, false, false, false); //$NON-NLS-1$
+    public static final DBSEntityConstraintType ASSOCIATION = new DBSEntityConstraintType("association", ModelMessages.model_struct_constraint_type_association, ModelMessages.model_struct_Association, true, false, false); //$NON-NLS-1$
+    public static final DBSEntityConstraintType INHERITANCE = new DBSEntityConstraintType("inheritance", ModelMessages.model_struct_constraint_type_inheritance, ModelMessages.model_struct_Inheritance, true, false, false); //$NON-NLS-1$
 
     private final String id;
     private final String name;