db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r641306 - in /db/derby/code/branches/10.4/java: engine/org/apache/derby/impl/sql/compile/ testing/org/apache/derbyTesting/functionTests/tests/lang/ testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/
Date Wed, 26 Mar 2008 13:47:24 GMT
Author: dyre
Date: Wed Mar 26 06:47:15 2008
New Revision: 641306

URL: http://svn.apache.org/viewvc?rev=641306&view=rev
Log:
DERBY-3460: SQL roles: patch to mask off roles on 10.4 release branch
Patch contributed by Dag H. Wanvik
Patch file: DERBY-3460a.diff

Modified:
    db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java

Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=641306&r1=641305&r2=641306&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
(original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
Wed Mar 26 06:47:15 2008
@@ -7497,6 +7497,8 @@
 {
 	<CURRENT_ROLE>
 	{
+		throw StandardException.newException
+            (SQLState.NOT_IMPLEMENTED, "ROLES");
 		checkVersion( DataDictionary.DD_VERSION_DERBY_10_4, "ROLES");
 		checkSqlStandardAccess("CURRENT_ROLE");
 		return (ValueNode) nodeFactory.getNode(
@@ -9728,6 +9730,8 @@
 	 */
 	<ROLE> roleName = identifier(Limits.MAX_IDENTIFIER_LENGTH, true)
 	{
+		throw StandardException.newException
+            (SQLState.NOT_IMPLEMENTED, "ROLES");
 		checkVersion( DataDictionary.DD_VERSION_DERBY_10_4, "ROLES");
 		checkSqlStandardAccess("CREATE ROLE");
 
@@ -11527,6 +11531,11 @@
 setRoleSpecification() throws StandardException :
 {
 	String roleName = null;
+	boolean quiesceCompilerUnreachableStatement = true;
+	if (quiesceCompilerUnreachableStatement) {
+		throw StandardException.newException
+			(SQLState.NOT_IMPLEMENTED, "ROLES");
+	}
         checkVersion( DataDictionary.DD_VERSION_DERBY_10_4, "ROLES");
         checkSqlStandardAccess("SET ROLE");
 }
@@ -12185,6 +12194,8 @@
 	 */
 	<ROLE> roleName = identifier(Limits.MAX_IDENTIFIER_LENGTH, true)
 	{
+		throw StandardException.newException
+            (SQLState.NOT_IMPLEMENTED, "ROLES");
 		checkVersion( DataDictionary.DD_VERSION_DERBY_10_4, "ROLES");
 		checkSqlStandardAccess("DROP ROLE");
 
@@ -13099,6 +13110,8 @@
 				 !isPrivilegeKeywordExceptTrigger(getToken(2).kind)) } )
 	<REVOKE>
 	{
+		throw StandardException.newException
+            (SQLState.NOT_IMPLEMENTED, "ROLES");
 		checkVersion( DataDictionary.DD_VERSION_DERBY_10_4, "ROLES");
 		checkSqlStandardAccess("REVOKE <role>");
 	}

Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?rev=641306&r1=641305&r2=641306&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
(original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
Wed Mar 26 06:47:15 2008
@@ -69,7 +69,6 @@
 		suite.addTest(LangScripts.suite());
         suite.addTest(MathTrigFunctionsTest.suite());
         suite.addTest(PrepareExecuteDDL.suite());
-        suite.addTest(RolesTest.suite());
         suite.addTest(RoutineSecurityTest.suite());
         suite.addTest(RoutineTest.suite());
         suite.addTest(SQLAuthorizationPropTest.suite());

Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java?rev=641306&r1=641305&r2=641306&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
(original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
Wed Mar 26 06:47:15 2008
@@ -232,7 +232,7 @@
      * @throws SQLException
      *
      */
-    public void testSQLRolesBasic() throws SQLException
+    public void disabledTill10_5_testSQLRolesBasic() throws SQLException
     {
         // The standard upgrade database doesn't have sqlAuthorization
         // set, so we can only check if the system tables for roles is
@@ -271,7 +271,7 @@
      * @throws SQLException
      *
      */
-    public void testSQLRoles() throws SQLException
+    public void disabledTill10_5_testSQLRoles() throws SQLException
     {
         // Do rudimentary sanity checking: that we can create and drop roles
         // when we are database owner. If so, we can presume SYS.SYSROLES



Mime
View raw message