Skip to content
This repository has been archived by the owner on Sep 13, 2024. It is now read-only.

Commit

Permalink
DBZ-7874 Consolidate the MariaDB and MySQL dialects
Browse files Browse the repository at this point in the history
  • Loading branch information
@Naros
Naros committed May 24, 2024
1 parent 2647be2 commit b94fd13
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 111 deletions.
111 changes: 1 addition & 110 deletions src/main/java/io/debezium/connector/jdbc/dialect/mysql/MariaDbDatabaseDialect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,9 @@
*/
package io.debezium.connector.jdbc.dialect.mysql;

import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.time.temporal.TemporalAccessor;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;

import org.hibernate.SessionFactory;
import org.hibernate.StatelessSession;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.MariaDBDialect;
import org.slf4j.Logger;
Expand All @@ -26,30 +17,17 @@
import io.debezium.connector.jdbc.SinkRecordDescriptor;
import io.debezium.connector.jdbc.dialect.DatabaseDialect;
import io.debezium.connector.jdbc.dialect.DatabaseDialectProvider;
import io.debezium.connector.jdbc.dialect.GeneralDatabaseDialect;
import io.debezium.connector.jdbc.dialect.SqlStatementBuilder;
import io.debezium.connector.jdbc.relational.TableDescriptor;
import io.debezium.time.ZonedTimestamp;
import io.debezium.util.Strings;

/**
* A {@link DatabaseDialect} implementation for MariaDB.
*
*/
public class MariaDbDatabaseDialect extends GeneralDatabaseDialect {
public class MariaDbDatabaseDialect extends MySqlDatabaseDialect {

private static final Logger LOGGER = LoggerFactory.getLogger(MariaDbDatabaseDialect.class);

private static final List<String> NO_DEFAULT_VALUE_TYPES = Arrays.asList(
"tinytext", "mediumtext", "longtext", "text", "tinyblob", "mediumblob", "longblob");

private static final DateTimeFormatter ISO_LOCAL_DATE_TIME_WITH_SPACE = new DateTimeFormatterBuilder()
.parseCaseInsensitive()
.append(DateTimeFormatter.ISO_LOCAL_DATE)
.appendLiteral(' ')
.append(DateTimeFormatter.ISO_LOCAL_TIME)
.toFormatter();

public static class MariaDbDatabaseDialectProvider implements DatabaseDialectProvider {
@Override
public boolean supports(Dialect dialect) {
Expand All @@ -68,85 +46,8 @@ public DatabaseDialect instantiate(JdbcSinkConnectorConfig config, SessionFactor
}
}

private final boolean connectionTimeZoneSet;

private MariaDbDatabaseDialect(JdbcSinkConnectorConfig config, SessionFactory sessionFactory) {
super(config, sessionFactory);
try (StatelessSession session = sessionFactory.openStatelessSession()) {
this.connectionTimeZoneSet = session.doReturningWork(connection -> connection.getMetaData().getURL().contains("connectionTimeZone="));
}
}

@Override
protected Optional<String> getDatabaseTimeZoneQuery() {
return Optional.of("SELECT @@global.time_zone, @@session.time_zone");
}

@Override
protected String getDatabaseTimeZoneQueryResult(ResultSet rs) throws SQLException {
return rs.getString(1) + " (global), " + rs.getString(2) + " (system)";
}

@Override
public boolean isTimeZoneSet() {
return connectionTimeZoneSet || super.isTimeZoneSet();
}

@Override
public boolean shouldBindTimeWithTimeZoneAsDatabaseTimeZone() {
return true;
}

@Override
protected void registerTypes() {
super.registerTypes();

registerType(BooleanType.INSTANCE);
registerType(BitType.INSTANCE);
registerType(BytesType.INSTANCE);
registerType(EnumType.INSTANCE);
registerType(SetType.INSTANCE);
registerType(MediumIntType.INSTANCE);
registerType(IntegerType.INSTANCE);
registerType(TinyIntType.INSTANCE);
registerType(YearType.INSTANCE);
registerType(JsonType.INSTANCE);
registerType(MapToJsonType.INSTANCE);
registerType(GeometryType.INSTANCE);
registerType(PointType.INSTANCE);
registerType(ZonedTimestampType.INSTANCE);
registerType(ZonedTimeType.INSTANCE);
}

@Override
public int getMaxVarcharLengthInKey() {
return 255;
}

@Override
public String getFormattedTime(TemporalAccessor value) {
return String.format("'%s'", DateTimeFormatter.ISO_LOCAL_TIME.format(value));
}

@Override
public String getFormattedDateTime(TemporalAccessor value) {
return String.format("'%s'", ISO_LOCAL_DATE_TIME_WITH_SPACE.format(value));
}

@Override
public String getFormattedTimestamp(TemporalAccessor value) {
return String.format("'%s'", ISO_LOCAL_DATE_TIME_WITH_SPACE.format(value));
}

@Override
public String getFormattedTimestampWithTimeZone(String value) {
final ZonedDateTime zonedDateTime = ZonedDateTime.parse(value, ZonedTimestamp.FORMATTER);
return String.format("'%s'", DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(zonedDateTime));
}

@Override
public String getAlterTablePrefix() {
return "ADD COLUMN (";
}

/*
Expand Down Expand Up @@ -177,14 +78,4 @@ public String getUpsertStatement(TableDescriptor table, SinkRecordDescriptor rec
return builder.build();
}

@Override
protected void addColumnDefaultValue(SinkRecordDescriptor.FieldDescriptor field, StringBuilder columnSpec) {
final String fieldType = field.getTypeName();
if (!Strings.isNullOrBlank(fieldType)) {
if (NO_DEFAULT_VALUE_TYPES.contains(fieldType.toLowerCase())) {
return;
}
}
super.addColumnDefaultValue(field, columnSpec);
}
}
2 changes: 1 addition & 1 deletion src/main/java/io/debezium/connector/jdbc/dialect/mysql/MySqlDatabaseDialect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public DatabaseDialect instantiate(JdbcSinkConnectorConfig config, SessionFactor

private final boolean connectionTimeZoneSet;

private MySqlDatabaseDialect(JdbcSinkConnectorConfig config, SessionFactory sessionFactory) {
protected MySqlDatabaseDialect(JdbcSinkConnectorConfig config, SessionFactory sessionFactory) {
super(config, sessionFactory);

try (StatelessSession session = sessionFactory.openStatelessSession()) {
Expand Down

0 comments on commit b94fd13

Please sign in to comment.