Make fixed_paramref_hook behave properly when there are 'unused' slots

tglsfdc · tglsfdc · commit 43a9a2fb89e6 · 2010-01-13T01:17:07.000Z
in the parameter array.  Noted while experimenting with an example
from Pavel.  This wouldn't come up in normal use, but it ought to honor
the specification that a parameter array can have unused slots.
diff --git a/src/backend/parser/parse_param.c b/src/backend/parser/parse_param.c
@@ -17,7 +17,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_param.c,v 2.2 2010/01/02 16:57:50 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_param.c,v 2.3 2010/01/13 01:17:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -100,8 +100,9 @@ fixed_paramref_hook(ParseState *pstate, ParamRef *pref)
 	int			paramno = pref->number;
 	Param	   *param;
 
-	/* Check parameter number is in range */
-	if (paramno <= 0 || paramno > parstate->numParams)
+	/* Check parameter number is valid */
+	if (paramno <= 0 || paramno > parstate->numParams ||
+		!OidIsValid(parstate->paramTypes[paramno - 1]))
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_PARAMETER),
 				 errmsg("there is no parameter $%d", paramno),

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`*`
`19`	`19`	`* IDENTIFICATION`
`20`		`- * $PostgreSQL: pgsql/src/backend/parser/parse_param.c,v 2.2 2010/01/02 16:57:50 momjian Exp $`
	`20`	`+ * $PostgreSQL: pgsql/src/backend/parser/parse_param.c,v 2.3 2010/01/13 01:17:07 tgl Exp $`
`21`	`21`	`*`
`22`	`22`	`*-------------------------------------------------------------------------`
`23`	`23`	`*/`
`@@ -100,8 +100,9 @@ fixed_paramref_hook(ParseState pstate, ParamRef pref)`
`100`	`100`	`int paramno = pref->number;`
`101`	`101`	`Param *param;`
`102`	`102`
`103`		`- /* Check parameter number is in range */`
`104`		`- if (paramno <= 0 \|\| paramno > parstate->numParams)`
	`103`	`+ /* Check parameter number is valid */`
	`104`	`+ if (paramno <= 0 \|\| paramno > parstate->numParams \|\|`
	`105`	`+ !OidIsValid(parstate->paramTypes[paramno - 1]))`
`105`	`106`	`ereport(ERROR,`
`106`	`107`	`(errcode(ERRCODE_UNDEFINED_PARAMETER),`
`107`	`108`	`errmsg("there is no parameter $%d", paramno),`