diff options
| -rw-r--r-- | src/backend/executor/functions.c | 5 | ||||
| -rw-r--r-- | src/backend/optimizer/util/clauses.c | 5 | ||||
| -rw-r--r-- | src/test/regress/expected/rangefuncs.out | 20 | ||||
| -rw-r--r-- | src/test/regress/sql/rangefuncs.sql | 19 |
4 files changed, 49 insertions, 0 deletions
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 0dec881d37e..d304857702f 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -979,6 +979,11 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList, * This can happen, for example, where the body of the function is * 'SELECT func2()', where func2 has the same return type as the * function that's calling it. + * + * XXX Note that if rettype is RECORD, the IsBinaryCoercible check + * will succeed for any composite restype. For the moment we rely on + * runtime type checking to catch any discrepancy, but it'd be nice to + * do better at parse time. */ if (tlistlen == 1) { diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index c9904b4976b..b372f89d0e8 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -3019,6 +3019,10 @@ evaluate_function(Oid funcid, Oid result_type, int32 result_typmod, List *args, * We must also beware of changing the volatility or strictness status of * functions by inlining them. * + * Also, at the moment we can't inline functions returning RECORD. This + * doesn't work in the general case because it discards information such + * as OUT-parameter declarations. + * * Returns a simplified expression if successful, or NULL if cannot * simplify the function. */ @@ -3049,6 +3053,7 @@ inline_function(Oid funcid, Oid result_type, List *args, if (funcform->prolang != SQLlanguageId || funcform->prosecdef || funcform->proretset || + funcform->prorettype == RECORDOID || !heap_attisnull(func_tuple, Anum_pg_proc_proconfig) || funcform->pronargs != list_length(args)) return NULL; diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out index 96787630fd9..f297a112399 100644 --- a/src/test/regress/expected/rangefuncs.out +++ b/src/test/regress/expected/rangefuncs.out @@ -548,3 +548,23 @@ select t.a, t, t.a from foo1(10000) t limit 1; (1 row) drop function foo1(n integer); +-- check handling of a SQL function with multiple OUT params (bug #5777) +create or replace function foobar(out integer, out numeric) as +$$ select (1, 2.1) $$ language sql; +select * from foobar(); + column1 | column2 +---------+--------- + 1 | 2.1 +(1 row) + +create or replace function foobar(out integer, out numeric) as +$$ select (1, 2) $$ language sql; +select * from foobar(); -- fail +ERROR: function return row and query-specified return row do not match +DETAIL: Returned type integer at ordinal position 2, but query expects numeric. +create or replace function foobar(out integer, out numeric) as +$$ select (1, 2.1, 3) $$ language sql; +select * from foobar(); -- fail +ERROR: function return row and query-specified return row do not match +DETAIL: Returned row contains 3 attributes, but query expects 2. +drop function foobar(); diff --git a/src/test/regress/sql/rangefuncs.sql b/src/test/regress/sql/rangefuncs.sql index baa56c7355c..b2753a0f55d 100644 --- a/src/test/regress/sql/rangefuncs.sql +++ b/src/test/regress/sql/rangefuncs.sql @@ -274,3 +274,22 @@ reset work_mem; select t.a, t, t.a from foo1(10000) t limit 1; drop function foo1(n integer); + +-- check handling of a SQL function with multiple OUT params (bug #5777) + +create or replace function foobar(out integer, out numeric) as +$$ select (1, 2.1) $$ language sql; + +select * from foobar(); + +create or replace function foobar(out integer, out numeric) as +$$ select (1, 2) $$ language sql; + +select * from foobar(); -- fail + +create or replace function foobar(out integer, out numeric) as +$$ select (1, 2.1, 3) $$ language sql; + +select * from foobar(); -- fail + +drop function foobar(); |