github/DataX
5
0
Fork 0
mirror of https://github.com/alibaba/DataX.git synced 2025-05-02 21:43:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 692a95692d into 0824b45c5e

Browse Source
This commit is contained in:
justdba 2025-04-10 16:21:54 +08:00 committed by GitHub
commit f7a22d34e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/java/com/alibaba/datax/common/element/DateColumn.java
View File

@ -98,6 +98,7 @@ public class DateColumn extends Column {
* */ * */
public DateColumn(final java.sql.Timestamp ts) { public DateColumn(final java.sql.Timestamp ts) {
this(ts == null ? null : ts.getTime()); this(ts == null ? null : ts.getTime());
this.setRawNano(ts == null ? 0 : ts.getNanos());
this.setSubType(DateType.DATETIME); this.setSubType(DateType.DATETIME);
} }
@ -123,8 +124,10 @@ public class DateColumn extends Column {
if (null == this.getRawData()) { if (null == this.getRawData()) {
return null; return null;
} }
java.sql.Timestamp myts = new java.sql.Timestamp((Long) this.getRawData());
return new Date((Long)this.getRawData()); myts.setNanos(this.getRawNano());
return myts;
// return new Date((Long)this.getRawData());
} }
@Override @Override
@ -169,4 +172,14 @@ public class DateColumn extends Column {
public void setSubType(DateType subType) { public void setSubType(DateType subType) {
this.subType = subType; this.subType = subType;
} }
public int getRawNano(){
return rawNano;
}
public void setRawNano(int rawNano){
this.rawNano = rawNano;
}
}
} }

4
plugin-rdbms-util/src/main/java/com/alibaba/datax/plugin/rdbms/reader/util/SingleTableSplitUtil.java
View File

@ -305,8 +305,8 @@ public class SingleTableSplitUtil {
String pkRangeSQL = String.format(minMaxTemplate, splitPK, splitPK, String pkRangeSQL = String.format(minMaxTemplate, splitPK, splitPK,
table); table);
if (StringUtils.isNotBlank(where)) { if (StringUtils.isNotBlank(where)) {
pkRangeSQL = String.format("%s WHERE (%s AND %s IS NOT NULL)", pkRangeSQL = String.format("%s WHERE (%s)",
pkRangeSQL, where, splitPK); pkRangeSQL, where);
} }
return pkRangeSQL; return pkRangeSQL;
} }

15
plugin-rdbms-util/src/main/java/com/alibaba/datax/plugin/rdbms/writer/CommonRdbmsWriter.java
View File

@ -507,17 +507,20 @@ public class CommonRdbmsWriter {
case Types.TIMESTAMP: case Types.TIMESTAMP:
java.sql.Timestamp sqlTimestamp = null; java.sql.Timestamp sqlTimestamp = null;
java.sql.Timestamp tsNano = null;
try { try {
utilDate = column.asDate(); // utilDate = column.asDate();
tsNano = (java.sql.Timestamp)(column.asDate());
} catch (DataXException e) { } catch (DataXException e) {
throw new SQLException(String.format( throw new SQLException(String.format(
"TIMESTAMP 类型转换错误：[%s]", column)); "TIMESTAMP 类型转换错误：[%s]", column));
} }
if (null != utilDate) { // if (null != utilDate) {
sqlTimestamp = new java.sql.Timestamp( // sqlTimestamp = new java.sql.Timestamp(
utilDate.getTime()); // utilDate.getTime());
} // }
sqlTimestamp=tsNano;
preparedStatement.setTimestamp(columnIndex + 1, sqlTimestamp); preparedStatement.setTimestamp(columnIndex + 1, sqlTimestamp);
break; break;
@ -536,7 +539,7 @@ public class CommonRdbmsWriter {
// warn: bit(1) -> Types.BIT 可使用setBoolean // warn: bit(1) -> Types.BIT 可使用setBoolean
// warn: bit(>1) -> Types.VARBINARY 可使用setBytes // warn: bit(>1) -> Types.VARBINARY 可使用setBytes
case Types.BIT: case Types.BIT:
if (this.dataBaseType == DataBaseType.MySql) { if (this.dataBaseType == DataBaseType.MySql || this.dataBaseType == DataBaseType.OceanBase) {
preparedStatement.setBoolean(columnIndex + 1, column.asBoolean()); preparedStatement.setBoolean(columnIndex + 1, column.asBoolean());
} else { } else {
preparedStatement.setString(columnIndex + 1, column.asString()); preparedStatement.setString(columnIndex + 1, column.asString());