summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meskes <meskes@postgresql.org>2007-11-06 08:32:57 +0000
committerMichael Meskes <meskes@postgresql.org>2007-11-06 08:32:57 +0000
commit607359854e7239025e87ec2fd0b956240743f5c4 (patch)
tree59184e774b83b1701e945f00845905fa7082f044
parent56ac701b3b634aa325b8d97f4cafd0219aff36b8 (diff)
Fixed two parser bugs.
-rw-r--r--src/interfaces/ecpg/preproc/preproc.y8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index 49fab81fa32..d170d032746 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.311.2.5 2007/03/27 03:25:43 tgl Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.311.2.6 2007/11/06 08:32:57 meskes Exp $ */
/* Copyright comment */
%{
@@ -1881,6 +1881,10 @@ ConstraintAttributeSpec: ConstraintDeferrabilitySpec { $$ = $1; }
$$ = cat2_str($1, $2);
}
+ | /* EMPTY */
+ {
+ $$ = EMPTY;
+ }
;
ConstraintDeferrabilitySpec: NOT DEFERRABLE
@@ -3037,7 +3041,7 @@ DeleteStmt: DELETE_P FROM relation_expr using_clause where_clause
{ $$ = cat_str(4, make_str("delete from"), $3, $4, $5); }
;
-using_clause: USING from_list { cat2_str(make_str("using"), $2); }
+using_clause: USING from_list { $$ = cat2_str(make_str("using"), $2); }
| /* EMPTY */ { $$ = EMPTY; }
;