mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed variable handling in preproc.y.

Browse Source
This commit is contained in:
Michael Meskes 2001-02-26 14:42:54 +00:00
parent f6f8c332b1
commit 06e3d84d88
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/ecpg/ChangeLog
View File

@ -1055,5 +1055,9 @@ Wed Jan 31 17:11:04 CET 2001
Mon Feb 19 08:25:14 CET 2001 Mon Feb 19 08:25:14 CET 2001
- Synced gram.y and preproc.y. - Synced gram.y and preproc.y.
Mon Feb 26 15:22:04 CET 2001
- Fixed misplaced variables FoundInto and QueryIsRule.
- Set ecpg version to 2.8.0. - Set ecpg version to 2.8.0.
- Set library version to 3.2.0. - Set library version to 3.2.0.

19
src/interfaces/ecpg/preproc/preproc.y
View File

@ -1247,12 +1247,13 @@ OptInherit: INHERITS '(' relation_name_list ')' { $$ = cat_str(3
* SELECT ... INTO. * SELECT ... INTO.
*/ */
CreateAsStmt: CREATE OptTemp TABLE relation_name OptCreateAs AS SelectStmt CreateAsStmt: CREATE OptTemp TABLE relation_name OptCreateAs AS
{ FoundInto = 0; } SelectStmt
{ {
if (FoundInto == 1) if (FoundInto == 1)
mmerror(ET_ERROR, "CREATE TABLE/AS SELECT may not specify INTO"); mmerror(ET_ERROR, "CREATE TABLE/AS SELECT may not specify INTO");
$$ = cat_str(7, make_str("create"), $2, make_str("table"), $4, $5, make_str("as"), $7); $$ = cat_str(7, make_str("create"), $2, make_str("table"), $4, $5, make_str("as"), $8);
} }
; ;
@ -2042,6 +2043,7 @@ RuleStmt: CREATE RULE name AS
ON event TO event_object where_clause ON event TO event_object where_clause
DO opt_instead RuleActionList DO opt_instead RuleActionList
{ {
QueryIsRule=0;
$$ = cat_str(10, make_str("create rule"), $3, make_str("as on"), $7, make_str("to"), $9, $10, make_str("do"), $12, $13); $$ = cat_str(10, make_str("create rule"), $3, make_str("as on"), $7, make_str("to"), $9, $10, make_str("do"), $12, $13);
} }
; ;
@ -2510,7 +2512,6 @@ select_no_parens: simple_select
select_clause: simple_select select_clause: simple_select
{ {
FoundInto = 0;
$$ = $1; $$ = $1;
} }
@ -3808,17 +3809,17 @@ ColLabel: ECPGLabelTypeName { $$ = $1; }
SpecialRuleRelation: OLD SpecialRuleRelation: OLD
{ {
if (QueryIsRule) if (!QueryIsRule)
$$ = make_str("old");
else
mmerror(ET_ERROR, "OLD used in non-rule query"); mmerror(ET_ERROR, "OLD used in non-rule query");
$$ = make_str("old");
} }
| NEW | NEW
{ {
if (QueryIsRule) if (!QueryIsRule)
$$ = make_str("new");
else
mmerror(ET_ERROR, "NEW used in non-rule query"); mmerror(ET_ERROR, "NEW used in non-rule query");
$$ = make_str("new");
} }
; ;