db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r594822 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
Date Wed, 14 Nov 2007 10:22:51 GMT
Author: dag
Date: Wed Nov 14 02:22:51 2007
New Revision: 594822

URL: http://svn.apache.org/viewvc?rev=594822&view=rev
Log:
DERBY-3073 SQL roles: add parser support

Follow-up patch DERBY-3073-part3, which reorders two checks for the roles statements:
hard upgrade check goes before sqlauthorization check.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj

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=594822&r1=594821&r2=594822&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 Wed Nov
14 02:22:51 2007
@@ -7405,8 +7405,8 @@
 {
 	<CURRENT_ROLE>
 	{
-		checkSqlStandardAccess("CURRENT_ROLE");
 		checkVersion( DataDictionary.DD_VERSION_DERBY_10_4, "ROLES");
+		checkSqlStandardAccess("CURRENT_ROLE");
 		return (ValueNode) nodeFactory.getNode(
 			C_NodeTypes.CURRENT_ROLE_NODE,
 			getContextManager());
@@ -9636,8 +9636,8 @@
 	 */
 	<ROLE> roleName = identifier(Limits.MAX_IDENTIFIER_LENGTH, true)
 	{
-		checkSqlStandardAccess("CREATE ROLE");
 		checkVersion( DataDictionary.DD_VERSION_DERBY_10_4, "ROLES");
+		checkSqlStandardAccess("CREATE ROLE");
 		checkAuthorizationLength(roleName);
 
 		return (StatementNode) nodeFactory.getNode(
@@ -11433,8 +11433,8 @@
 setRoleSpecification() throws StandardException :
 {
 	String roleName = null;
-        checkSqlStandardAccess("SET ROLE");
         checkVersion( DataDictionary.DD_VERSION_DERBY_10_4, "ROLES");
+        checkSqlStandardAccess("SET ROLE");
 }
 {
 	<NONE>
@@ -12092,8 +12092,8 @@
 	 */
 	<ROLE> roleName = identifier(Limits.MAX_IDENTIFIER_LENGTH, true)
 	{
-		checkSqlStandardAccess("DROP ROLE");
 		checkVersion( DataDictionary.DD_VERSION_DERBY_10_4, "ROLES");
+		checkSqlStandardAccess("DROP ROLE");
 
 		return (StatementNode) nodeFactory.getNode(
 			C_NodeTypes.DROP_ROLE_NODE,
@@ -13011,8 +13011,8 @@
 				 !isPrivilegeKeywordExceptTrigger(getToken(2).kind)) } )
 	<REVOKE>
 	{
-		checkSqlStandardAccess("REVOKE <role>");
 		checkVersion( DataDictionary.DD_VERSION_DERBY_10_4, "ROLES");
+		checkSqlStandardAccess("REVOKE <role>");
 	}
 	( node = roleRevokeStatement() )
 	{



Mime
View raw message