Fixed variable handling in preproc.y.

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 1bfa8d12e9993b7f8e7ba26f0bc8e988abd3f710..1ae8f7a9d4455505645a690989e807ae90396d39 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -1055,5 +1055,9 @@ Wed Jan 31 17:11:04 CET 2001
 Mon Feb 19 08:25:14 CET 2001
 
        - 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 library version to 3.2.0.

diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index ecb21d1b20e41d5bcd7284e7eb657915a9805c8c..29bfb3662d0c78c7e47506d7ee1ce645e7ab39dc 100644 (file)
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1247,12 +1247,13 @@ OptInherit:  INHERITS '(' relation_name_list ')'                { $$ = cat_str(3
  * 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)
                                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
                   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);
                                }
                ;
@@ -2510,7 +2512,6 @@ select_no_parens:      simple_select
 
 select_clause: simple_select
                         {
-                               FoundInto = 0; 
                                 $$ = $1;
 
                         }
@@ -3808,17 +3809,17 @@ ColLabel:  ECPGLabelTypeName                    { $$ = $1; }
 
 SpecialRuleRelation:  OLD
                                {
-                                       if (QueryIsRule)
-                                               $$ = make_str("old");
-                                       else
+                                       if (!QueryIsRule)
                                                mmerror(ET_ERROR, "OLD used in non-rule query");
+
+                                       $$ = make_str("old");
                                }
                | NEW
                                {
-                                       if (QueryIsRule)
-                                               $$ = make_str("new");
-                                       else
+                                       if (!QueryIsRule)
                                                mmerror(ET_ERROR, "NEW used in non-rule query");
+
+                                       $$ = make_str("new");
                                }
                ;