(unnamed)

text/plain

Download

Index: src/bin/psql/describe.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/describe.c,v
retrieving revision 1.131
diff -c -c -r1.131 describe.c
*** src/bin/psql/describe.c	12 Feb 2006 03:22:19 -0000	1.131
--- src/bin/psql/describe.c	12 Feb 2006 19:26:31 -0000
***************
*** 194,200 ****
  						  "\nFROM pg_catalog.pg_proc p"
  		"\n     LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace"
  			 "\n     LEFT JOIN pg_catalog.pg_language l ON l.oid = p.prolang"
! 		   "\n     LEFT JOIN pg_catalog.pg_roles r ON r.oid = p.proowner\n");
  
  	/*
  	 * we skip in/out funcs by excluding functions that take or return cstring
--- 194,200 ----
  						  "\nFROM pg_catalog.pg_proc p"
  		"\n     LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace"
  			 "\n     LEFT JOIN pg_catalog.pg_language l ON l.oid = p.prolang"
! 		   "\n     JOIN pg_catalog.pg_roles r ON r.oid = p.proowner\n");
  
  	/*
  	 * we skip in/out funcs by excluding functions that take or return cstring
***************
*** 367,373 ****
  						  _("Description"));
  	appendPQExpBuffer(&buf,
  					  "\nFROM pg_catalog.pg_database d"
! 				  "\n  LEFT JOIN pg_catalog.pg_roles r ON d.datdba = r.oid\n"
  					  "ORDER BY 1;");
  
  	res = PSQLexec(buf.data, false);
--- 367,373 ----
  						  _("Description"));
  	appendPQExpBuffer(&buf,
  					  "\nFROM pg_catalog.pg_database d"
! 				  "\n  JOIN pg_catalog.pg_roles r ON d.datdba = r.oid\n"
  					  "ORDER BY 1;");
  
  	res = PSQLexec(buf.data, false);
***************
*** 1485,1491 ****
  
  	appendPQExpBuffer(&buf,
  					  "\nFROM pg_catalog.pg_class c"
! 			   "\n     LEFT JOIN pg_catalog.pg_roles r ON r.oid = c.relowner"
  	 "\n     LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace");
  	if (showIndexes)
  		appendPQExpBuffer(&buf,
--- 1485,1491 ----
  
  	appendPQExpBuffer(&buf,
  					  "\nFROM pg_catalog.pg_class c"
! 			   "\n     JOIN pg_catalog.pg_roles r ON r.oid = c.relowner"
  	 "\n     LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace");
  	if (showIndexes)
  		appendPQExpBuffer(&buf,
***************
*** 1727,1733 ****
  						  _("Access privileges"), _("Description"));
  
  	appendPQExpBuffer(&buf,
! 		 "\nFROM pg_catalog.pg_namespace n LEFT JOIN pg_catalog.pg_roles r\n"
  					  "       ON n.nspowner=r.oid\n"
  					  "WHERE	(n.nspname !~ '^pg_temp_' OR\n"
  		   "		 n.nspname = (pg_catalog.current_schemas(true))[1])\n");		/* temp schema is first */
--- 1727,1733 ----
  						  _("Access privileges"), _("Description"));
  
  	appendPQExpBuffer(&buf,
! 		 "\nFROM pg_catalog.pg_namespace n JOIN pg_catalog.pg_roles r\n"
  					  "       ON n.nspowner=r.oid\n"
  					  "WHERE	(n.nspname !~ '^pg_temp_' OR\n"
  		   "		 n.nspname = (pg_catalog.current_schemas(true))[1])\n");		/* temp schema is first */