diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-01-06 01:43:01 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-01-06 01:43:01 +0000 |
| commit | 682b12899399700d36a3e6fbf70fd80a987efbf1 (patch) | |
| tree | 118b444de8b86007ce12482479bc02a270f5e833 | |
| parent | 0ad5e43772faf79f086614e3d0e430dbde0ad9fc (diff) | |
| download | postgresql-682b12899399700d36a3e6fbf70fd80a987efbf1.tar.gz postgresql-682b12899399700d36a3e6fbf70fd80a987efbf1.zip | |
Fix NOT NULL option for plpgsql variables (doesn't look like it
could ever have worked...)
| -rw-r--r-- | src/pl/plpgsql/src/pl_exec.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index 174dc92f3d0..fde0ad5a4b5 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.34 2001/01/04 02:38:02 tgl Exp $ + * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.35 2001/01/06 01:43:01 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -2210,6 +2210,7 @@ exec_assign_value(PLpgSQL_execstate * estate, int natts; Datum *values; char *nulls; + Datum newvalue; bool attisnull; Oid atttype; int32 atttypmod; @@ -2225,15 +2226,16 @@ exec_assign_value(PLpgSQL_execstate * estate, * ---------- */ var = (PLpgSQL_var *) target; - var->value = exec_cast_value(value, valtype, var->datatype->typoid, - &(var->datatype->typinput), - var->datatype->typelem, - var->datatype->atttypmod, - isNull); + newvalue = exec_cast_value(value, valtype, var->datatype->typoid, + &(var->datatype->typinput), + var->datatype->typelem, + var->datatype->atttypmod, + isNull); - if (isNull && var->notnull) + if (*isNull && var->notnull) elog(ERROR, "NULL assignment to variable '%s' declared NOT NULL", var->refname); + var->value = newvalue; var->isnull = *isNull; break; |