|
22 | 22 | * |
23 | 23 | * |
24 | 24 | * IDENTIFICATION |
25 | | - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.231 2001/10/01 21:31:52 tgl Exp $ |
| 25 | + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.232 2001/10/03 05:23:12 thomas Exp $ |
26 | 26 | * |
27 | 27 | *------------------------------------------------------------------------- |
28 | 28 | */ |
@@ -2066,47 +2066,47 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs) |
2066 | 2066 | if (g_fout->remoteVersion >=70200) |
2067 | 2067 | { |
2068 | 2068 | appendPQExpBuffer(query, |
2069 | | -"SELECT pg_class.oid, relname, relacl, relkind, " |
2070 | | -"(select usename from pg_user where relowner = usesysid) as usename, " |
2071 | | -"relchecks, reltriggers, relhasindex, relhasoids " |
2072 | | -"from pg_class " |
2073 | | -"where relname !~ '^pg_' " |
2074 | | -"and relkind in ('%c', '%c', '%c') " |
2075 | | -"order by oid", |
2076 | | -RELKIND_RELATION,RELKIND_SEQUENCE,RELKIND_VIEW); |
| 2069 | +"SELECT pg_class.oid, relname, relacl, relkind, " |
| 2070 | +"(select usename from pg_user where relowner = usesysid) as usename, " |
| 2071 | +"relchecks, reltriggers, relhasindex, relhasoids " |
| 2072 | +"from pg_class " |
| 2073 | +"where relname !~ '^pg_' " |
| 2074 | +"and relkind in ('%c', '%c', '%c') " |
| 2075 | +"order by oid", |
| 2076 | +RELKIND_RELATION,RELKIND_SEQUENCE,RELKIND_VIEW); |
2077 | 2077 | } |
2078 | 2078 | elseif (g_fout->remoteVersion >=70100) |
2079 | 2079 | { |
2080 | 2080 | /* all tables have oids in 7.1 */ |
2081 | 2081 | appendPQExpBuffer(query, |
2082 | | -"SELECT pg_class.oid, relname, relacl, relkind, " |
2083 | | -"(select usename from pg_user where relowner = usesysid) as usename, " |
2084 | | -"relchecks, reltriggers, relhasindex, 't'::bool as relhasoids " |
2085 | | -"from pg_class " |
2086 | | -"where relname !~ '^pg_' " |
2087 | | -"and relkind in ('%c', '%c', '%c') " |
2088 | | -"order by oid", |
2089 | | -RELKIND_RELATION,RELKIND_SEQUENCE,RELKIND_VIEW); |
| 2082 | +"SELECT pg_class.oid, relname, relacl, relkind, " |
| 2083 | +"(select usename from pg_user where relowner = usesysid) as usename, " |
| 2084 | +"relchecks, reltriggers, relhasindex, 't'::bool as relhasoids " |
| 2085 | +"from pg_class " |
| 2086 | +"where relname !~ '^pg_' " |
| 2087 | +"and relkind in ('%c', '%c', '%c') " |
| 2088 | +"order by oid", |
| 2089 | +RELKIND_RELATION,RELKIND_SEQUENCE,RELKIND_VIEW); |
2090 | 2090 | }else { |
2091 | 2091 | /* |
2092 | 2092 | * Before 7.1, view relkind was not set to 'v', so we must check |
2093 | 2093 | * if we have a view by looking for a rule in pg_rewrite. |
2094 | 2094 | */ |
2095 | 2095 | appendPQExpBuffer(query, |
2096 | | -"SELECT c.oid, relname, relacl, " |
2097 | | -"CASE WHEN relhasrules and relkind = 'r' " |
2098 | | -" and EXISTS(SELECT rulename FROM pg_rewrite r WHERE " |
2099 | | -" r.ev_class = c.oid AND r.ev_type = '1') " |
2100 | | -"THEN '%c'::\"char\" " |
2101 | | -"ELSE relkind END AS relkind," |
2102 | | -"(select usename from pg_user where relowner = usesysid) as usename, " |
2103 | | -"relchecks, reltriggers, relhasindex, 't'::bool as relhasoids " |
2104 | | -"from pg_class c " |
2105 | | -"where relname !~ '^pg_' " |
2106 | | -"and relkind in ('%c', '%c', '%c') " |
2107 | | -"order by oid", |
2108 | | -RELKIND_VIEW, |
2109 | | -RELKIND_RELATION,RELKIND_SEQUENCE,RELKIND_VIEW); |
| 2096 | +"SELECT c.oid, relname, relacl, " |
| 2097 | +"CASE WHEN relhasrules and relkind = 'r' " |
| 2098 | +" and EXISTS(SELECT rulename FROM pg_rewrite r WHERE " |
| 2099 | +" r.ev_class = c.oid AND r.ev_type = '1') " |
| 2100 | +"THEN '%c'::\"char\" " |
| 2101 | +"ELSE relkind END AS relkind," |
| 2102 | +"(select usename from pg_user where relowner = usesysid) as usename, " |
| 2103 | +"relchecks, reltriggers, relhasindex, 't'::bool as relhasoids " |
| 2104 | +"from pg_class c " |
| 2105 | +"where relname !~ '^pg_' " |
| 2106 | +"and relkind in ('%c', '%c', '%c') " |
| 2107 | +"order by oid", |
| 2108 | +RELKIND_VIEW, |
| 2109 | +RELKIND_RELATION,RELKIND_SEQUENCE,RELKIND_VIEW); |
2110 | 2110 | } |
2111 | 2111 |
|
2112 | 2112 | res=PQexec(g_conn,query->data); |
|
