Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a09f9ff

Browse files
author
Michael Meskes
committed
Small parser sync
1 parent 954c181 commit a09f9ff

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/interfaces/ecpg/preproc/preproc.y

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.338 2006/09/08 13:32:26 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.339 2006/10/23 08:00:48 meskes Exp $ */
22

33
/* Copyright comment */
44
%{
@@ -1323,7 +1323,7 @@ alter_table_cmd:
13231323
/* ALTER TABLE <name> ALTER INHERITS ADD <parent> */
13241324
| INHERIT qualified_name
13251325
{ $$ = cat2_str(make_str("inherit"), $2); }
1326-
/* ALTER TABLE <name> ALTER INHERITS DROP <parent> */
1326+
/* ALTER TABLE <name> NO INHERITS <parent> */
13271327
| NO INHERIT qualified_name
13281328
{ $$ = cat2_str(make_str("no inherit"), $3); }
13291329
| alter_rel_cmd
@@ -3940,6 +3940,8 @@ a_expr: c_expr
39403940
{ $$ = cat2_str($1, make_str("notnull")); }
39413941
| a_expr IS NOT NULL_P
39423942
{ $$ = cat2_str($1, make_str("is not null")); }
3943+
| row OVERLAPS row
3944+
{ $$ = cat_str(3, $1, make_str("overlaps"), $3); }
39433945
/* IS TRUE, IS FALSE, etc used to be function calls
39443946
* but let's make them expressions to allow the optimizer
39453947
* a chance to eliminate them if a_expr is a constant string.

0 commit comments

Comments
 (0)