Add optional drop behavior clause to REVOKE command, for SQL conformance.

petere · petere · commit 36ea26793a14 · 2003-01-10T11:02:51.000Z
Currently, only RESTRICT is allowed.
diff --git a/doc/src/sgml/features.sgml b/doc/src/sgml/features.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/features.sgml,v 2.12 2002/12/14 00:24:23 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/features.sgml,v 2.13 2003/01/10 11:02:41 petere Exp $
 -->
 
 <appendix id="features">
@@ -740,6 +740,12 @@ $Header: /cvsroot/pgsql/doc/src/sgml/features.sgml,v 2.12 2002/12/14 00:24:23 pe
         <entry>DROP VIEW statement: RESTRICT clause</entry>
         <entry></entry>
        </row>
+       <row>
+        <entry>F031-19</entry>
+        <entry>Core</entry>
+        <entry>REVOKE statement: RESTRICT clause</entry>
+        <entry></entry>
+       </row>
        <row>
         <entry>F032</entry>
         <entry></entry>
@@ -1629,12 +1635,6 @@ $Header: /cvsroot/pgsql/doc/src/sgml/features.sgml,v 2.12 2002/12/14 00:24:23 pe
         <entry>Module language</entry>
         <entry></entry>
        </row>
-       <row>
-        <entry>F031-19</entry>
-        <entry>Core</entry>
-        <entry>REVOKE statement: RESTRICT clause</entry>
-        <entry></entry>
-       </row>
        <row>
         <entry>F034</entry>
         <entry></entry>
diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/revoke.sgml,v 1.23 2002/11/21 23:34:43 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/revoke.sgml,v 1.24 2003/01/10 11:02:51 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -20,22 +20,27 @@ REVOKE { { SELECT | INSERT | UPDATE | DELETE | RULE | REFERENCES | TRIGGER }
     [,...] | ALL [ PRIVILEGES ] }
     ON [ TABLE ] <replaceable class="PARAMETER">tablename</replaceable> [, ...]
     FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    [ RESTRICT ]
 
 REVOKE { { CREATE | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }
     ON DATABASE <replaceable>dbname</replaceable> [, ...]
     FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    [ RESTRICT ]
 
 REVOKE { EXECUTE | ALL [ PRIVILEGES ] }
     ON FUNCTION <replaceable>funcname</replaceable> ([<replaceable>type</replaceable>, ...]) [, ...]
     FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    [ RESTRICT ]
 
 REVOKE { USAGE | ALL [ PRIVILEGES ] }
     ON LANGUAGE <replaceable>langname</replaceable> [, ...]
     FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    [ RESTRICT ]
 
 REVOKE { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }
     ON SCHEMA <replaceable>schemaname</replaceable> [, ...]
     FROM { <replaceable class="PARAMETER">username</replaceable> | GROUP <replaceable class="PARAMETER">groupname</replaceable> | PUBLIC } [, ...]
+    [ RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -63,6 +68,11 @@ REVOKE { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }
    See the description of the <xref linkend="sql-grant" endterm="sql-grant-title"> command for
    the meaning of the privilege types.
   </para>
+
+  <para>
+   The <literal>RESTRICT</literal> key word is currently only noise.
+   See also the compatibility notes below.
+  </para>
  </refsect1>
 
  <refsect1 id="SQL-REVOKE-notes">
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.392 2003/01/09 20:50:51 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.393 2003/01/10 11:02:51 petere Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -2751,14 +2751,18 @@ GrantStmt:	GRANT privileges ON privilege_target TO grantee_list
 		;
 
 RevokeStmt: REVOKE opt_revoke_grant_option privileges ON privilege_target
-			FROM grantee_list
+			FROM grantee_list opt_drop_behavior
 				{
 					GrantStmt *n = makeNode(GrantStmt);
 					n->is_grant = false;
 					n->privileges = $3;
 					n->objtype = ($5)->objtype;
 					n->objects = ($5)->objs;
 					n->grantees = $7;
+
+					if ($8 == DROP_CASCADE)
+						elog(ERROR, "REVOKE ... CASCADE is not implemented");
+
 					$$ = (Node *)n;
 				}
 		;

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.392 2003/01/09 20:50:51 tgl Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.393 2003/01/10 11:02:51 petere Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -2751,14 +2751,18 @@ GrantStmt: GRANT privileges ON privilege_target TO grantee_list`
`2751`	`2751`	`;`
`2752`	`2752`
`2753`	`2753`	`RevokeStmt: REVOKE opt_revoke_grant_option privileges ON privilege_target`
`2754`		`- FROM grantee_list`
	`2754`	`+ FROM grantee_list opt_drop_behavior`
`2755`	`2755`	`{`
`2756`	`2756`	`GrantStmt *n = makeNode(GrantStmt);`
`2757`	`2757`	`n->is_grant = false;`
`2758`	`2758`	`n->privileges = $3;`
`2759`	`2759`	`n->objtype = ($5)->objtype;`
`2760`	`2760`	`n->objects = ($5)->objs;`
`2761`	`2761`	`n->grantees = $7;`
	`2762`	`+`
	`2763`	`+ if ($8 == DROP_CASCADE)`
	`2764`	`+ elog(ERROR, "REVOKE ... CASCADE is not implemented");`
	`2765`	`+`
`2762`	`2766`	`$$ = (Node *)n;`
`2763`	`2767`	`}`
`2764`	`2768`	`;`