From 91f1521575326f5473a9f7e785cf37fe9fa0878c Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Thu, 9 Aug 2018 13:23:54 +0300
Subject: [PATCH] #130 Data transfer fixes (db to db, stream to db).

---
 .../transfer/database/DatabaseTransferConsumer.java  |  2 +-
 .../transfer/stream/importer/DataImporterCSV.java    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseTransferConsumer.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseTransferConsumer.java
index 329d938606..a3d5e93b0e 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseTransferConsumer.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/DatabaseTransferConsumer.java
@@ -175,7 +175,7 @@ public class DatabaseTransferConsumer implements IDataTransferConsumer<DatabaseC
                 attrValue = resultSet.getAttributeValue(i);
             }
             rowValues[column.targetIndex] = column.targetValueHandler.getValueFromObject(
-                session,
+                targetSession,
                 column.targetAttr.getTarget(),
                 attrValue,
                 false);
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/importer/DataImporterCSV.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/importer/DataImporterCSV.java
index 10bec8a37b..737c16f237 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/importer/DataImporterCSV.java
+++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/importer/DataImporterCSV.java
@@ -113,11 +113,11 @@ public class DataImporterCSV extends StreamImporterAbstract {
         Map<Object, Object> properties = site.getProcessorProperties();
         HeaderPosition headerPosition = getHeaderPosition(properties);
 
-        try (StreamTransferSession session = new StreamTransferSession(monitor, DBCExecutionPurpose.UTIL, "Transfer stream data")) {
-            LocalStatement localStatement = new LocalStatement(session, "SELECT * FROM Stream");
-            StreamTransferResultSet resultSet = new StreamTransferResultSet(session, localStatement, entityMapping);
+        try (StreamTransferSession producerSession = new StreamTransferSession(monitor, DBCExecutionPurpose.UTIL, "Transfer stream data")) {
+            LocalStatement localStatement = new LocalStatement(producerSession, "SELECT * FROM Stream");
+            StreamTransferResultSet resultSet = new StreamTransferResultSet(producerSession, localStatement, entityMapping);
 
-            consumer.fetchStart(session, resultSet, -1, -1);
+            consumer.fetchStart(producerSession, resultSet, -1, -1);
 
             try (Reader reader = openStreamReader(inputStream, properties)) {
                 try (CSVReader csvReader = openCSVReader(reader, properties)) {
@@ -153,14 +153,14 @@ public class DataImporterCSV extends StreamImporterAbstract {
                         }
 
                         resultSet.setStreamRow(line);
-                        consumer.fetchRow(session, resultSet);
+                        consumer.fetchRow(producerSession, resultSet);
                         lineNum++;
                     }
                 }
             } catch (IOException e) {
                 throw new DBException("IO error reading CSV", e);
             } finally {
-                consumer.fetchEnd(session, resultSet);
+                consumer.fetchEnd(producerSession, resultSet);
             }
         }
     }
-- 
GitLab