From 135f65e2991b40635cd0469ec3099c1242c2ab6f Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 1 Apr 2005 05:30:38 +0000 Subject: [PATCH] Adjust pg_proc.proargtypes[0] tests in psql \df to handle new NULL value for a function taking no arguments, per report from Michael Fuhr. --- src/bin/psql/describe.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index afae93b89b..e10904acdb 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.113 2005/03/16 23:52:18 neilc Exp $ + * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.114 2005/04/01 05:30:38 momjian Exp $ */ #include "postgres_fe.h" #include "describe.h" @@ -201,7 +201,8 @@ describeFunctions(const char *pattern, bool verbose) */ appendPQExpBuffer(&buf, "WHERE p.prorettype <> 'pg_catalog.cstring'::pg_catalog.regtype\n" - " AND p.proargtypes[0] <> 'pg_catalog.cstring'::pg_catalog.regtype\n" + " AND (p.proargtypes[0] IS NULL\n" + " OR p.proargtypes[0] <> 'pg_catalog.cstring'::pg_catalog.regtype)\n" " AND NOT p.proisagg\n"); processNamePattern(&buf, pattern, true, false, @@ -491,7 +492,8 @@ objectDescription(const char *pattern) " LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace\n" " WHERE p.prorettype <> 'pg_catalog.cstring'::pg_catalog.regtype\n" - " AND p.proargtypes[0] <> 'pg_catalog.cstring'::pg_catalog.regtype\n" + " AND (p.proargtypes[0] IS NULL\n" + " OR p.proargtypes[0] <> 'pg_catalog.cstring'::pg_catalog.regtype)\n" " AND NOT p.proisagg\n", _("function")); processNamePattern(&buf, pattern, true, false, -- 2.40.0