Skip to content

[Fix-17451]Fix Parameter passing feature is unavailable in SQL Task #17456

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
SbloodyS merged 5 commits into from
Sep 17, 2025
Merged

[Fix-17451]Fix Parameter passing feature is unavailable in SQL Task #17456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e01dc6
ddd the closureTaskContext method for the closing task and add varPoo…
Aug 27, 2025
fe4a770
./mvnw spotless:apply
Aug 28, 2025
560e97a
fix sql varPool not work
Sep 4, 2025
4694bb8
remove chinese comments
Sep 5, 2025
ea3209b
Merge branch 'dev' into fix-parameter
SbloodyS Sep 17, 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
3 changes: 3 additions & 0 deletions ...scheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ public void executeFuncAndSql(List<SqlBinds> mainStatementsBinds,

// post execute
executeUpdate(connection, postStatementsBinds, "post");

// set varPool
taskExecutionContext.setVarPool(sqlParameters.getVarPool());
} catch (Exception e) {
log.error("execute sql error: {}", e.getMessage());
throw e;
Expand Down
24 changes: 24 additions & 0 deletions ...duler-task-sql/src/test/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.dolphinscheduler.plugin.task.api.enums.Direct;
import org.apache.dolphinscheduler.plugin.task.api.enums.ResourceType;
import org.apache.dolphinscheduler.plugin.task.api.model.Property;
import org.apache.dolphinscheduler.plugin.task.api.parameters.SqlParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.DataSourceParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper;
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
Expand Down Expand Up @@ -173,4 +174,27 @@ void testReplacingSqlHasQuestionMarkAndParams() {
Assertions.assertEquals(4, sqlParamsMap.size());
Assertions.assertEquals(expected, formatSql);
}

@Test
void testVarPoolSetting() {
SqlParameters sqlParameters = new SqlParameters();
sqlParameters.setType("HIVE");
sqlParameters.setDatasource(1);
sqlParameters.setSql("select id, name from user where id = 1");

Property outParam = new Property("id", Direct.OUT, DataType.VARCHAR, "");
sqlParameters.setLocalParams(Lists.newArrayList(outParam));

String sqlResult = "[{\"id\":\"1\",\"name\":\"test_user\"}]";

sqlParameters.dealOutParam(sqlResult);

Assertions.assertNotNull(sqlParameters.getVarPool());
Assertions.assertEquals(1, sqlParameters.getVarPool().size());

Property varPoolParam = sqlParameters.getVarPool().get(0);
Assertions.assertEquals("id", varPoolParam.getProp());
Assertions.assertEquals("1", varPoolParam.getValue());
Assertions.assertEquals(Direct.OUT, varPoolParam.getDirect());
}
}
Loading