diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-08-06 05:13:14 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-08-06 05:13:14 +0000 |
| commit | af5fde7491670e2deb7966a99c25a9b69b7bc86f (patch) | |
| tree | 16cabda6c2ea1a8ca37fbbe97e5f5ae75e171b4d /src/bin | |
| parent | 8962ec4bc4a0020ad60089250647fb2264cfd258 (diff) | |
| download | postgresql-af5fde7491670e2deb7966a99c25a9b69b7bc86f.tar.gz | |
Make large objects their own relkind type. Fix dups in pg_class_mb
files. Fix sequence creation hack for relkind type.
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 6 | ||||
| -rw-r--r-- | src/bin/psql/psql.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index ad68b9fcde..b3f0bbeba6 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.78 1998/07/19 05:24:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.79 1998/08/06 05:12:51 momjian Exp $ * * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb * @@ -1418,7 +1418,7 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs) "from pg_class, pg_user " "where relowner = usesysid and " "(relkind = 'r' or relkind = 'S') and relname !~ '^pg_' " - "and relname !~ '^xin[xv][0-9]+' order by oid"); + "order by oid"); res = PQexec(g_conn, query); if (!res || @@ -1879,7 +1879,7 @@ getIndices(int *numIndices) "from pg_index i, pg_class t1, pg_class t2, pg_am a " "where t1.oid = i.indexrelid and t2.oid = i.indrelid " "and t1.relam = a.oid and i.indexrelid > '%d'::oid " - "and t2.relname !~ '^pg_' and t1.relname !~ '^xinx'", + "and t2.relname !~ '^pg_' and t1.relkind != 'l'", g_last_builtin_oid); res = PQexec(g_conn, query); diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c index 0b4c78a7e6..b3f692780e 100644 --- a/src/bin/psql/psql.c +++ b/src/bin/psql/psql.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.151 1998/08/05 16:23:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.152 1998/08/06 05:12:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -408,7 +408,6 @@ tableList(PsqlSettings *pset, bool deep_tablelist, char info_type, strcat(listbuf, " and relname !~ '^pg_'"); else strcat(listbuf, " and relname ~ '^pg_'"); - strcat(listbuf, " and relname !~ '^xin[vx][0-9]+'"); strcat(listbuf, " and usesysid = relowner"); strcat(listbuf, " ORDER BY relname "); if (!(res = PSQLexec(pset, listbuf))) @@ -544,7 +543,6 @@ rightsList(PsqlSettings *pset) strcat(listbuf, "FROM pg_class, pg_user "); strcat(listbuf, "WHERE ( relkind = 'r' OR relkind = 'i' OR relkind = 'S') "); strcat(listbuf, " and relname !~ '^pg_'"); - strcat(listbuf, " and relname !~ '^xin[vx][0-9]+'"); strcat(listbuf, " and usesysid = relowner"); strcat(listbuf, " ORDER BY relname "); if (!(res = PSQLexec(pset, listbuf))) |