Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

handle io.debezium.time.ZonedTimestamp schema name #1361

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

handle io.debezium.time.ZonedTimestamp schema name #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/main/java/io/confluent/connect/jdbc/dialect/GenericDatabaseDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
package io.confluent.connect.jdbc.dialect;

import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.TimeZone;

import org.apache.kafka.common.config.AbstractConfig;
Expand Down Expand Up @@ -114,6 +116,15 @@ public class GenericDatabaseDialect implements DatabaseDialect {

private static final String PRECISION_FIELD = "connect.decimal.precision";


/**
* The ISO date-time format includes the date, time (including fractional parts),
* and offset from UTC, such as '2011-12-03T10:15:30.030431+01:00'.
*/
public static final DateTimeFormatter ZONED_DATE_TIME_FORMATTER =
DateTimeFormatter.ISO_OFFSET_DATE_TIME;


/**
* The provider for {@link GenericDatabaseDialect}.
*/
Expand Down Expand Up @@ -1751,6 +1762,10 @@ protected boolean maybeBindLogical(
DateTimeUtils.getTimeZoneCalendar(timeZone)
);
return true;
case "io.debezium.time.ZonedTimestamp":
ZonedDateTime zonedDateTime = (ZonedDateTime) value;
statement.setObject(index, zonedDateTime.toOffsetDateTime());
return true;
default:
return false;
}
Expand Down Expand Up @@ -1906,6 +1921,9 @@ protected void formatColumnValue(
DateTimeUtils.formatTimestamp((java.util.Date) value, timeZone)
);
return;
case "io.debezium.time.ZonedTimestamp":
builder.appendStringQuoted(ZonedDateTime.parse((String)value, ZONED_DATE_TIME_FORMATTER));
return;
default:
// fall through to regular types
break;
Expand Down
23 changes: 23 additions & 0 deletions src/main/java/io/confluent/connect/jdbc/dialect/PostgreSqlDatabaseDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
import java.time.ZonedDateTime;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -307,6 +308,8 @@ protected String getSqlType(SinkRecordField field) {
return "TIME";
case Timestamp.LOGICAL_NAME:
return "TIMESTAMP";
case "io.debezium.time.ZonedTimestamp":
return "TIMESTAMPTZ";
default:
// fall through to normal types
}
Expand Down Expand Up @@ -433,6 +436,26 @@ public String buildUpsertQueryStatement(
return builder.toString();
}

@Override
public void bindField(
PreparedStatement statement,
int index,
Schema schema,
Object value,
ColumnDefinition colDef
) throws SQLException {
if (schema != null
&& "io.debezium.time.ZonedTimestamp".equals(schema.name())
&& value != null) {
ZonedDateTime zonedDateTimeValue = ZonedDateTime.parse(
(String)value, ZONED_DATE_TIME_FORMATTER
);
super.bindField(statement, index, schema, zonedDateTimeValue, colDef);
} else {
super.bindField(statement, index, schema, value, colDef);
}
}

@Override
protected void formatColumnValue(
ExpressionBuilder builder,
Expand Down