You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2018/01/18 16:07:31 UTC
[1/2] trafodion git commit: Fix for a second case for Trafodion-2832.
Repository: trafodion
Updated Branches:
refs/heads/master 3629e8d78 -> 03f705b0f
Fix for a second case for Trafodion-2832.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/28cbe814
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/28cbe814
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/28cbe814
Branch: refs/heads/master
Commit: 28cbe814171a1d0d65f6b55d442c4a487f7210fc
Parents: 3dbfa89
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Fri Jan 12 19:03:33 2018 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Fri Jan 12 19:03:33 2018 +0000
----------------------------------------------------------------------
core/sql/generator/GenRelMisc.cpp | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/28cbe814/core/sql/generator/GenRelMisc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelMisc.cpp b/core/sql/generator/GenRelMisc.cpp
index d2a0c24..737bf4e 100644
--- a/core/sql/generator/GenRelMisc.cpp
+++ b/core/sql/generator/GenRelMisc.cpp
@@ -4014,7 +4014,16 @@ short TupleList::codeGen(Generator * generator)
tmpAssign = (Assign *)tmpAssign->bindNode(bindWA);
setInUpdateOrInsert(bindWA, NULL);
childNode = tmpAssign->getSource().getItemExpr();
-
+ //don't allow LOB insert in a tuple list
+ if (childNode->getOperatorType() == ITM_LOBINSERT)
+ {
+ // cannot have this function in a values list with
+ // multiple tuples. Use a single tuple.
+ *CmpCommon::diags() << DgSqlCode(-4483);
+ GenExit();
+ return -1;
+
+ }
castNode->child(0) = childNode;
}
else
[2/2] trafodion git commit: Merge remote branch 'origin/pr/1396/head'
into merge_1396
Posted by sa...@apache.org.
Merge remote branch 'origin/pr/1396/head' into merge_1396
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/03f705b0
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/03f705b0
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/03f705b0
Branch: refs/heads/master
Commit: 03f705b0f256a2d5fa7b7b993f0e396632c348e6
Parents: 3629e8d 28cbe81
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Thu Jan 18 16:06:35 2018 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Thu Jan 18 16:06:35 2018 +0000
----------------------------------------------------------------------
core/sql/generator/GenRelMisc.cpp | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------