This is an automated email from the ASF dual-hosted git repository.
github-merge-queue[bot] 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 50e8a0d30d [Fix][Core] Keep the SQL config after a single-line block
comment (#13266)
50e8a0d30d is described below
commit 50e8a0d30db53b6be77509fee8873a2439716171
Author: corgy-w <[email protected]>
AuthorDate: Tue Nov 17 06:52:17 2026 +0000
[Fix][Core] Keep the SQL config after a single-line block comment (#13266)
---
.../seatunnel/config/sql/SqlConfigBuilder.java | 9 ++++++++-
.../seatunnel/config/sql/SqlConfigBuilderTest.java | 20 ++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git
a/seatunnel-config/seatunnel-config-sql/src/main/java/org/apache/seatunnel/config/sql/SqlConfigBuilder.java
b/seatunnel-config/seatunnel-config-sql/src/main/java/org/apache/seatunnel/config/sql/SqlConfigBuilder.java
index 507016f2a8..1b542d9c05 100644
---
a/seatunnel-config/seatunnel-config-sql/src/main/java/org/apache/seatunnel/config/sql/SqlConfigBuilder.java
+++
b/seatunnel-config/seatunnel-config-sql/src/main/java/org/apache/seatunnel/config/sql/SqlConfigBuilder.java
@@ -187,7 +187,14 @@ public class SqlConfigBuilder {
continue;
}
if (line.trim().startsWith(SQL_ANNOTATION_PREFIX)) {
- anno = true;
+ // Only a block comment that stays open starts an annotation
block. A comment that
+ // closes on the same line ("/* ... */") must not, otherwise
every following line
+ // is skipped and the whole config is lost.
+ if (!line.trim()
+ .substring(SQL_ANNOTATION_PREFIX.length())
+ .contains(SQL_ANNOTATION_SUFFIX)) {
+ anno = true;
+ }
continue;
}
if (anno) {
diff --git
a/seatunnel-config/seatunnel-config-sql/src/test/java/org/apache/seatunnel/config/sql/SqlConfigBuilderTest.java
b/seatunnel-config/seatunnel-config-sql/src/test/java/org/apache/seatunnel/config/sql/SqlConfigBuilderTest.java
index 30b3f3ab10..512d8f4501 100644
---
a/seatunnel-config/seatunnel-config-sql/src/test/java/org/apache/seatunnel/config/sql/SqlConfigBuilderTest.java
+++
b/seatunnel-config/seatunnel-config-sql/src/test/java/org/apache/seatunnel/config/sql/SqlConfigBuilderTest.java
@@ -53,4 +53,24 @@ public class SqlConfigBuilderTest {
Assertions.assertEquals("jdbc", sinkConfig.getString("plugin_name"));
Assertions.assertEquals("test09__temp1",
sinkConfig.getString("plugin_input"));
}
+
+ @Test
+ public void testSingleLineBlockCommentDoesNotSwallowTheRestOfTheFile() {
+ String sql =
+ "/* a one-line header comment */\n"
+ + "CREATE TABLE source_table WITH (\n"
+ + " 'connector' = 'FakeSource',\n"
+ + " 'type' = 'source'\n"
+ + ");\n"
+ + "CREATE TABLE sink_table WITH (\n"
+ + " 'connector' = 'Console',\n"
+ + " 'type' = 'sink'\n"
+ + ");\n"
+ + "INSERT INTO sink_table SELECT * FROM source_table;";
+
+ Config config = SqlConfigBuilder.of(sql);
+
+ Assertions.assertEquals(1, config.getConfigList("source").size());
+ Assertions.assertEquals(1, config.getConfigList("sink").size());
+ }
}