database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-18 02:02:55 +03:00
Code Activity

Fix plpgsql so that when a local variable has no initial-value expression,

Browse Source 
an error will be thrown correctly if the variable is of a NOT NULL domain.
Report and almost-correct fix from Sergiy Vyshnevetskiy (bug #2948).
This commit is contained in:
Tom Lane
2007-02-01 19:23:00 +00:00
parent 3c7d9add71
commit b7c9821146
3 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pl/plpgsql/src/pl_exec.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.180.2.2 2007/01/30 18:02:28 tgl Exp $
* $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.180.2.3 2007/02/01 19:23:00 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -861,8 +861,27 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
{
if (var->default_val == NULL)
{
/* Initially it contains a NULL */
var->value = (Datum) 0;
var->isnull = true;
/*
* If needed, give the datatype a chance to reject
* NULLs, by assigning a NULL to the variable.
* We claim the value is of type UNKNOWN, not the
* var's datatype, else coercion will be skipped.
* (Do this before the notnull check to be
* consistent with exec_assign_value.)
*/
if (!var->datatype->typinput.fn_strict)
{
bool valIsNull = true;
exec_assign_value(estate,
(PLpgSQL_datum *) var,
(Datum) 0,
UNKNOWNOID,
&valIsNull);
}
if (var->notnull)
ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),