diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-08-04 18:32:15 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-08-04 18:32:15 +0000 |
| commit | ad269d5e3b667a628bb98a6e6b861b4df5451dbb (patch) | |
| tree | e411a47ce2132177f9cde9c64602c938d6bd0e9e | |
| parent | 6db6714ffcf04b4593d7998635e998530f517329 (diff) | |
| download | postgresql-ad269d5e3b667a628bb98a6e6b861b4df5451dbb.tar.gz postgresql-ad269d5e3b667a628bb98a6e6b861b4df5451dbb.zip | |
Fix bug in new pg_dump -T/-N handling that was dumping system schemas if
these options were used before -n/-t.
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 85f779d0ae5..d48cd255c77 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -12,7 +12,7 @@ * by PostgreSQL * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.445 2006/08/02 21:43:43 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.446 2006/08/04 18:32:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -632,7 +632,10 @@ main(int argc, char **argv) { /* Special case for when -N is the first argument */ if (this_obj_name == schemaList && !this_obj_name->is_include) - appendPQExpBuffer(query, "SELECT oid FROM pg_catalog.pg_namespace EXCEPT\n"); + appendPQExpBuffer(query, + "SELECT oid FROM pg_catalog.pg_namespace " + "WHERE nspname NOT LIKE 'pg_%%' AND " + " nspname != 'information_schema' EXCEPT\n"); appendPQExpBuffer(query, "SELECT oid FROM pg_catalog.pg_namespace WHERE"); } @@ -694,7 +697,12 @@ main(int argc, char **argv) { /* Special case for when -T is the first argument */ if (this_obj_name == tableList && !this_obj_name->is_include && !strlen(query->data)) - appendPQExpBuffer(query, "SELECT oid FROM pg_catalog.pg_class WHERE relkind='r' EXCEPT\n"); + appendPQExpBuffer(query, + "SELECT pg_class.oid FROM pg_catalog.pg_class, pg_catalog.pg_namespace " + "WHERE relkind='r' AND " + " relnamespace = pg_namespace.oid AND " + " nspname NOT LIKE 'pg_%%' AND " + " nspname != 'information_schema' EXCEPT\n"); appendPQExpBuffer(query, "SELECT oid FROM pg_catalog.pg_class WHERE relkind='r' AND ("); } @@ -6169,7 +6177,7 @@ dumpCast(Archive *fout, CastInfo *cast) * Skip this cast if all objects are from pg_ */ if ((funcInfo == NULL || - strncmp(funcInfo->dobj.namespace->dobj.name, "pg_", 3) == 0) && + strncmp(funcInfo->dobj.namespace->dobj.name, "pg_", 3) == 0) && strncmp(sourceInfo->dobj.namespace->dobj.name, "pg_", 3) == 0 && strncmp(targetInfo->dobj.namespace->dobj.name, "pg_", 3) == 0) return; |