Throw an error for negative LIMIT or OFFSET values, instead of silently

tglsfdc · tglsfdc · commit bfce56eea45b · 2008-03-10T03:37:59.000Z
treating them as zero.  Simon Riggs
diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.33 2008/01/01 19:45:49 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.34 2008/03/10 03:37:59 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -246,7 +246,9 @@ recompute_limits(LimitState *node)
 		{
 			node->offset = DatumGetInt64(val);
 			if (node->offset < 0)
-				node->offset = 0;
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("OFFSET must not be negative")));
 		}
 	}
 	else
@@ -271,7 +273,9 @@ recompute_limits(LimitState *node)
 		{
 			node->count = DatumGetInt64(val);
 			if (node->count < 0)
-				node->count = 0;
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("LIMIT must not be negative")));
 			node->noCount = false;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.33 2008/01/01 19:45:49 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.34 2008/03/10 03:37:59 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -246,7 +246,9 @@ recompute_limits(LimitState *node)`
`246`	`246`	`{`
`247`	`247`	`node->offset = DatumGetInt64(val);`
`248`	`248`	`if (node->offset < 0)`
`249`		`- node->offset = 0;`
	`249`	`+ ereport(ERROR,`
	`250`	`+ (errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
	`251`	`+ errmsg("OFFSET must not be negative")));`
`250`	`252`	`}`
`251`	`253`	`}`
`252`	`254`	`else`
`@@ -271,7 +273,9 @@ recompute_limits(LimitState *node)`
`271`	`273`	`{`
`272`	`274`	`node->count = DatumGetInt64(val);`
`273`	`275`	`if (node->count < 0)`
`274`		`- node->count = 0;`
	`276`	`+ ereport(ERROR,`
	`277`	`+ (errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
	`278`	`+ errmsg("LIMIT must not be negative")));`
`275`	`279`	`node->noCount = false;`
`276`	`280`	`}`
`277`	`281`	`}`