#10134 Add "connectionType" variable for name pattern in dump tool

Former-commit-id: f8e162b0

plugins/org.jkiss.dbeaver.ext.mysql.ui/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLExportWizardPageSettings.java

@@ -113,7 +113,8 @@ class MySQLExportWizardPageSettings extends MySQLWizardPageSettings<MySQLExportW
             NativeToolUtils.VARIABLE_DATABASE,
             NativeToolUtils.VARIABLE_TABLE,
             NativeToolUtils.VARIABLE_DATE,
-            NativeToolUtils.VARIABLE_TIMESTAMP);
+            NativeToolUtils.VARIABLE_TIMESTAMP,
+            NativeToolUtils.VARIABLE_CONN_TYPE);
         ContentAssistUtils.installContentProposal(
             outputFileText,
             new SmartTextContentAdapter(),
@@ -122,7 +123,8 @@ class MySQLExportWizardPageSettings extends MySQLWizardPageSettings<MySQLExportW
                 GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_DATABASE),
                 GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_TABLE),
                 GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_DATE),
-                GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_TIMESTAMP)));
+                GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_TIMESTAMP),
+                GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_CONN_TYPE)));
 
         createExtraArgsInput(outputGroup);
 

plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLDatabaseExportHandler.java

@@ -130,6 +130,8 @@ public class MySQLDatabaseExportHandler extends MySQLNativeToolHandler<MySQLExpo
                     return arg.getDatabase().getName();
                 case NativeToolUtils.VARIABLE_HOST:
                     return arg.getDatabase().getDataSource().getContainer().getConnectionConfiguration().getHostName();
+                case NativeToolUtils.VARIABLE_CONN_TYPE:
+                    return arg.getDatabase().getDataSource().getContainer().getConnectionConfiguration().getConnectionType().getId();
                 case NativeToolUtils.VARIABLE_TABLE:
                     final Iterator<MySQLTableBase> iterator = arg.getTables() == null ? null : arg.getTables().iterator();
                     if (iterator != null && iterator.hasNext()) {

plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/tools/PostgreBackupWizardPageSettings.java

@@ -140,7 +140,8 @@ class PostgreBackupWizardPageSettings extends PostgreToolWizardPageSettings<Post
             NativeToolUtils.VARIABLE_DATABASE,
             NativeToolUtils.VARIABLE_TABLE,
             NativeToolUtils.VARIABLE_DATE,
-            NativeToolUtils.VARIABLE_TIMESTAMP);
+            NativeToolUtils.VARIABLE_TIMESTAMP,
+            NativeToolUtils.VARIABLE_CONN_TYPE);
         ContentAssistUtils.installContentProposal(
             outputFileText,
             new SmartTextContentAdapter(),
@@ -149,7 +150,8 @@ class PostgreBackupWizardPageSettings extends PostgreToolWizardPageSettings<Post
                 GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_DATABASE),
                 GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_TABLE),
                 GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_DATE),
-                GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_TIMESTAMP)));
+                GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_TIMESTAMP),
+                GeneralUtils.variablePattern(NativeToolUtils.VARIABLE_CONN_TYPE)));
         outputFileText.addModifyListener(e -> wizard.getSettings().setOutputFilePattern(outputFileText.getText()));
 
         createExtraArgsInput(outputGroup);

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/tasks/PostgreDatabaseBackupHandler.java

@@ -161,6 +161,8 @@ public class PostgreDatabaseBackupHandler extends PostgreNativeToolHandler<Postg
                         return arg.getDatabase().getName();
                     case NativeToolUtils.VARIABLE_HOST:
                         return arg.getDatabase().getDataSource().getContainer().getConnectionConfiguration().getHostName();
+                    case NativeToolUtils.VARIABLE_CONN_TYPE:
+                        return arg.getDatabase().getDataSource().getContainer().getConnectionConfiguration().getConnectionType().getId();
                     case NativeToolUtils.VARIABLE_TABLE:
                         final Iterator<PostgreTableBase> iterator = arg.getTables() == null ? null : arg.getTables().iterator();
                         if (iterator != null && iterator.hasNext()) {

plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/NativeToolUtils.java

@@ -9,6 +9,7 @@ public abstract class NativeToolUtils {
     public static final String VARIABLE_TABLE = "table";
     public static final String VARIABLE_DATE = "date";
     public static final String VARIABLE_TIMESTAMP = "timestamp";
+    public static final String VARIABLE_CONN_TYPE = "connectionType";
 
     public static boolean isSecureString(AbstractNativeToolSettings settings, String string) {
         String userPassword = settings.getDataSourceContainer().getActualConnectionConfiguration().getUserPassword();