77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.107 1997/11/16 04:36:20 momjian Exp $
10+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.108 1997/11/16 05:32:16 momjian Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
@@ -1719,11 +1719,11 @@ HandleSlashCmds(PsqlSettings *pset,
17191719 {
17201720 /* operators */
17211721 SendQuery (& success , pset ,"\
1722- SELECT t0.typname AS result, \
1722+ SELECT o.oprname AS operator_, \
1723+ p.proname AS func_name, \
1724+ t0.typname AS result, \
17231725 t1.typname AS left_type, \
17241726 t2.typname AS right_type, \
1725- o.oprname AS operatr, \
1726- p.proname AS func_name, \
17271727 obj_description(o.oid) as description \
17281728 FROM pg_proc p, pg_type t0, \
17291729 pg_type t1, pg_type t2, \
@@ -1733,29 +1733,34 @@ HandleSlashCmds(PsqlSettings *pset,
17331733 p.pronargs = 2 AND \
17341734 o.oprleft = t1.oid AND \
17351735 o.oprright = t2.oid \
1736- ORDER BY result, left_type, right_type, operatr;" ,
1736+ ORDER BY operator_, func_name, result, left_type, \
1737+ right_type;" ,
17371738 false, false, 0 );
17381739 SendQuery (& success , pset ,"\
17391740 SELECT o.oprname AS left_unary, \
1740- t.typname AS operand, \
1741- r.typname AS return_type, \
1741+ p.proname AS func_name, \
1742+ t0.typname AS return_type, \
1743+ t1.typname AS operand, \
17421744 obj_description(o.oid) as description \
1743- FROM pg_operator o, pg_type t, pg_type r \
1744- WHERE o.oprkind = 'l' AND \
1745- o.oprright = t.oid AND \
1746- o.oprresult = r.oid \
1747- ORDER BY operand;" ,
1745+ FROM pg_operator o, pg_proc p, pg_type t0, pg_type t1 \
1746+ WHERE RegprocToOid(o.oprcode) = p.oid AND \
1747+ o.oprresult = t0.oid AND \
1748+ o.oprkind = 'l' AND \
1749+ o.oprright = t1.oid \
1750+ ORDER BY left_unary, func_name, return_type, operand;" ,
17481751 false, false, 0 );
17491752 SendQuery (& success , pset ,"\
17501753 SELECT o.oprname AS right_unary, \
1751- t.typname AS operand, \
1752- r.typname AS return_type, \
1754+ p.proname AS func_name, \
1755+ t0.typname AS return_type, \
1756+ t1.typname AS operand, \
17531757 obj_description(o.oid) as description \
1754- FROM pg_operator o, pg_type t, pg_type r \
1755- WHERE o.oprkind = 'r' AND \
1756- o.oprleft = t.oid AND \
1757- o.oprresult = r.oid \
1758- ORDER BY operand;" ,
1758+ FROM pg_operator o, pg_proc p, pg_type t0, pg_type t1 \
1759+ WHERE RegprocToOid(o.oprcode) = p.oid AND \
1760+ o.oprresult = t0.oid AND \
1761+ o.oprkind = 'r' AND \
1762+ o.oprleft = t1.oid \
1763+ ORDER BY right_unary, func_name, return_type, operand;" ,
17591764 false, false, 0 );
17601765 }
17611766 else if (strncmp (cmd , "ds" , 2 ) == 0 )
0 commit comments