You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2014/10/09 00:34:19 UTC
svn commit: r1630245 - in /db/derby/code/branches/10.10: ./
java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java
Author: myrnavl
Date: Wed Oct 8 22:34:18 2014
New Revision: 1630245
URL: http://svn.apache.org/r1630245
Log:
DERBY-6691; ROW_NUMBER should not be allowed as argument in a procedure call
backport of revision 1616519 from 10.11
Modified:
db/derby/code/branches/10.10/ (props changed)
db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java
Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
Merged /db/derby/code/branches/10.11:r1616519
Merged /db/derby/code/trunk:r1616335
Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java?rev=1630245&r1=1630244&r2=1630245&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java Wed Oct 8 22:34:18 2014
@@ -334,6 +334,7 @@ abstract class MethodCallNode extends Ja
if (routineInfo == null)
signature[ parm ] = methodParms[ parm ].getJSQLType();
+ SelectNode.checkNoWindowFunctions(methodParms[parm], "method argument");
}
}
}
Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java?rev=1630245&r1=1630244&r2=1630245&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java Wed Oct 8 22:34:18 2014
@@ -591,6 +591,12 @@ public class OLAPTest extends BaseJDBCTe
"select * from t4 t_1 join t4 t_2 on " +
" t_1.a = row_number() over () + t_2.a");
+ // DERBY-6691: NPE before
+ assertStatementError(LANG_WINDOW_FUNCTION_CONTEXT_ERROR,
+ s,
+ "call syscs_util.syscs_compress_table(" +
+ " 'APP', 'T2', row_number() over ())");
+
// DERBY-6690: a window function in generated clause was not detected
// before
assertStatementError(LANG_WINDOW_FUNCTION_CONTEXT_ERROR,