|
22 | 22 | * |
23 | 23 | * |
24 | 24 | * IDENTIFICATION |
25 | | - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.225 2001/08/2700:44:40 tgl Exp $ |
| 25 | + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.226 2001/08/2701:09:59 tgl Exp $ |
26 | 26 | * |
27 | 27 | *------------------------------------------------------------------------- |
28 | 28 | */ |
@@ -2883,7 +2883,7 @@ getIndexes(int *numIndexes) |
2883 | 2883 | "SELECT i.indexrelid as indexreloid, " |
2884 | 2884 | "i.indrelid as indreloid, " |
2885 | 2885 | "t1.relname as indexrelname, t2.relname as indrelname, " |
2886 | | -"i.indproc, i.indkey, i.indclass, " |
| 2886 | +"i.indproc :: oid AS indproc, i.indkey, i.indclass, " |
2887 | 2887 | "a.amname as indamname, i.indisunique, i.indisprimary, " |
2888 | 2888 | "length(i.indpred) > 0 as indhaspred " |
2889 | 2889 | "from pg_index i, pg_class t1, pg_class t2, pg_am a " |
@@ -4370,16 +4370,15 @@ dumpIndexes(Archive *fout, IndInfo *indinfo, int numIndexes, |
4370 | 4370 | continue; |
4371 | 4371 | } |
4372 | 4372 |
|
4373 | | -/* indproc is regproc in 7.2, oid previously, so check both */ |
4374 | | -if (strcmp(indinfo[i].indproc,"-")==0|| |
4375 | | -strcmp(indinfo[i].indproc,"0")==0) |
| 4373 | + |
| 4374 | +if (strcmp(indinfo[i].indproc,"0")==0) |
4376 | 4375 | funcname=NULL; |
4377 | 4376 | else |
4378 | 4377 | { |
4379 | 4378 | intnumFuncs; |
4380 | 4379 |
|
4381 | 4380 | /* |
4382 | | - * thefuncname is an oid which we use to find the name of the |
| 4381 | + * theindproc is an oid which we use to find the name of the |
4383 | 4382 | * pg_proc. We need to do this because getFuncs() only reads |
4384 | 4383 | * in the user-defined funcs not all the funcs. We might not |
4385 | 4384 | * find what we want by looking in FuncInfo* |
|