77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.88 1998/09/25 13:36:00 thomas Exp $
10+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.89 1998/10/28 16:06:54 momjian Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
@@ -42,7 +42,8 @@ static Query *transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt);
4242static Query * transformCursorStmt (ParseState * pstate ,SelectStmt * stmt );
4343static Query * transformCreateStmt (ParseState * pstate ,CreateStmt * stmt );
4444
45- List * extras = NIL ;
45+ List * extras_before = NIL ;
46+ List * extras_after = NIL ;
4647
4748/*
4849 * parse_analyze -
@@ -57,6 +58,7 @@ parse_analyze(List *pl, ParseState *parentParseState)
5758{
5859QueryTreeList * result ;
5960ParseState * pstate ;
61+ Query * parsetree ;
6062int i = 0 ;
6163
6264result = malloc (sizeof (QueryTreeList ));
@@ -66,23 +68,40 @@ parse_analyze(List *pl, ParseState *parentParseState)
6668while (pl != NIL )
6769{
6870pstate = make_parsestate (parentParseState );
69- result -> qtrees [ i ++ ] = transformStmt (pstate ,lfirst (pl ));
71+ parsetree = transformStmt (pstate ,lfirst (pl ));
7072if (pstate -> p_target_relation != NULL )
7173heap_close (pstate -> p_target_relation );
7274
73- if (extras != NIL )
75+ if (extras_before != NIL )
7476{
75- result -> len += length (extras );
77+ result -> len += length (extras_before );
7678result -> qtrees = (Query * * )realloc (result -> qtrees ,result -> len * sizeof (Query * ));
77- while (extras != NIL )
79+ while (extras_before != NIL )
7880{
79- result -> qtrees [i ++ ]= transformStmt (pstate ,lfirst (extras ));
81+ result -> qtrees [i ++ ]= transformStmt (pstate ,lfirst (extras_before ));
8082if (pstate -> p_target_relation != NULL )
8183heap_close (pstate -> p_target_relation );
82- extras = lnext (extras );
84+ extras_before = lnext (extras_before );
8385}
8486}
85- extras = NIL ;
87+ extras_before = NIL ;
88+
89+ result -> qtrees [i ++ ]= parsetree ;
90+
91+ if (extras_after != NIL )
92+ {
93+ result -> len += length (extras_after );
94+ result -> qtrees = (Query * * )realloc (result -> qtrees ,result -> len * sizeof (Query * ));
95+ while (extras_after != NIL )
96+ {
97+ result -> qtrees [i ++ ]= transformStmt (pstate ,lfirst (extras_after ));
98+ if (pstate -> p_target_relation != NULL )
99+ heap_close (pstate -> p_target_relation );
100+ extras_after = lnext (extras_after );
101+ }
102+ }
103+ extras_after = NIL ;
104+
86105pl = lnext (pl );
87106pfree (pstate );
88107}
@@ -487,6 +506,7 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt)
487506Constraint * constraint ;
488507List * keys ;
489508Ident * key ;
509+ List * blist = NIL ;
490510List * ilist = NIL ;
491511IndexStmt * index ;
492512IndexElem * iparam ;
@@ -553,7 +573,7 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt)
553573elog (NOTICE ,"CREATE TABLE will create implicit sequence %s for SERIAL column %s.%s" ,
554574sequence -> seqname ,stmt -> relname ,column -> colname );
555575
556- ilist = lcons (sequence ,NIL );
576+ blist = lcons (sequence ,NIL );
557577}
558578
559579if (column -> constraints != NIL )
@@ -745,7 +765,8 @@ transformCreateStmt(ParseState *pstate, CreateStmt *stmt)
745765}
746766
747767q -> utilityStmt = (Node * )stmt ;
748- extras = ilist ;
768+ extras_before = blist ;
769+ extras_after = ilist ;
749770
750771return q ;
751772}