diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pl/plpgsql/src/pl_exec.c | 58 | ||||
| -rw-r--r-- | src/test/regress/expected/plpgsql.out | 32 | ||||
| -rw-r--r-- | src/test/regress/sql/plpgsql.sql | 33 |
3 files changed, 112 insertions, 11 deletions
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index aac7cdaf7cb..79dd6a22fce 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -2508,6 +2508,7 @@ exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt) estate->retval = (Datum) 0; estate->rettupdesc = NULL; estate->retisnull = true; + estate->rettype = InvalidOid; /* * Special case path when the RETURN expression is a simple variable @@ -2534,18 +2535,40 @@ exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt) estate->retval = var->value; estate->retisnull = var->isnull; estate->rettype = var->datatype->typoid; + + /* + * Cope with retistuple case. A PLpgSQL_var could not be + * of composite type, so we needn't make any effort to + * convert. However, for consistency with the expression + * code path, don't throw error if the result is NULL. + */ + if (estate->retistuple && !estate->retisnull) + ereport(ERROR, + (errcode(ERRCODE_DATATYPE_MISMATCH), + errmsg("cannot return non-composite value from function returning composite type"))); } break; case PLPGSQL_DTYPE_REC: { PLpgSQL_rec *rec = (PLpgSQL_rec *) retvar; + int32 rettypmod; if (HeapTupleIsValid(rec->tup)) { - estate->retval = PointerGetDatum(rec->tup); - estate->rettupdesc = rec->tupdesc; - estate->retisnull = false; + if (estate->retistuple) + { + estate->retval = PointerGetDatum(rec->tup); + estate->rettupdesc = rec->tupdesc; + estate->retisnull = false; + } + else + exec_eval_datum(estate, + retvar, + &estate->rettype, + &rettypmod, + &estate->retval, + &estate->retisnull); } } break; @@ -2553,15 +2576,28 @@ exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt) case PLPGSQL_DTYPE_ROW: { PLpgSQL_row *row = (PLpgSQL_row *) retvar; + int32 rettypmod; - Assert(row->rowtupdesc); - estate->retval = - PointerGetDatum(make_tuple_from_row(estate, row, - row->rowtupdesc)); - if (DatumGetPointer(estate->retval) == NULL) /* should not happen */ - elog(ERROR, "row not compatible with its own tupdesc"); - estate->rettupdesc = row->rowtupdesc; - estate->retisnull = false; + if (estate->retistuple) + { + HeapTuple tup; + + if (!row->rowtupdesc) /* should not happen */ + elog(ERROR, "row variable has no tupdesc"); + tup = make_tuple_from_row(estate, row, row->rowtupdesc); + if (tup == NULL) /* should not happen */ + elog(ERROR, "row not compatible with its own tupdesc"); + estate->retval = PointerGetDatum(tup); + estate->rettupdesc = row->rowtupdesc; + estate->retisnull = false; + } + else + exec_eval_datum(estate, + retvar, + &estate->rettype, + &rettypmod, + &estate->retval, + &estate->retisnull); } break; diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out index 78e5a85810e..7ce5415f053 100644 --- a/src/test/regress/expected/plpgsql.out +++ b/src/test/regress/expected/plpgsql.out @@ -4001,6 +4001,38 @@ $$ language plpgsql; select compos(); ERROR: cannot return non-composite value from function returning composite type CONTEXT: PL/pgSQL function compos() line 3 at RETURN +-- RETURN variable is a different code path ... +create or replace function compos() returns compostype as $$ +declare x int := 42; +begin + return x; +end; +$$ language plpgsql; +select * from compos(); +ERROR: cannot return non-composite value from function returning composite type +CONTEXT: PL/pgSQL function compos() line 4 at RETURN +drop function compos(); +-- test: invalid use of composite variable in scalar-returning function +create or replace function compos() returns int as $$ +declare + v compostype; +begin + v := (1, 'hello'); + return v; +end; +$$ language plpgsql; +select compos(); +ERROR: invalid input syntax for integer: "(1,hello)" +CONTEXT: PL/pgSQL function compos() while casting return value to function's return type +-- test: invalid use of composite expression in scalar-returning function +create or replace function compos() returns int as $$ +begin + return (1, 'hello')::compostype; +end; +$$ language plpgsql; +select compos(); +ERROR: invalid input syntax for integer: "(1,hello)" +CONTEXT: PL/pgSQL function compos() while casting return value to function's return type drop function compos(); drop type compostype; -- diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql index e19e4153867..aaf3e8479fe 100644 --- a/src/test/regress/sql/plpgsql.sql +++ b/src/test/regress/sql/plpgsql.sql @@ -3248,6 +3248,39 @@ $$ language plpgsql; select compos(); +-- RETURN variable is a different code path ... +create or replace function compos() returns compostype as $$ +declare x int := 42; +begin + return x; +end; +$$ language plpgsql; + +select * from compos(); + +drop function compos(); + +-- test: invalid use of composite variable in scalar-returning function +create or replace function compos() returns int as $$ +declare + v compostype; +begin + v := (1, 'hello'); + return v; +end; +$$ language plpgsql; + +select compos(); + +-- test: invalid use of composite expression in scalar-returning function +create or replace function compos() returns int as $$ +begin + return (1, 'hello')::compostype; +end; +$$ language plpgsql; + +select compos(); + drop function compos(); drop type compostype; |