Commit 406d028a authored by Tom Lane's avatar Tom Lane

Fix LIMIT/OFFSET for null limit values. This worked before 8.2 but was broken

by the change to make limit values int8 instead of int4.  (Specifically, you
can do DatumGetInt32 safely on a null value, but not DatumGetInt64.)  Per
bug #2803 from Greg Johnson.
parent 75330c32
......@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.27 2006/07/26 19:31:50 tgl Exp $
* $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.28 2006/12/03 21:40:07 tgl Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -225,21 +225,25 @@ static void
recompute_limits(LimitState *node)
{
ExprContext *econtext = node->ps.ps_ExprContext;
Datum val;
bool isNull;
if (node->limitOffset)
{
node->offset =
DatumGetInt64(ExecEvalExprSwitchContext(node->limitOffset,
val = ExecEvalExprSwitchContext(node->limitOffset,
econtext,
&isNull,
NULL));
NULL);
/* Interpret NULL offset as no offset */
if (isNull)
node->offset = 0;
else if (node->offset < 0)
else
{
node->offset = DatumGetInt64(val);
if (node->offset < 0)
node->offset = 0;
}
}
else
{
/* No OFFSET supplied */
......@@ -248,17 +252,23 @@ recompute_limits(LimitState *node)
if (node->limitCount)
{
node->noCount = false;
node->count =
DatumGetInt64(ExecEvalExprSwitchContext(node->limitCount,
val = ExecEvalExprSwitchContext(node->limitCount,
econtext,
&isNull,
NULL));
NULL);
/* Interpret NULL count as no count (LIMIT ALL) */
if (isNull)
{
node->count = 0;
node->noCount = true;
else if (node->count < 0)
}
else
{
node->count = DatumGetInt64(val);
if (node->count < 0)
node->count = 0;
node->noCount = false;
}
}
else
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment