More fixes, but still need +1 for FUNC_MAX_ARGS

bmomjian · bmomjian · commit 401e6de7ee88 · 2000-01-11T02:30:06.000Z
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.37 2000/01/10 17:14:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.38 2000/01/11 02:30:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -80,7 +80,7 @@ ProcedureCreate(char *procedureName,
 	{
 		Value	   *t = lfirst(x);
 
-		if (parameterCount == FUNC_MAX_ARGS)
+		if (parameterCount > FUNC_MAX_ARGS)
 			elog(ERROR, "Procedures cannot take more than %d arguments",FUNC_MAX_ARGS);
 
 		if (strcmp(strVal(t), "opaque") == 0)
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.26 2000/01/10 17:14:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.27 2000/01/11 02:30:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,6 +81,8 @@ PQfn(int fnid,
 	retval = (char *)
 		fmgr(fnid, arg[0], arg[1], arg[2], arg[3],
 			 arg[4], arg[5], arg[6], arg[7]);
+			 arg[8], arg[9], arg[10], arg[11]);
+			 arg[12], arg[13], arg[14], arg[15]);
 
 	/* ----------------
 	 *	put the result in the buffer the user specified and
diff --git a/src/include/config.h.in b/src/include/config.h.in
@@ -101,7 +101,7 @@
  * pgsql/src/backend/utils/fmgr/fmgr.c and add additional entries 
  * to the 'case' statement for the additional arguments.
  */
-#define INDEX_MAX_KEYS		8
+#define INDEX_MAX_KEYS		16
 #define FUNC_MAX_ARGS		(INDEX_MAX_KEYS+1)
 
 /*

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/catalog/pg_proc.c,v 1.37 2000/01/10 17:14:31 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.38 2000/01/11 02:30:05 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -80,7 +80,7 @@ ProcedureCreate(char *procedureName,`
`80`	`80`	`{`
`81`	`81`	`Value *t = lfirst(x);`
`82`	`82`
`83`		`- if (parameterCount == FUNC_MAX_ARGS)`
	`83`	`+ if (parameterCount > FUNC_MAX_ARGS)`
`84`	`84`	`elog(ERROR, "Procedures cannot take more than %d arguments",FUNC_MAX_ARGS);`
`85`	`85`
`86`	`86`	`if (strcmp(strVal(t), "opaque") == 0)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.26 2000/01/10 17:14:35 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.27 2000/01/11 02:30:06 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -81,6 +81,8 @@ PQfn(int fnid,`
`81`	`81`	`retval = (char *)`
`82`	`82`	`fmgr(fnid, arg[0], arg[1], arg[2], arg[3],`
`83`	`83`	`arg[4], arg[5], arg[6], arg[7]);`
	`84`	`+ arg[8], arg[9], arg[10], arg[11]);`
	`85`	`+ arg[12], arg[13], arg[14], arg[15]);`
`84`	`86`
`85`	`87`	`/* ----------------`
`86`	`88`	`* put the result in the buffer the user specified and`