You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2017/07/18 18:16:51 UTC
[1/2] incubator-trafodion git commit: TRAFODION-2686 fix
setCurSorName does not work
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 11861b4ed -> 270b04f32
TRAFODION-2686 fix setCurSorName does not work
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a20d74fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a20d74fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a20d74fb
Branch: refs/heads/master
Commit: a20d74fb8ed21828a96c673ff978fc3c15b3bd17
Parents: 54b7391
Author: luoyunpeng <95...@qq.com>
Authored: Wed Jul 12 18:08:35 2017 +0800
Committer: luoyunpeng <95...@qq.com>
Committed: Wed Jul 12 18:08:35 2017 +0800
----------------------------------------------------------------------
.../src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java | 2 +-
.../src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a20d74fb/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
index 55f31ac..33bf611 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
@@ -924,7 +924,7 @@ public class TrafT4ResultSet extends TrafT4Handle implements java.sql.ResultSet
} else if (stmt_ != null) {
String cursorName;
cursorName = stmt_.cursorName_;
- if (cursorName == null) {
+ if (cursorName == null || cursorName.trim().equals("")) {
cursorName = stmt_.stmtLabel_;
}
return cursorName;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a20d74fb/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
index 9e16f22..da6e843 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
@@ -1247,7 +1247,7 @@ public class TrafT4Statement extends TrafT4Handle implements java.sql.Statement
if (desc == null) {
resultSet_[i] = null;
} else {
- resultSet_[i] = new TrafT4ResultSet(this, desc, stmt_labels[i], true);
+ resultSet_[i] = new TrafT4ResultSet(this, desc, stmt_labels[i], this.sqlStmtType_==TRANSPORT.TYPE_CALL);
resultSet_[i].proxySyntax_ = proxySyntax[i];
}
}
[2/2] incubator-trafodion git commit: Merge PR 1175 TRAFODION-2686
fix setCurSorName does not work
Posted by se...@apache.org.
Merge PR 1175 TRAFODION-2686 fix setCurSorName does not work
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/270b04f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/270b04f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/270b04f3
Branch: refs/heads/master
Commit: 270b04f32824661c67a7dd2c62ab6215f2085cad
Parents: 11861b4 a20d74f
Author: selvaganesang <se...@apache.org>
Authored: Tue Jul 18 18:16:29 2017 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Tue Jul 18 18:16:29 2017 +0000
----------------------------------------------------------------------
.../src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java | 2 +-
.../src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/270b04f3/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4ResultSet.java
----------------------------------------------------------------------