diff --git a/docs/en/connector-v2/sink/Jdbc.md b/docs/en/connector-v2/sink/Jdbc.md index f845dea6efd5..6398f992142e 100644 --- a/docs/en/connector-v2/sink/Jdbc.md +++ b/docs/en/connector-v2/sink/Jdbc.md @@ -47,7 +47,7 @@ support `Xa transactions`. You can set `is_exactly_once=true` to enable it. | max_commit_attempts | Int | No | 3 | | transaction_timeout_sec | Int | No | -1 | | auto_commit | Boolean | No | true | -| field_ide | String | No | - | +| identifier_case | String | No | - | | common-options | | no | - | ### driver [string] @@ -137,9 +137,9 @@ exactly-once semantics Automatic transaction commit is enabled by default -### field_ide [String] +### identifier_case [String] -The field "field_ide" is used to identify whether the field needs to be converted to uppercase or lowercase when +The field "identifier_case" is used to identify whether the field needs to be converted to uppercase or lowercase when synchronizing from the source to the sink. "ORIGINAL" indicates no conversion is needed, "UPPERCASE" indicates conversion to uppercase, and "LOWERCASE" indicates conversion to lowercase. diff --git a/docs/en/connector-v2/sink/Mysql.md b/docs/en/connector-v2/sink/Mysql.md index 1046db954558..a3d8fa45fcd6 100644 --- a/docs/en/connector-v2/sink/Mysql.md +++ b/docs/en/connector-v2/sink/Mysql.md @@ -78,7 +78,7 @@ semantics (using XA transaction guarantee). | max_commit_attempts | Int | No | 3 | The number of retries for transaction commit failures | | transaction_timeout_sec | Int | No | -1 | The timeout after the transaction is opened, the default is -1 (never timeout). Note that setting the timeout may affect
exactly-once semantics | | auto_commit | Boolean | No | true | Automatic transaction commit is enabled by default | -| field_ide | String | No | - | Identify whether the field needs to be converted when synchronizing from the source to the sink. `ORIGINAL` indicates no conversion is needed;`UPPERCASE` indicates conversion to uppercase;`LOWERCASE` indicates conversion to lowercase. | +| identifier_case | String | No | - | Identify whether the field needs to be converted when synchronizing from the source to the sink. `ORIGINAL` indicates no conversion is needed;`UPPERCASE` indicates conversion to uppercase;`LOWERCASE` indicates conversion to lowercase. | | common-options | | no | - | Sink plugin common parameters, please refer to [Sink Common Options](common-options.md) for details | ### Tips @@ -192,7 +192,7 @@ sink { database = test table = sink_table primary_keys = ["id","name"] - field_ide = UPPERCASE + identifier_case = UPPERCASE } } ``` diff --git a/docs/en/connector-v2/sink/PostgreSql.md b/docs/en/connector-v2/sink/PostgreSql.md index bcc5616f5ea1..3d6238004259 100644 --- a/docs/en/connector-v2/sink/PostgreSql.md +++ b/docs/en/connector-v2/sink/PostgreSql.md @@ -81,7 +81,7 @@ semantics (using XA transaction guarantee). | max_commit_attempts | Int | No | 3 | The number of retries for transaction commit failures | | transaction_timeout_sec | Int | No | -1 | The timeout after the transaction is opened, the default is -1 (never timeout). Note that setting the timeout may affect
exactly-once semantics | | auto_commit | Boolean | No | true | Automatic transaction commit is enabled by default | -| field_ide | String | No | - | Identify whether the field needs to be converted when synchronizing from the source to the sink. `ORIGINAL` indicates no conversion is needed;`UPPERCASE` indicates conversion to uppercase;`LOWERCASE` indicates conversion to lowercase. | +| identifier_case | String | No | - | Identify whether the field needs to be converted when synchronizing from the source to the sink. `ORIGINAL` indicates no conversion is needed;`UPPERCASE` indicates conversion to uppercase;`LOWERCASE` indicates conversion to lowercase. | | common-options | | no | - | Sink plugin common parameters, please refer to [Sink Common Options](common-options.md) for details | ### Tips @@ -198,7 +198,7 @@ sink { database = test table = sink_table primary_keys = ["id","name"] - field_ide = UPPERCASE + identifier_case = UPPERCASE } } ``` diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/config/JdbcOptions.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/config/JdbcOptions.java index b01fc872f31f..55939fcfae62 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/config/JdbcOptions.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/config/JdbcOptions.java @@ -19,7 +19,7 @@ import org.apache.seatunnel.api.configuration.Option; import org.apache.seatunnel.api.configuration.Options; -import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.FieldIdeEnum; +import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.IdentifierCase; import java.math.BigDecimal; import java.util.List; @@ -156,9 +156,9 @@ public interface JdbcOptions { .noDefaultValue() .withDescription("partition num"); - Option FIELD_IDE = - Options.key("field_ide") - .enumType(FieldIdeEnum.class) + Option IDENTIFIER_CASE = + Options.key("identifier_case") + .enumType(IdentifierCase.class) .noDefaultValue() .withDescription("Whether case conversion is required"); } diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialect.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialect.java index e0cf5252a60b..08b44beeea9a 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialect.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialect.java @@ -20,7 +20,7 @@ import org.apache.seatunnel.api.table.catalog.TablePath; import org.apache.seatunnel.connectors.seatunnel.jdbc.config.JdbcSourceConfig; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.converter.JdbcRowConverter; -import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.FieldIdeEnum; +import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.IdentifierCase; import org.apache.commons.lang3.StringUtils; @@ -227,11 +227,11 @@ default String extractTableName(TablePath tablePath) { return tablePath.getSchemaAndTableName(); } - default String getFieldIde(String identifier, String fieldIde) { - if (StringUtils.isEmpty(fieldIde)) { + default String getIdentifierCase(String identifier, String identifierCase) { + if (StringUtils.isEmpty(identifierCase)) { return identifier; } - switch (FieldIdeEnum.valueOf(fieldIde.toUpperCase())) { + switch (IdentifierCase.valueOf(identifierCase.toUpperCase())) { case LOWERCASE: return identifier.toLowerCase(); case UPPERCASE: diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialectLoader.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialectLoader.java index 350a22e20c6c..50142f4ccfb1 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialectLoader.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialectLoader.java @@ -49,7 +49,7 @@ public static JdbcDialect load(String url, String compatibleMode) { * unambiguously process the given database URL. * @return The loaded dialect. */ - public static JdbcDialect load(String url, String compatibleMode, String fieldIde) { + public static JdbcDialect load(String url, String compatibleMode, String identifierCase) { ClassLoader cl = Thread.currentThread().getContextClassLoader(); List foundFactories = discoverFactories(cl); @@ -94,7 +94,7 @@ public static JdbcDialect load(String url, String compatibleMode, String fieldId .collect(Collectors.joining("\n")))); } - return matchingFactories.get(0).create(compatibleMode, fieldIde); + return matchingFactories.get(0).create(compatibleMode, identifierCase); } private static List discoverFactories(ClassLoader classLoader) { diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/dialectenum/FieldIdeEnum.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/dialectenum/IdentifierCase.java similarity index 94% rename from seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/dialectenum/FieldIdeEnum.java rename to seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/dialectenum/IdentifierCase.java index 39f95210623b..fcd67f6d1d60 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/dialectenum/FieldIdeEnum.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/dialectenum/IdentifierCase.java @@ -17,14 +17,14 @@ package org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum; -public enum FieldIdeEnum { +public enum IdentifierCase { ORIGINAL("original"), // Original string form UPPERCASE("uppercase"), // Convert to uppercase LOWERCASE("lowercase"); // Convert to lowercase private final String value; - FieldIdeEnum(String value) { + IdentifierCase(String value) { this.value = value; } diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlDialectFactory.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlDialectFactory.java index a4f89a4dc857..f93bb0ef125b 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlDialectFactory.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlDialectFactory.java @@ -38,7 +38,7 @@ public JdbcDialect create() { } @Override - public JdbcDialect create(@Nonnull String compatibleMode, String fieldIde) { - return new MysqlDialect(fieldIde); + public JdbcDialect create(@Nonnull String compatibleMode, String identifierCase) { + return new MysqlDialect(identifierCase); } } diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlDialect.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlDialect.java index 1ae69a6131f5..2113d517365f 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlDialect.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlDialect.java @@ -21,7 +21,7 @@ import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.converter.JdbcRowConverter; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialect; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialectTypeMapper; -import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.FieldIdeEnum; +import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.IdentifierCase; import java.sql.Connection; import java.sql.PreparedStatement; @@ -32,12 +32,12 @@ import java.util.stream.Collectors; public class MysqlDialect implements JdbcDialect { - public String fieldIde = FieldIdeEnum.ORIGINAL.getValue(); + public String identifierCase = IdentifierCase.ORIGINAL.getValue(); public MysqlDialect() {} - public MysqlDialect(String fieldIde) { - this.fieldIde = fieldIde; + public MysqlDialect(String identifierCase) { + this.identifierCase = identifierCase; } @Override @@ -57,7 +57,7 @@ public JdbcDialectTypeMapper getJdbcDialectTypeMapper() { @Override public String quoteIdentifier(String identifier) { - return "`" + getFieldIde(identifier, fieldIde) + "`"; + return "`" + getIdentifierCase(identifier, identifierCase) + "`"; } @Override diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseDialectFactory.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseDialectFactory.java index b3a456870cc3..9dd138568d2b 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseDialectFactory.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseDialectFactory.java @@ -40,7 +40,7 @@ public JdbcDialect create() { } @Override - public JdbcDialect create(@Nonnull String compatibleMode, String fieldIde) { + public JdbcDialect create(@Nonnull String compatibleMode, String identifierCase) { if ("oracle".equalsIgnoreCase(compatibleMode)) { return new OracleDialect(); } diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleDialect.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleDialect.java index e8e583dc143c..31e79de0da2b 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleDialect.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleDialect.java @@ -20,7 +20,7 @@ import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.converter.JdbcRowConverter; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialect; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialectTypeMapper; -import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.FieldIdeEnum; +import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.IdentifierCase; import java.sql.Connection; import java.sql.PreparedStatement; @@ -34,10 +34,10 @@ public class OracleDialect implements JdbcDialect { private static final int DEFAULT_ORACLE_FETCH_SIZE = 128; - public String fieldIde = FieldIdeEnum.ORIGINAL.getValue(); + public String identifierCase = IdentifierCase.ORIGINAL.getValue(); - public OracleDialect(String fieldIde) { - this.fieldIde = fieldIde; + public OracleDialect(String identifierCase) { + this.identifierCase = identifierCase; } public OracleDialect() {} @@ -71,11 +71,11 @@ public String quoteIdentifier(String identifier) { sb.append("\"").append(parts[i]).append("\"").append("."); } return sb.append("\"") - .append(getFieldIde(parts[parts.length - 1], fieldIde)) + .append(getIdentifierCase(parts[parts.length - 1], identifierCase)) .append("\"") .toString(); } - return "\"" + getFieldIde(identifier, fieldIde) + "\""; + return "\"" + getIdentifierCase(identifier, identifierCase) + "\""; } @Override diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleDialectFactory.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleDialectFactory.java index 121098c46147..1ded299bcb57 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleDialectFactory.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleDialectFactory.java @@ -38,7 +38,7 @@ public JdbcDialect create() { } @Override - public JdbcDialect create(@Nonnull String compatibleMode, String fieldIde) { - return new OracleDialect(fieldIde); + public JdbcDialect create(@Nonnull String compatibleMode, String identifierCase) { + return new OracleDialect(identifierCase); } } diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresDialect.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresDialect.java index f206589af59e..d2ae92fca122 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresDialect.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresDialect.java @@ -20,7 +20,7 @@ import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.converter.JdbcRowConverter; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialect; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialectTypeMapper; -import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.FieldIdeEnum; +import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.IdentifierCase; import java.sql.Connection; import java.sql.PreparedStatement; @@ -34,12 +34,12 @@ public class PostgresDialect implements JdbcDialect { public static final int DEFAULT_POSTGRES_FETCH_SIZE = 128; - public String fieldIde = FieldIdeEnum.ORIGINAL.getValue(); + public String identifierCase = IdentifierCase.ORIGINAL.getValue(); public PostgresDialect() {} - public PostgresDialect(String fieldIde) { - this.fieldIde = fieldIde; + public PostgresDialect(String identifierCase) { + this.identifierCase = identifierCase; } @Override @@ -113,12 +113,12 @@ public String quoteIdentifier(String identifier) { sb.append("\"").append(parts[i]).append("\"").append("."); } return sb.append("\"") - .append(getFieldIde(parts[parts.length - 1], fieldIde)) + .append(getIdentifierCase(parts[parts.length - 1], identifierCase)) .append("\"") .toString(); } - return "\"" + getFieldIde(identifier, fieldIde) + "\""; + return "\"" + getIdentifierCase(identifier, identifierCase) + "\""; } @Override diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresDialectFactory.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresDialectFactory.java index 59dc0b45c682..5eeb7e2ff139 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresDialectFactory.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresDialectFactory.java @@ -39,10 +39,10 @@ public JdbcDialect create() { } @Override - public JdbcDialect create(@Nonnull String compatibleMode, String fieldIde) { + public JdbcDialect create(@Nonnull String compatibleMode, String identifierCase) { if ("postgresLow".equalsIgnoreCase(compatibleMode)) { - return new PostgresLowDialect(fieldIde); + return new PostgresLowDialect(identifierCase); } - return new PostgresDialect(fieldIde); + return new PostgresDialect(identifierCase); } } diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psqllow/PostgresLowDialect.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psqllow/PostgresLowDialect.java index 9100382628dc..bd604f586452 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psqllow/PostgresLowDialect.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psqllow/PostgresLowDialect.java @@ -23,8 +23,8 @@ public class PostgresLowDialect extends PostgresDialect { - public PostgresLowDialect(String fieldIde) { - this.fieldIde = fieldIde; + public PostgresLowDialect(String identifierCase) { + this.identifierCase = identifierCase; } @Override diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/sqlserver/SqlServerDialect.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/sqlserver/SqlServerDialect.java index 792c03bd7606..13f3af1ed785 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/sqlserver/SqlServerDialect.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/sqlserver/SqlServerDialect.java @@ -20,7 +20,7 @@ import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.converter.JdbcRowConverter; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialect; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialectTypeMapper; -import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.FieldIdeEnum; +import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.IdentifierCase; import java.util.Arrays; import java.util.List; @@ -29,12 +29,12 @@ public class SqlServerDialect implements JdbcDialect { - public String fieldIde = FieldIdeEnum.ORIGINAL.getValue(); + public String identifierCase = IdentifierCase.ORIGINAL.getValue(); public SqlServerDialect() {} - public SqlServerDialect(String fieldIde) { - this.fieldIde = fieldIde; + public SqlServerDialect(String identifierCase) { + this.identifierCase = identifierCase; } @Override @@ -125,12 +125,12 @@ public String quoteIdentifier(String identifier) { sb.append("[").append(parts[i]).append("]").append("."); } return sb.append("[") - .append(getFieldIde(parts[parts.length - 1], fieldIde)) + .append(getIdentifierCase(parts[parts.length - 1], identifierCase)) .append("]") .toString(); } - return "[" + getFieldIde(identifier, fieldIde) + "]"; + return "[" + getIdentifierCase(identifier, identifierCase) + "]"; } @Override diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/sqlserver/SqlServerDialectFactory.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/sqlserver/SqlServerDialectFactory.java index d7dae4efd573..ec09800c2953 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/sqlserver/SqlServerDialectFactory.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/sqlserver/SqlServerDialectFactory.java @@ -38,7 +38,7 @@ public JdbcDialect create() { } @Override - public JdbcDialect create(@Nonnull String compatibleMode, String fieldIde) { - return new SqlServerDialect(fieldIde); + public JdbcDialect create(@Nonnull String compatibleMode, String identifierCase) { + return new SqlServerDialect(identifierCase); } } diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/sink/JdbcSink.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/sink/JdbcSink.java index 8fd97ebaeacb..0480a1398d71 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/sink/JdbcSink.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/sink/JdbcSink.java @@ -43,7 +43,7 @@ import org.apache.seatunnel.connectors.seatunnel.jdbc.exception.JdbcConnectorException; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialect; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialectLoader; -import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.FieldIdeEnum; +import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.IdentifierCase; import org.apache.seatunnel.connectors.seatunnel.jdbc.state.JdbcAggregatedCommitInfo; import org.apache.seatunnel.connectors.seatunnel.jdbc.state.JdbcSinkState; import org.apache.seatunnel.connectors.seatunnel.jdbc.state.XidInfo; @@ -110,9 +110,9 @@ public void prepare(Config pluginConfig) throws PrepareFailException { JdbcDialectLoader.load( jdbcSinkConfig.getJdbcConnectionConfig().getUrl(), jdbcSinkConfig.getJdbcConnectionConfig().getCompatibleMode(), - config.get(JdbcOptions.FIELD_IDE) == null - ? FieldIdeEnum.ORIGINAL.getValue() - : config.get(JdbcOptions.FIELD_IDE).getValue()); + config.get(JdbcOptions.IDENTIFIER_CASE) == null + ? IdentifierCase.ORIGINAL.getValue() + : config.get(JdbcOptions.IDENTIFIER_CASE).getValue()); this.dataSaveMode = DataSaveMode.KEEP_SCHEMA_AND_DATA; } diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/sink/JdbcSinkFactory.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/sink/JdbcSinkFactory.java index fb995f082f5f..4f2c65a4277b 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/sink/JdbcSinkFactory.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/sink/JdbcSinkFactory.java @@ -34,7 +34,7 @@ import org.apache.seatunnel.connectors.seatunnel.jdbc.config.JdbcSinkConfig; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialect; import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialectLoader; -import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.FieldIdeEnum; +import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.dialectenum.IdentifierCase; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -144,14 +144,14 @@ public TableSink createSink(TableFactoryContext context) { } final ReadonlyConfig options = config; JdbcSinkConfig sinkConfig = JdbcSinkConfig.of(config); - FieldIdeEnum fieldIdeEnum = config.get(JdbcOptions.FIELD_IDE); + IdentifierCase identifierCase = config.get(JdbcOptions.IDENTIFIER_CASE); JdbcDialect dialect = JdbcDialectLoader.load( sinkConfig.getJdbcConnectionConfig().getUrl(), sinkConfig.getJdbcConnectionConfig().getCompatibleMode(), - fieldIdeEnum == null - ? FieldIdeEnum.ORIGINAL.getValue() - : fieldIdeEnum.getValue()); + identifierCase == null + ? IdentifierCase.ORIGINAL.getValue() + : identifierCase.getValue()); CatalogTable finalCatalogTable = catalogTable; return () -> new JdbcSink( diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/resources/jdbc_postgres_ide_source_and_sink.conf b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/resources/jdbc_postgres_ide_source_and_sink.conf index 52f9c065700c..357c64aaf70a 100644 --- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/resources/jdbc_postgres_ide_source_and_sink.conf +++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/resources/jdbc_postgres_ide_source_and_sink.conf @@ -40,7 +40,7 @@ sink { user = test password = test generate_sink_sql = true - field_ide = UPPERCASE + identifier_case = UPPERCASE database = test table = "public.PG_IDE_SINK_TABLE" primary_keys = ["gid"]