提交 9cb9fa64 编写于 作者: J jurgen

Data transfer fix (attribute type cast).

SQL Server icon.
csv-jdbc driver update
上级 cf3e5fbb
......@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CSV/DBF driver
Bundle-SymbolicName: org.jkiss.dbeaver.resources.csvjdbc;singleton:=true
Bundle-Version: 1.0.12
Bundle-Version: 1.0.23
Bundle-Vendor:
Bundle-ActivationPolicy: lazy
source.. =
bin.includes = .,plugin.xml,META-INF/,drivers/csvjdbc/LICENSE.txt,drivers/csvjdbc/csvjdbc-1.0.12.jar
bin.includes = .,plugin.xml,META-INF/,drivers/csvjdbc/LICENSE.txt,drivers/csvjdbc/csvjdbc-1.0-23.jar
src.includes =
......@@ -2,6 +2,6 @@
<plugin>
<extension point="org.jkiss.dbeaver.resources">
<resource name="drivers/csvjdbc/LICENSE.txt"/>
<resource name="drivers/csvjdbc/csvjdbc-1.0.12.jar"/>
<resource name="drivers/csvjdbc/csvjdbc-1.0-23.jar"/>
</extension>
</plugin>
\ No newline at end of file
......@@ -62,7 +62,8 @@ public class DatabaseTransferConsumer implements IDataTransferConsumer<DatabaseC
private static class ColumnMapping {
DBCAttributeMetaData sourceAttr;
DatabaseMappingAttribute targetAttr;
DBDValueHandler valueHandler;
DBDValueHandler sourceValueHandler;
DBDValueHandler targetValueHandler;
int targetIndex = -1;
private ColumnMapping(DBCAttributeMetaData sourceAttr)
......@@ -94,7 +95,8 @@ public class DatabaseTransferConsumer implements IDataTransferConsumer<DatabaseC
if (columnMapping.targetAttr == null) {
throw new DBCException("Can't find target attribute [" + columnMapping.sourceAttr.getName() + "]");
}
columnMapping.valueHandler = DBUtils.findValueHandler(session, columnMapping.sourceAttr);
columnMapping.sourceValueHandler = DBUtils.findValueHandler(session, columnMapping.sourceAttr);
columnMapping.targetValueHandler = DBUtils.findValueHandler(session, columnMapping.targetAttr.getTarget());
columnMappings[i] = columnMapping;
if (columnMapping.targetAttr.getMappingType() == DatabaseMappingType.skip) {
continue;
......@@ -117,7 +119,11 @@ public class DatabaseTransferConsumer implements IDataTransferConsumer<DatabaseC
if (column.targetIndex < 0) {
continue;
}
rowValues[column.targetIndex] = column.valueHandler.fetchValueObject(session, resultSet, column.sourceAttr, i);
rowValues[column.targetIndex] = column.targetValueHandler.getValueFromObject(
session,
column.targetAttr.getTarget(),
column.sourceValueHandler.fetchValueObject(session, resultSet, column.sourceAttr, i),
false);
}
executeBatch.add(rowValues);
......
......@@ -601,7 +601,7 @@
<property name="suppressHeaders" value="false"/>
<parameter name="supports-stored-code" value="false"/>
<file type="license" path="drivers/csvjdbc/LICENSE.txt" url="*"/>
<file type="jar" path="drivers/csvjdbc/csvjdbc-1.0.12.jar" url="*"/>
<file type="jar" path="drivers/csvjdbc/csvjdbc-1.0-23.jar" url="*"/>
<parameter name="embedded" value="true"/>
</driver>
<driver
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册