Index: src/bin/psql/describe.c
===================================================================
RCS file: /opt/src/cvs/pgsql/src/bin/psql/describe.c,v
retrieving revision 1.56
diff -c -r1.56 describe.c
*** src/bin/psql/describe.c	20 Jul 2002 05:57:31 -0000	1.56
--- src/bin/psql/describe.c	20 Jul 2002 20:57:16 -0000
***************
*** 1021,1031 ****
  	initPQExpBuffer(&buf);
  
  	printfPQExpBuffer(&buf,
! 			 "SELECT c.relname as \"%s\",\n"
! 			 "  n.nspname as \"%s\",\n"
  			 "  CASE c.relkind WHEN 'r' THEN '%s' WHEN 'v' THEN '%s' WHEN 'i' THEN '%s' WHEN 'S' THEN '%s' WHEN 's' THEN '%s' END as \"%s\",\n"
  			 "  u.usename as \"%s\"",
! 			 _("Name"), _("Schema"), _("table"), _("view"), _("index"), _("sequence"),
  			 _("special"), _("Type"), _("Owner"));
  
  	if (desc)
--- 1021,1031 ----
  	initPQExpBuffer(&buf);
  
  	printfPQExpBuffer(&buf,
! 			 "SELECT n.nspname as \"%s\",\n"
! 			 "  c.relname as \"%s\",\n"
  			 "  CASE c.relkind WHEN 'r' THEN '%s' WHEN 'v' THEN '%s' WHEN 'i' THEN '%s' WHEN 'S' THEN '%s' WHEN 's' THEN '%s' END as \"%s\",\n"
  			 "  u.usename as \"%s\"",
! 			 _("Schema"), _("Name"), _("table"), _("view"), _("index"), _("sequence"),
  			 _("special"), _("Type"), _("Owner"));
  
  	if (desc)
***************
*** 1068,1074 ****
  	if (name)
  		appendPQExpBuffer(&buf, "  AND c.relname ~ '^%s'\n", name);
  
! 	appendPQExpBuffer(&buf, "ORDER BY 2,1;");
  
  	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
--- 1068,1074 ----
  	if (name)
  		appendPQExpBuffer(&buf, "  AND c.relname ~ '^%s'\n", name);
  
! 	appendPQExpBuffer(&buf, "ORDER BY 1,2;");
  
  	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);