|
3 | 3 | *
|
4 | 4 | * Copyright (c) 2000-2005, PostgreSQL Global Development Group
|
5 | 5 | *
|
6 |
| - * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.131 2006/02/12 03:22:19 momjian Exp $ |
| 6 | + * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.132 2006/02/12 19:31:14 momjian Exp $ |
7 | 7 | */
|
8 | 8 | #include "postgres_fe.h"
|
9 | 9 | #include "describe.h"
|
@@ -194,7 +194,7 @@ describeFunctions(const char *pattern, bool verbose)
|
194 | 194 | "\nFROM pg_catalog.pg_proc p"
|
195 | 195 | "\n LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace"
|
196 | 196 | "\n LEFT JOIN pg_catalog.pg_language l ON l.oid = p.prolang"
|
197 |
| - "\n LEFT JOIN pg_catalog.pg_roles r ON r.oid = p.proowner\n"); |
| 197 | + "\n JOIN pg_catalog.pg_roles r ON r.oid = p.proowner\n"); |
198 | 198 |
|
199 | 199 | /*
|
200 | 200 | * we skip in/out funcs by excluding functions that take or return cstring
|
@@ -367,7 +367,7 @@ listAllDbs(bool verbose)
|
367 | 367 | _("Description"));
|
368 | 368 | appendPQExpBuffer(&buf,
|
369 | 369 | "\nFROM pg_catalog.pg_database d"
|
370 |
| - "\n LEFT JOIN pg_catalog.pg_roles r ON d.datdba = r.oid\n" |
| 370 | + "\n JOIN pg_catalog.pg_roles r ON d.datdba = r.oid\n" |
371 | 371 | "ORDER BY 1;");
|
372 | 372 |
|
373 | 373 | res = PSQLexec(buf.data, false);
|
@@ -1485,7 +1485,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose)
|
1485 | 1485 |
|
1486 | 1486 | appendPQExpBuffer(&buf,
|
1487 | 1487 | "\nFROM pg_catalog.pg_class c"
|
1488 |
| - "\n LEFT JOIN pg_catalog.pg_roles r ON r.oid = c.relowner" |
| 1488 | + "\n JOIN pg_catalog.pg_roles r ON r.oid = c.relowner" |
1489 | 1489 | "\n LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace");
|
1490 | 1490 | if (showIndexes)
|
1491 | 1491 | appendPQExpBuffer(&buf,
|
@@ -1727,7 +1727,7 @@ listSchemas(const char *pattern, bool verbose)
|
1727 | 1727 | _("Access privileges"), _("Description"));
|
1728 | 1728 |
|
1729 | 1729 | appendPQExpBuffer(&buf,
|
1730 |
| - "\nFROM pg_catalog.pg_namespace n LEFT JOIN pg_catalog.pg_roles r\n" |
| 1730 | + "\nFROM pg_catalog.pg_namespace n JOIN pg_catalog.pg_roles r\n" |
1731 | 1731 | " ON n.nspowner=r.oid\n"
|
1732 | 1732 | "WHERE (n.nspname !~ '^pg_temp_' OR\n"
|
1733 | 1733 | " n.nspname = (pg_catalog.current_schemas(true))[1])\n"); /* temp schema is first */
|
|
0 commit comments