Commit443c08a

Jan Wieck

authored and

Jan Wieck

committed

Fixed shift/reduce conflict

SelectStmt and CursorStmt tried to parse FOR UPDATE ... / FOR READ ONLY.Cursor now checks that it is read only by looking at forUpdate of Query.SelectStmt handles FOR READ ONLY too.Jan

1 parent1f82f1d commit443c08aCopy full SHA for 443c08a

File tree

1 file changed

-21

lines changed

src/backend/parser
- gram.y

1 file changed

-21

lines changed

`‎src/backend/parser/gram.y`

Lines changed: 7 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.78 1999/05/19 17:53:10 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.79 1999/05/20 12:12:55 wieck Exp $`
`14`	`14`	`*`
`15`	`15`	`* HISTORY`
`16`	`16`	`* AUTHORDATEMAJOR EVENT`
`@@ -196,7 +196,7 @@ Oidparam_type(int t); /* used in parse_expr.c */`
`196`	`196`
`197`	`197`	`%type <boolean> opt_inh_star, opt_binary, opt_instead, opt_with_copy,`
`198`	`198`	`index_opt_unique, opt_verbose, opt_analyze`
`199`		`-%type <boolean>cursor_clause,opt_cursor, opt_readonly, opt_of`
	`199`	`+%type <boolean> opt_cursor`
`200`	`200`
`201`	`201`	`%type <ival>copy_dirn, def_type, opt_direction, remove_type,`
`202`	`202`	`opt_column, event`
`@@ -2646,7 +2646,7 @@ UpdateStmt: UPDATE relation_name`
`2646`	`2646`	`*`
`2647`	`2647`	`*****************************************************************************/`
`2648`	`2648`	`/**SI***/`
`2649`		`-CursorStmt: DECLARE name opt_cursor CURSOR FOR SelectStmt cursor_clause`
	`2649`	`+CursorStmt: DECLARE name opt_cursor CURSOR FOR SelectStmt`
`2650`	`2650`	`{`
`2651`	`2651`	`SelectStmt *n;`
`2652`	`2652`
`@@ -2664,6 +2664,9 @@ CursorStmt: DECLARE name opt_cursor CURSOR FOR SelectStmt cursor_clause`
`2664`	`2664`
`2665`	`2665`	`n->portalname = $2;`
`2666`	`2666`	`n->binary = $3;`
	`2667`	`+if (n->forUpdate != NULL)`
	`2668`	`+elog(ERROR,"DECLARE/UPDATE not supported;"`
	`2669`	`+ " Cursors must be READ ONLY.");`
`2667`	`2670`	`$$ = (Node *)n;`
`2668`	`2671`	`}`
`2669`	`2672`	`;`
`@@ -2675,24 +2678,6 @@ opt_cursor: BINARY{ $$ = TRUE; }`
`2675`	`2678`	`\| /EMPTY/{ $$ = FALSE; }`
`2676`	`2679`	`;`
`2677`	`2680`
`2678`		`-cursor_clause: FOR opt_readonly{ $$ = $2; }`
`2679`		`-\| /EMPTY/{ $$ = FALSE; }`
`2680`		`-;`
`2681`		`-`
`2682`		`-opt_readonly: READ ONLY{ $$ = TRUE; }`
`2683`		`-\| UPDATE opt_of`
`2684`		`-{`
`2685`		`-elog(ERROR,"DECLARE/UPDATE not supported;"`
`2686`		`- " Cursors must be READ ONLY.");`
`2687`		`-$$ = FALSE;`
`2688`		`-}`
`2689`		`-;`
`2690`		`-`
`2691`		`-opt_of: OF columnList`
`2692`		`-{`
`2693`		`-$$ = FALSE;`
`2694`		`-}`
`2695`		`-`
`2696`	`2681`	`/*****************************************************************************`
`2697`	`2682`	`*`
`2698`	`2683`	`*QUERY:`
`@@ -3007,6 +2992,7 @@ having_clause: HAVING a_expr`
`3007`	`2992`	`;`
`3008`	`2993`
`3009`	`2994`	`for_update_clause: FOR UPDATE update_list{ $$ = $3; }`
	`2995`	`+\| FOR READ ONLY{ $$ = NULL; }`
`3010`	`2996`	`\| /* EMPTY */{ $$ = NULL; }`
`3011`	`2997`	`;`
`3012`	`2998`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit443c08a

File tree

1 file changed

1 file changed

`‎src/backend/parser/gram.y`

0 commit comments