Fixed failed assertion happening in multiple action rules

Jan Wieck · Jan Wieck · commit 92c6b5d7b9c2 · 1999-02-02T12:56:55.000Z
when parsestate in makeRangeTable() already contains an
opened p_target_relation.

Jan
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.26 1998/09/25 13:36:03 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.26.2.1 1999/02/02 12:56:55 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -62,8 +62,13 @@ makeRangeTable(ParseState *pstate, char *relname, List *frmList)
 	else
 		rte = refnameRangeTableEntry(pstate, relname);
 
+	/* This could only happen for multi-action rules */
+	if (pstate->p_target_relation != NULL)
+	{
+		heap_close(pstate->p_target_relation);
+	}
+
 	pstate->p_target_rangetblentry = rte;
-	Assert(pstate->p_target_relation == NULL);
 	pstate->p_target_relation = heap_open(rte->relid);
 	/* will close relation later */
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.26 1998/09/25 13:36:03 thomas Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.26.2.1 1999/02/02 12:56:55 wieck Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -62,8 +62,13 @@ makeRangeTable(ParseState pstate, char relname, List *frmList)`
`62`	`62`	`else`
`63`	`63`	`rte = refnameRangeTableEntry(pstate, relname);`
`64`	`64`
	`65`	`+ /* This could only happen for multi-action rules */`
	`66`	`+ if (pstate->p_target_relation != NULL)`
	`67`	`+ {`
	`68`	`+ heap_close(pstate->p_target_relation);`
	`69`	`+ }`
	`70`	`+`
`65`	`71`	`pstate->p_target_rangetblentry = rte;`
`66`		`- Assert(pstate->p_target_relation == NULL);`
`67`	`72`	`pstate->p_target_relation = heap_open(rte->relid);`
`68`	`73`	`/* will close relation later */`
`69`	`74`	`}`