summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorPeter Eisentraut2018-07-14 10:17:49 +0000
committerPeter Eisentraut2018-07-24 09:38:53 +0000
commitfb421231daaa5228542ef6644cdee505fbc31dba (patch)
tree834fe490420b2ec96fb90dec9635b4ac3231f2a1 /src/test
parent9ebe0572ceab69c57811746ead2d3418daea8673 (diff)
psql: Add option for procedures to \df
Diffstat (limited to 'src/test')
-rw-r--r--src/test/regress/expected/create_procedure.out32
-rw-r--r--src/test/regress/sql/create_procedure.sql12
2 files changed, 33 insertions, 11 deletions
diff --git a/src/test/regress/expected/create_procedure.out b/src/test/regress/expected/create_procedure.out
index 90e8f3c5ff0..5b9b83839cf 100644
--- a/src/test/regress/expected/create_procedure.out
+++ b/src/test/regress/expected/create_procedure.out
@@ -15,14 +15,6 @@ LANGUAGE SQL
AS $$
INSERT INTO cp_test VALUES (1, x);
$$;
-SELECT ptest1('x'); -- error
-ERROR: ptest1(unknown) is a procedure
-LINE 1: SELECT ptest1('x');
- ^
-HINT: To call a procedure, use CALL.
-CALL ptest1('a'); -- ok
-CALL ptest1('xy' || 'zzy'); -- ok, constant-folded arg
-CALL ptest1(substring(random()::numeric(20,15)::text, 1, 1)); -- ok, volatile arg
\df ptest1
List of functions
Schema | Name | Result data type | Argument data types | Type
@@ -41,6 +33,30 @@ SELECT pg_get_functiondef('ptest1'::regproc);
(1 row)
+-- show only normal functions
+\dfn public.*test*1
+ List of functions
+ Schema | Name | Result data type | Argument data types | Type
+--------+--------------+------------------+---------------------+------
+ public | cp_testfunc1 | integer | a integer | func
+(1 row)
+
+-- show only procedures
+\dfp public.*test*1
+ List of functions
+ Schema | Name | Result data type | Argument data types | Type
+--------+--------+------------------+---------------------+------
+ public | ptest1 | | x text | proc
+(1 row)
+
+SELECT ptest1('x'); -- error
+ERROR: ptest1(unknown) is a procedure
+LINE 1: SELECT ptest1('x');
+ ^
+HINT: To call a procedure, use CALL.
+CALL ptest1('a'); -- ok
+CALL ptest1('xy' || 'zzy'); -- ok, constant-folded arg
+CALL ptest1(substring(random()::numeric(20,15)::text, 1, 1)); -- ok, volatile arg
SELECT * FROM cp_test ORDER BY b COLLATE "C";
a | b
---+-------
diff --git a/src/test/regress/sql/create_procedure.sql b/src/test/regress/sql/create_procedure.sql
index 0a9af8c9063..b64293ed669 100644
--- a/src/test/regress/sql/create_procedure.sql
+++ b/src/test/regress/sql/create_procedure.sql
@@ -11,14 +11,20 @@ AS $$
INSERT INTO cp_test VALUES (1, x);
$$;
+\df ptest1
+SELECT pg_get_functiondef('ptest1'::regproc);
+
+-- show only normal functions
+\dfn public.*test*1
+
+-- show only procedures
+\dfp public.*test*1
+
SELECT ptest1('x'); -- error
CALL ptest1('a'); -- ok
CALL ptest1('xy' || 'zzy'); -- ok, constant-folded arg
CALL ptest1(substring(random()::numeric(20,15)::text, 1, 1)); -- ok, volatile arg
-\df ptest1
-SELECT pg_get_functiondef('ptest1'::regproc);
-
SELECT * FROM cp_test ORDER BY b COLLATE "C";