When a function not returning RECORD has a single OUT parameter, use

the parameter's name (if any) as the default column name for SELECT FROM
the function, rather than the function name as previously.  I still think
this is a bad idea, but I lost the argument.  Force decompilation of
function RTEs to specify full aliases always, to reduce the odds of this
decision breaking dumped views.

2 files changed, 16 insertions, 16 deletions

diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index 170669c62bd..aef73e1eee7 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -1762,7 +1762,7 @@ select f1(42);
 (1 row)
 
 select * from f1(42);
- f1 
+ j  
 ----
  43
 (1 row)
@@ -1778,7 +1778,7 @@ select f1(42);
 (1 row)
 
 select * from f1(42);
- f1 
+ i  
 ----
  43
 (1 row)
@@ -1793,7 +1793,7 @@ begin
   return;
 end$$ language plpgsql;
 select * from f1(42);
- f1 
+ j  
 ----
  43
  44
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
index 42f770ff55a..49fc121f04f 100644
--- a/src/test/regress/expected/rangefuncs.out
+++ b/src/test/regress/expected/rangefuncs.out
@@ -1,15 +1,15 @@
 SELECT name, setting FROM pg_settings WHERE name LIKE 'enable%';
-            name             | setting 
+       name        | setting 
 -------------------+---------
- enable_bitmapscan           | on
- enable_hashagg              | on
- enable_hashjoin             | on
- enable_indexscan            | on
- enable_mergejoin            | on
- enable_nestloop             | on
- enable_seqscan              | on
- enable_sort                 | on
- enable_tidscan              | on
+ enable_bitmapscan | on
+ enable_hashagg    | on
+ enable_hashjoin   | on
+ enable_indexscan  | on
+ enable_mergejoin  | on
+ enable_nestloop   | on
+ enable_seqscan    | on
+ enable_sort       | on
+ enable_tidscan    | on
 (9 rows)
 
 CREATE TABLE foo2(fooid int, f2 int);
@@ -409,9 +409,9 @@ SELECT foo(42);
 (1 row)
 
 SELECT * FROM foo(42);
- foo 
------
-  43
+ f2 
+----
+ 43
 (1 row)
 
 SELECT * FROM foo(42) AS p(x);