From 5a64e19a02541291f36b99f23ce99bba9a863bf6 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Fri, 3 Jan 2020 13:03:44 +0300
Subject: [PATCH] #7495 MySQL import/script settings load/save

Former-commit-id: ae6626373a2b427fa856c5ec3a5f8c178c0881fc
---
 .../dbeaver/ext/mysql/tasks/MySQLScriptExecuteHandler.java   | 5 +++++
 .../jkiss/dbeaver/tasks/nativetool/AbstractToolSettings.java | 1 +
 2 files changed, 6 insertions(+)

diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLScriptExecuteHandler.java b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLScriptExecuteHandler.java
index 7dcc0652d2..081e5be8e7 100644
--- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLScriptExecuteHandler.java
+++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/tasks/MySQLScriptExecuteHandler.java
@@ -62,6 +62,11 @@ public class MySQLScriptExecuteHandler extends MySQLNativeToolHandler<MySQLScrip
         return true;
     }
 
+    @Override
+    protected boolean isMergeProcessStreams() {
+        return true;
+    }
+
     @Override
     protected void startProcessHandler(DBRProgressMonitor monitor, DBTTask task, MySQLScriptExecuteSettings settings, MySQLCatalog arg, ProcessBuilder processBuilder, Process process, Log log) throws IOException {
         File inputFile = new File(settings.getInputFile());
diff --git a/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractToolSettings.java b/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractToolSettings.java
index 4481d4c6f1..aa81d0c9ed 100644
--- a/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractToolSettings.java
+++ b/plugins/org.jkiss.dbeaver.tasks.native/src/org/jkiss/dbeaver/tasks/nativetool/AbstractToolSettings.java
@@ -103,6 +103,7 @@ public abstract class AbstractToolSettings<BASE_OBJECT extends DBSObject> {
                                     DBSObject object = DBUtils.findObjectById(monitor, finalProject, objectId);
                                     if (object != null) {
                                         databaseObjects.add((BASE_OBJECT) object);
+                                        dataSourceContainer = object.getDataSource().getContainer();
                                     }
                                 } catch (Throwable e) {
                                     throw new DBException("Can't find database object '" + objectId + "' in project '" + finalProject.getName() + "' for task configuration", e);
-- 
GitLab