aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2001-08-27 01:09:59 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2001-08-27 01:09:59 +0000
commitd15a118a21ade3b207b234cfe03c289f9599604b (patch)
treef656b807b119be2783d691268bf7bf8909569de0 /src
parentceca2a7d14625634f8c95fc2317b55086dece054 (diff)
downloadpostgresql-d15a118a21ade3b207b234cfe03c289f9599604b.tar.gz
postgresql-d15a118a21ade3b207b234cfe03c289f9599604b.zip
Quick-hack solution to regproc/oid issue was not the right solution.
Diffstat (limited to 'src')
-rw-r--r--src/bin/pg_dump/pg_dump.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index e48ed0bdb4c..6085c241f40 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -22,7 +22,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.225 2001/08/27 00:44:40 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.226 2001/08/27 01:09:59 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2883,7 +2883,7 @@ getIndexes(int *numIndexes)
"SELECT i.indexrelid as indexreloid, "
"i.indrelid as indreloid, "
"t1.relname as indexrelname, t2.relname as indrelname, "
- "i.indproc, i.indkey, i.indclass, "
+ "i.indproc :: oid AS indproc, i.indkey, i.indclass, "
"a.amname as indamname, i.indisunique, i.indisprimary, "
"length(i.indpred) > 0 as indhaspred "
"from pg_index i, pg_class t1, pg_class t2, pg_am a "
@@ -4370,16 +4370,15 @@ dumpIndexes(Archive *fout, IndInfo *indinfo, int numIndexes,
continue;
}
- /* indproc is regproc in 7.2, oid previously, so check both */
- if (strcmp(indinfo[i].indproc, "-") == 0 ||
- strcmp(indinfo[i].indproc, "0") == 0)
+
+ if (strcmp(indinfo[i].indproc, "0") == 0)
funcname = NULL;
else
{
int numFuncs;
/*
- * the funcname is an oid which we use to find the name of the
+ * the indproc is an oid which we use to find the name of the
* pg_proc. We need to do this because getFuncs() only reads
* in the user-defined funcs not all the funcs. We might not
* find what we want by looking in FuncInfo*