> Uh, isn't the correct fix

bmomjian · bmomjian · commit 394925b60dad · 2001-10-15T18:16:31.000Z
&gt; ! $$ = cat_str(8, make_str("grant"), $2, make_str("on"), $4, $5,
 &gt; make_str("to"), $7, $8);
 &gt; ISTM your patch loses the opt_with_grant clause.  (Of course the
 &gt; backend doesn't currently accept that clause anyway, but that's no
 &gt; reason for ecpg to drop it.)

My patch doesn't loose the option, it's never been passed on anyway:

 opt_with_grant:  WITH GRANT OPTION
                                {
                                        mmerror(ET_ERROR, "WITH GRANT OPTION is not supported.  Only relation owners can
 set privileges");
                                 }
                | /*EMPTY*/
                ;

The existing code in ecpg/preproc/preproc.y to handle the WITH option
simply throws an error and aborts the processing... The patch below
prevents the segfault and also passes on the WITH option to the
backend, probably a better fix.

Lee Kindness
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -1693,7 +1693,7 @@ comment_text:    StringConst		{ $$ = $1; }
 
 GrantStmt:  GRANT privileges ON opt_table relation_name_list TO grantee_list opt_with_grant
 				{
-					$$ = cat_str(7, make_str("grant"), $2, make_str("on"), $4, $5, make_str("to"), $7);
+					$$ = cat_str(8, make_str("grant"), $2, make_str("on"), $4, $5, make_str("to"), $7, $8);
 				}
 		;
 
@@ -1769,11 +1769,8 @@ grantee_list: grantee  				{ $$ = $1; }
 		| grantee_list ',' grantee 	{ $$ = cat_str(3, $1, make_str(","), $3); }
 		;
 
-opt_with_grant:  WITH GRANT OPTION
-				{
-					mmerror(ET_ERROR, "WITH GRANT OPTION is not supported.  Only relation owners can set privileges");
-				 }
-		| /*EMPTY*/ 
+opt_with_grant:  WITH GRANT OPTION { $$ = make_str("with grant option"); }
+		| /*EMPTY*/ { $$ = EMPTY; }
 		;
 
 

Original file line number	Diff line number	Diff line change
`@@ -1693,7 +1693,7 @@ comment_text: StringConst { $$ = $1; }`
`1693`	`1693`
`1694`	`1694`	`GrantStmt: GRANT privileges ON opt_table relation_name_list TO grantee_list opt_with_grant`
`1695`	`1695`	`{`
`1696`		`- $$ = cat_str(7, make_str("grant"), $2, make_str("on"), $4, $5, make_str("to"), $7);`
	`1696`	`+ $$ = cat_str(8, make_str("grant"), $2, make_str("on"), $4, $5, make_str("to"), $7, $8);`
`1697`	`1697`	`}`
`1698`	`1698`	`;`
`1699`	`1699`
`@@ -1769,11 +1769,8 @@ grantee_list: grantee { $$ = $1; }`
`1769`	`1769`	`\| grantee_list ',' grantee { $$ = cat_str(3, $1, make_str(","), $3); }`
`1770`	`1770`	`;`
`1771`	`1771`
`1772`		`-opt_with_grant: WITH GRANT OPTION`
`1773`		`- {`
`1774`		`- mmerror(ET_ERROR, "WITH GRANT OPTION is not supported. Only relation owners can set privileges");`
`1775`		`- }`
`1776`		`- \| /EMPTY/`
	`1772`	`+opt_with_grant: WITH GRANT OPTION { $$ = make_str("with grant option"); }`
	`1773`	`+ \| /EMPTY/ { $$ = EMPTY; }`
`1777`	`1774`	`;`
`1778`	`1775`
`1779`	`1776`