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 2015/12/17 06:22:50 UTC
[1/2] incubator-trafodion git commit: - Status message for UPSERT
statement reports the number of records that are inserted - Fix to close the
statement object after execution (execdirect)
Repository: incubator-trafodion
Updated Branches:
refs/heads/master dd1b373c5 -> e188f6968
- Status message for UPSERT statement reports the number of records that are inserted
- Fix to close the statement object after execution (execdirect)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8617ad9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8617ad9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8617ad9c
Branch: refs/heads/master
Commit: 8617ad9cedf4ae721ed1a428ba11455164f50f10
Parents: d95f8ff
Author: Anuradha Hegde <he...@edev06.esgyn.local>
Authored: Mon Dec 14 23:57:46 2015 +0000
Committer: Anuradha Hegde <he...@edev06.esgyn.local>
Committed: Mon Dec 14 23:57:46 2015 +0000
----------------------------------------------------------------------
core/conn/trafci/src/org/trafodion/ci/DatabaseQuery.java | 4 ++--
.../trafodion/ci/Properties/trafciDefaultLookAndFeel.properties | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8617ad9c/core/conn/trafci/src/org/trafodion/ci/DatabaseQuery.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/DatabaseQuery.java b/core/conn/trafci/src/org/trafodion/ci/DatabaseQuery.java
index 1afaf7f..eb04fd8 100644
--- a/core/conn/trafci/src/org/trafodion/ci/DatabaseQuery.java
+++ b/core/conn/trafci/src/org/trafodion/ci/DatabaseQuery.java
@@ -1137,7 +1137,6 @@ public class DatabaseQuery extends QueryWrapper
sessObj.setCurrentStmtObj(null);
super.setQueryRowCount(ps);
sessObj.setQryEndTime();
-
}
resetQryObj();
@@ -1156,7 +1155,6 @@ public class DatabaseQuery extends QueryWrapper
if (qryObj.getQueryId()==SessionDefaults.SHOW_SERVICE)
return;
fetchResults(stmt.getResultSet());
-
}
else
{
@@ -1166,6 +1164,8 @@ public class DatabaseQuery extends QueryWrapper
sessObj.setQryEndTime();
}
+ stmt.close();
+ sessObj.setStmtObj(sessObj.getConnObj().createStatement());
resetQryObj();
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8617ad9c/core/conn/trafci/src/org/trafodion/ci/Properties/trafciDefaultLookAndFeel.properties
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/Properties/trafciDefaultLookAndFeel.properties b/core/conn/trafci/src/org/trafodion/ci/Properties/trafciDefaultLookAndFeel.properties
index 95dc2aa..d867795 100644
--- a/core/conn/trafci/src/org/trafodion/ci/Properties/trafciDefaultLookAndFeel.properties
+++ b/core/conn/trafci/src/org/trafodion/ci/Properties/trafciDefaultLookAndFeel.properties
@@ -43,6 +43,7 @@ SQL_\\(\\s*SELECT_LIST_COUNT\ .*=---\ @rownum@ row(s)\ selected. LIST_COUNT was
SQL_\\(\\s*VALUES.*=---\ @rownum@ row(s)\ selected.
SQL_SEL\ .*=---\ @rownum@ row(s)\ selected.
SQL_UPDATE\ .*=---\ @rownum@ row(s)\ updated.
+SQL_UPSERT\ .*=---\ @rownum@ row(s)\ inserted.
SQL_UPDATE\ STATISTICS\ .*=---\ SQL\ operation\ complete.
SQL_LOCK\ .*\ FOR\ ACCESS\ INS\ .*=---\ @rownum@ row(s)\ inserted.
SQL_LOCK\ .*\ FOR\ ACCESS\ INSERT\ .*=---\ @rownum@ row(s)\ inserted.
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1670] and
[TRAFODION-1709]
Posted by se...@apache.org.
Merge [TRAFODION-1670] and [TRAFODION-1709]
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e188f696
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e188f696
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e188f696
Branch: refs/heads/master
Commit: e188f69688f8f36177e1a2512487820d1c2a501d
Parents: dd1b373 8617ad9
Author: selvaganesang <se...@apache.org>
Authored: Thu Dec 17 05:20:10 2015 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Thu Dec 17 05:20:10 2015 +0000
----------------------------------------------------------------------
core/conn/trafci/src/org/trafodion/ci/DatabaseQuery.java | 4 ++--
.../trafodion/ci/Properties/trafciDefaultLookAndFeel.properties | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------