#ifdef out pg_dump's check on whether a sequence's sequence_name field

matches the sequence name from pg_class.  This fails if the sequence has
been renamed, and seems rather pointless in any case.
Also improve a couple of error messages about inconsistencies.

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 64b4887e29c48e3dbaf06f1c7d7c57d37c6e223d..ceea1e26fe71539fd8c2408eeb60f01e6b52de9f 100644 (file)
--- 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.241 2002/02/11 00:18:20 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.242 2002/02/27 20:59:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2426,8 +2426,12 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs, const char *tablename)
                        n = PQntuples(res2);
                        if (n != 1)
                        {
-                               write_msg(NULL, "query to obtain name of primary key of table \"%s\" did not return exactly one result\n",
-                                                 tblinfo[i].relname);
+                               if (n == 0)
+                                       write_msg(NULL, "query to obtain name of primary key of table \"%s\" returned no rows\n",
+                                                         tblinfo[i].relname);
+                               else
+                                       write_msg(NULL, "query to obtain name of primary key of table \"%s\" returned %d rows\n",
+                                                         tblinfo[i].relname, n);
                                exit_nicely();
                        }
 
@@ -2573,8 +2577,12 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs, const char *tablename)
                                        numFuncs = PQntuples(r);
                                        if (numFuncs != 1)
                                        {
-                                               write_msg(NULL, "query to obtain procedure name for trigger \"%s\" did not return exactly one result\n",
-                                                                 tgname);
+                                               if (numFuncs == 0)
+                                                       write_msg(NULL, "query to obtain procedure name for trigger \"%s\" (procedure OID %s) returned no rows\n",
+                                                                         tgname, tgfuncoid);
+                                               else
+                                                       write_msg(NULL, "query to obtain procedure name for trigger \"%s\" (procedure OID %s) returned %d rows\n",
+                                                                         tgname, tgfuncoid, numFuncs);
                                                exit_nicely();
                                        }
 
@@ -4736,12 +4744,15 @@ dumpSequence(Archive *fout, TableInfo tbinfo, const bool schemaOnly, const bool
                exit_nicely();
        }
 
+       /* Disable this check: it fails if sequence has been renamed */
+#ifdef NOT_USED
        if (strcmp(PQgetvalue(res, 0, 0), tbinfo.relname) != 0)
        {
                write_msg(NULL, "query to get data of sequence \"%s\" returned name \"%s\"\n",
                                  tbinfo.relname, PQgetvalue(res, 0, 0));
                exit_nicely();
        }
+#endif
 
        last = PQgetvalue(res, 0, 1);
        incby = PQgetvalue(res, 0, 2);