|
7 | 7 | * |
8 | 8 | * |
9 | 9 | * IDENTIFICATION |
10 | | - * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.112 1997/11/18 06:46:21 momjian Exp $ |
| 10 | + * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.113 1997/11/19 03:14:19 momjian Exp $ |
11 | 11 | * |
12 | 12 | *------------------------------------------------------------------------- |
13 | 13 | */ |
@@ -1709,19 +1709,33 @@ HandleSlashCmds(PsqlSettings *pset, |
1709 | 1709 | /* descriptions */ |
1710 | 1710 | objectDescription(pset,optarg+1,NULL); |
1711 | 1711 | elseif (strncmp(cmd,"df",2)==0) |
| 1712 | +{ |
1712 | 1713 | /* functions/procedures */ |
1713 | 1714 | /* we skip in/out funcs by excluding functions that take |
1714 | 1715 | some arguments, but have no types defined for those arguments */ |
1715 | 1716 | SendQuery(&success,pset,"\ |
1716 | | -SELECTp.proname as function, \ |
1717 | | -t.typname as return_type, \ |
| 1717 | +SELECTt.typname as return_type, \ |
| 1718 | +p.proname as function, \ |
| 1719 | +oid8types(p.proargtypes) as arguments, \ |
| 1720 | +obj_description(p.oid) \ |
| 1721 | +FROM pg_proc p, pg_type t \ |
| 1722 | +WHERE p.prorettype = t.oid and \ |
| 1723 | +(pronargs = 0 or oid8types(p.proargtypes) != '') and \ |
| 1724 | +t.typname != 'bool' \ |
| 1725 | +ORDER BY return_type, function;", |
| 1726 | +false, false,0); |
| 1727 | +SendQuery(&success,pset,"\ |
| 1728 | +SELECTt.typname as return_type, \ |
| 1729 | +p.proname as function, \ |
1718 | 1730 | oid8types(p.proargtypes) as arguments, \ |
1719 | 1731 | obj_description(p.oid) \ |
1720 | 1732 | FROM pg_proc p, pg_type t \ |
1721 | 1733 | WHERE p.prorettype = t.oid and \ |
1722 | | -(pronargs = 0 or oid8types(p.proargtypes) != '') \ |
1723 | | -ORDER BY function;", |
| 1734 | +(pronargs = 0 or oid8types(p.proargtypes) != '') and \ |
| 1735 | +t.typname = 'bool' \ |
| 1736 | +ORDER BY return_type, function;", |
1724 | 1737 | false, false,0); |
| 1738 | +} |
1725 | 1739 | elseif (strncmp(cmd,"di",2)==0) |
1726 | 1740 | /* only indices */ |
1727 | 1741 | tableList(pset, false,'i', false); |
|