db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r958025 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/sql/compile/ testing/org/apache/derbyTesting/functionTests/tests/lang/
Date Fri, 25 Jun 2010 16:26:13 GMT
Author: rhillegas
Date: Fri Jun 25 16:26:13 2010
New Revision: 958025

URL: http://svn.apache.org/viewvc?rev=958025&view=rev
Log:
DERBY-4714: Cleanup some edge case syntax issues with the BOOLEAN type.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=958025&r1=958024&r2=958025&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Fri Jun
25 16:26:13 2010
@@ -7205,7 +7205,7 @@ DataTypeDescriptor xmlSerializeTargetTyp
 			ReuseFactory.getInteger(getToken(1).beginColumn));
 	}
 |
-	<AS> targetType = dataTypeDDL( false )
+	<AS> targetType = dataTypeDDL( true )
 	{
 		return targetType;
 	}
@@ -13835,11 +13835,11 @@ List/*<TypeDescriptor>*/ parameterTypeLi
     TypeDescriptor type;
 }
 {
-    [ type = catalogType( false )
+    [ type = catalogType( true )
         {
             list.add(type);
         }
-      ( <COMMA> type = catalogType( false )
+      ( <COMMA> type = catalogType( true )
         {
             list.add(type);
         }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java?rev=958025&r1=958024&r2=958025&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
Fri Jun 25 16:26:13 2010
@@ -306,6 +306,21 @@ public final class GrantRevokeDDLTest ex
         st_satConnection.executeUpdate(
             " drop function f_abs");
         
+        // DERBY-4714
+        
+        st_satConnection.executeUpdate(
+            "CREATE FUNCTION F_4714(P1 BOOLEAN) RETURNS BOOLEAN NO "
+            + "SQL RETURNS NULL ON NULL INPUT EXTERNAL NAME "
+            + "'org.apache.derbyTesting.functionTests.tests.lang.BooleanValuesTest.booleanValue'
LANGUAGE JAVA PARAMETER STYLE JAVA");
+
+        st_satConnection.executeUpdate(
+            " grant execute on function F_4714(boolean) to bar");
+        st_satConnection.executeUpdate(
+            " revoke execute on function F_4714(boolean) from bar restrict");
+
+        st_satConnection.executeUpdate(
+            " drop function F_4714");
+        
         // Tests with views
         
         st_satConnection.executeUpdate(

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java?rev=958025&r1=958024&r2=958025&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java
Fri Jun 25 16:26:13 2010
@@ -653,6 +653,9 @@ public final class XMLTypeAndOpsTest ext
         assertStatementError("42X01", st, "select xmlserialize(x as) from t1");
         assertStatementError("42Z73", st,
             " select xmlserialize(x as int) from t1");
+
+        assertStatementError("42Z73", st,
+            " select xmlserialize(x as boolean) from t1");
         
         assertStatementError("42Z73", st,
             " select xmlserialize(x as varchar(20) for bit data) from t1");



Mime
View raw message