|
12 | 12 | *by PostgreSQL |
13 | 13 | * |
14 | 14 | * IDENTIFICATION |
15 | | - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.445 2006/08/02 21:43:43 momjian Exp $ |
| 15 | + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.446 2006/08/04 18:32:15 momjian Exp $ |
16 | 16 | * |
17 | 17 | *------------------------------------------------------------------------- |
18 | 18 | */ |
@@ -632,7 +632,10 @@ main(int argc, char **argv) |
632 | 632 | { |
633 | 633 | /* Special case for when -N is the first argument */ |
634 | 634 | if (this_obj_name==schemaList&& !this_obj_name->is_include) |
635 | | -appendPQExpBuffer(query,"SELECT oid FROM pg_catalog.pg_namespace EXCEPT\n"); |
| 635 | +appendPQExpBuffer(query, |
| 636 | +"SELECT oid FROM pg_catalog.pg_namespace " |
| 637 | +"WHERE nspname NOT LIKE 'pg_%%' AND " |
| 638 | +" nspname != 'information_schema' EXCEPT\n"); |
636 | 639 |
|
637 | 640 | appendPQExpBuffer(query,"SELECT oid FROM pg_catalog.pg_namespace WHERE"); |
638 | 641 | } |
@@ -694,7 +697,12 @@ main(int argc, char **argv) |
694 | 697 | { |
695 | 698 | /* Special case for when -T is the first argument */ |
696 | 699 | if (this_obj_name==tableList&& !this_obj_name->is_include&& !strlen(query->data)) |
697 | | -appendPQExpBuffer(query,"SELECT oid FROM pg_catalog.pg_class WHERE relkind='r' EXCEPT\n"); |
| 700 | +appendPQExpBuffer(query, |
| 701 | +"SELECT pg_class.oid FROM pg_catalog.pg_class, pg_catalog.pg_namespace " |
| 702 | +"WHERE relkind='r' AND " |
| 703 | +" relnamespace = pg_namespace.oid AND " |
| 704 | +" nspname NOT LIKE 'pg_%%' AND " |
| 705 | +" nspname != 'information_schema' EXCEPT\n"); |
698 | 706 |
|
699 | 707 | appendPQExpBuffer(query,"SELECT oid FROM pg_catalog.pg_class WHERE relkind='r' AND ("); |
700 | 708 | } |
@@ -6169,7 +6177,7 @@ dumpCast(Archive *fout, CastInfo *cast) |
6169 | 6177 | * Skip this cast if all objects are from pg_ |
6170 | 6178 | */ |
6171 | 6179 | if ((funcInfo==NULL|| |
6172 | | -strncmp(funcInfo->dobj.namespace->dobj.name,"pg_",3)==0)&& |
| 6180 | +strncmp(funcInfo->dobj.namespace->dobj.name,"pg_",3)==0)&& |
6173 | 6181 | strncmp(sourceInfo->dobj.namespace->dobj.name,"pg_",3)==0&& |
6174 | 6182 | strncmp(targetInfo->dobj.namespace->dobj.name,"pg_",3)==0) |
6175 | 6183 | return; |
|