This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch 1.3.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.3-release by this push:
new 4087485 [Fix-3549] [Server][sqlTask]The alias column in the query SQL
does not take effect (#3786)
4087485 is described below
commit 40874854164ce192b88e7cf98605f61145d17084
Author: qiaozhanwei <[email protected]>
AuthorDate: Tue Sep 22 14:11:34 2020 +0800
[Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take
effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* [Fix-3616][Server] when worker akc/response master exception , async retry
* The batch delete function in the workflow definition and workflow
instance pages cannot be canceled if selected.
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not
take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not
take effect
* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not
take effect
Co-authored-by: qiaozhanwei <[email protected]>
Co-authored-by: zhuangchong <[email protected]>
Co-authored-by: JinyLeeChina
<[email protected]>
---
.../org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
index 56177e1..c742b7e 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@@ -262,7 +262,7 @@ public class SqlTask extends AbstractTask {
while (rowCount < LIMIT && resultSet.next()) {
JSONObject mapOfColValues = new JSONObject(true);
for (int i = 1; i <= num; i++) {
- mapOfColValues.put(md.getColumnName(i),
resultSet.getObject(i));
+ mapOfColValues.put(md.getColumnLabel(i),
resultSet.getObject(i));
}
resultJSONArray.add(mapOfColValues);
rowCount++;
