This is an automated email from the ASF dual-hosted git repository.
liugddx pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 2769ed5029 [Hotfix][Connector] Fix jdbc compile error (#7359)
2769ed5029 is described below
commit 2769ed5029efc44891552725437e35d86a0eb93f
Author: hailin0 <[email protected]>
AuthorDate: Sat Aug 10 09:58:03 2024 +0800
[Hotfix][Connector] Fix jdbc compile error (#7359)
---
.../jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java | 6 ++++--
.../oceanbase/OceanBaseMysqlCreateTableSqlBuilder.java | 14 +++++++++-----
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
index 08aa0faea0..b876e33cc8 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
@@ -182,8 +182,10 @@ public class OceanBaseMySqlCatalog extends
AbstractJdbcCatalog {
}
@Override
- protected String getCreateTableSql(TablePath tablePath, CatalogTable
table) {
- return OceanBaseMysqlCreateTableSqlBuilder.builder(tablePath, table,
typeConverter)
+ protected String getCreateTableSql(
+ TablePath tablePath, CatalogTable table, boolean createIndex) {
+ return OceanBaseMysqlCreateTableSqlBuilder.builder(
+ tablePath, table, typeConverter, createIndex)
.build(table.getCatalogName());
}
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMysqlCreateTableSqlBuilder.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMysqlCreateTableSqlBuilder.java
index bc3413dbd8..9707ff23ac 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMysqlCreateTableSqlBuilder.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMysqlCreateTableSqlBuilder.java
@@ -60,25 +60,29 @@ public class OceanBaseMysqlCreateTableSqlBuilder {
private String fieldIde;
private final OceanBaseMySqlTypeConverter typeConverter;
+ private boolean createIndex;
private OceanBaseMysqlCreateTableSqlBuilder(
- String tableName, OceanBaseMySqlTypeConverter typeConverter) {
+ String tableName, OceanBaseMySqlTypeConverter typeConverter,
boolean createIndex) {
checkNotNull(tableName, "tableName must not be null");
this.tableName = tableName;
this.typeConverter = typeConverter;
+ this.createIndex = createIndex;
}
public static OceanBaseMysqlCreateTableSqlBuilder builder(
TablePath tablePath,
CatalogTable catalogTable,
- OceanBaseMySqlTypeConverter typeConverter) {
+ OceanBaseMySqlTypeConverter typeConverter,
+ boolean createIndex) {
checkNotNull(tablePath, "tablePath must not be null");
checkNotNull(catalogTable, "catalogTable must not be null");
TableSchema tableSchema = catalogTable.getTableSchema();
checkNotNull(tableSchema, "tableSchema must not be null");
- return new
OceanBaseMysqlCreateTableSqlBuilder(tablePath.getTableName(), typeConverter)
+ return new OceanBaseMysqlCreateTableSqlBuilder(
+ tablePath.getTableName(), typeConverter, createIndex)
.comment(catalogTable.getComment())
// todo: set charset and collate
.engine(null)
@@ -158,10 +162,10 @@ public class OceanBaseMysqlCreateTableSqlBuilder {
for (Column column : columns) {
columnSqls.add("\t" + buildColumnIdentifySql(column, catalogName,
columnTypeMap));
}
- if (primaryKey != null) {
+ if (createIndex && primaryKey != null) {
columnSqls.add("\t" + buildPrimaryKeySql());
}
- if (CollectionUtils.isNotEmpty(constraintKeys)) {
+ if (createIndex && CollectionUtils.isNotEmpty(constraintKeys)) {
for (ConstraintKey constraintKey : constraintKeys) {
if (StringUtils.isBlank(constraintKey.getConstraintName())) {
continue;