Skip to content

[Improve][Connector-jdbc] add comments when schema not include all columns #9559

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

Merged
Hisoka-X merged 6 commits into from
Jul 14, 2025
Merged

[Improve][Connector-jdbc] add comments when schema not include all columns #9559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3ae81d
[improve][Connector-jdbc] add comments when schema not include all co…
Jul 9, 2025
308def2
[improve][Connector-jdbc] add comments when schema not include all co…
Jul 9, 2025
d343419
Merge branch 'dev' into connectors-jdbc-comments
Jul 10, 2025
aa1b272
trigger flow
Jul 10, 2025
49a47ad
trigger flow
Jul 10, 2025
30f8b06
trigger flow
Jul 10, 2025
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
38 changes: 37 additions & 1 deletion .../src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcCatalogUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.seatunnel.api.table.catalog.CatalogTable;
import org.apache.seatunnel.api.table.catalog.Column;
import org.apache.seatunnel.api.table.catalog.ConstraintKey;
import org.apache.seatunnel.api.table.catalog.PhysicalColumn;
import org.apache.seatunnel.api.table.catalog.PrimaryKey;
import org.apache.seatunnel.api.table.catalog.TableIdentifier;
import org.apache.seatunnel.api.table.catalog.TablePath;
Expand Down Expand Up @@ -319,13 +320,48 @@ static CatalogTable mergeCatalogTable(CatalogTable tableOfPath, CatalogTable tab
tableOfPath.getTableId().getDatabaseName(),
tableOfPath.getTableId().getSchemaName(),
tableOfPath.getTableId().getTableName());
List<Column> columnsWithComment =

This comment was marked as off-topic.

Sign in to view

tableSchemaOfQuery.getColumns().stream()
.map(
column -> {
return columnsOfPath.containsKey(column.getName())
&& columnsOfPath
.get(column.getName())
.getDataType()
.getSqlType()
.equals(
columnsOfQuery
.get(column.getName())
.getDataType()
Comment on lines +333 to +335
Copy link

Copilot AI Jul 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] The comparison looks up columnsOfQuery.get(column.getName()), but column is already from that source. You can simplify by calling column.getDataType().getSqlType() directly to avoid the redundant map lookup.

Suggested change
columnsOfQuery
.get(column.getName())
.getDataType()
column.getDataType()

Copilot uses AI. Check for mistakes.
.getSqlType())
? PhysicalColumn.of(
column.getName(),
column.getDataType(),
column.getColumnLength() == null
? null
: Math.toIntExact(
column.getColumnLength()),
column.isNullable(),
column.getDefaultValue(),
columnsOfPath
.get(column.getName())
.getComment(),
column.getSourceType(),
column.isUnsigned(),
column.isZeroFill(),
column.getBitLen(),
column.getOptions(),
column.getLongColumnLength())
: column;
})
.collect(Collectors.toList());
CatalogTable mergedCatalogTable =
CatalogTable.of(
tableIdentifier,
TableSchema.builder()
.primaryKey(primaryKeyOfMerge)
.constraintKey(constraintKeysOfMerge)
.columns(tableSchemaOfQuery.getColumns())
.columns(columnsWithComment)
.build(),
tableOfPath.getOptions(),
partitionKeysOfMerge,
Expand Down
12 changes: 6 additions & 6 deletions .../test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcCatalogUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class JdbcCatalogUtilsTest {
null,
false,
null,
null,
"f1 comment",
"int unsigned",
false,
false,
Expand All @@ -81,7 +81,7 @@ public class JdbcCatalogUtilsTest {
10,
false,
null,
null,
"f2 comment",
"varchar(10)",
false,
false,
Expand All @@ -95,7 +95,7 @@ public class JdbcCatalogUtilsTest {
20,
false,
null,
null,
"f3 comment",
"varchar(20)",
false,
false,
Expand Down Expand Up @@ -261,7 +261,7 @@ public void testColumnNotIncludeMerge() {
null,
true,
null,
null,
"f1 comment",
null,
false,
false,
Expand All @@ -275,7 +275,7 @@ public void testColumnNotIncludeMerge() {
10,
true,
null,
null,
"f2 comment",
null,
false,
false,
Expand All @@ -289,7 +289,7 @@ public void testColumnNotIncludeMerge() {
20,
false,
null,
null,
"f3 comment",
null,
false,
false,
Expand Down