Error message cleanup

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 54eebfebf275b0e6275738cfe059741ac95e6470..aceb3fb33804e918c1da1009f67ec8a710980b71 100644 (file)
--- 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.473 2007/10/13 20:18:41 tgl Exp $
+ *   $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.474 2007/11/07 13:11:05 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -463,19 +463,19 @@ main(int argc, char **argv)
 
    if (dataOnly && schemaOnly)
    {
-       write_msg(NULL, "options \"schema only\" (-s) and \"data only\" (-a) cannot be used together\n");
+       write_msg(NULL, "options -s/--schema-only and -a/--data-only cannot be used together\n");
        exit(1);
    }
 
    if (dataOnly && outputClean)
    {
-       write_msg(NULL, "options \"clean\" (-c) and \"data only\" (-a) cannot be used together\n");
+       write_msg(NULL, "options -c/--clean and -a/--data-only cannot be used together\n");
        exit(1);
    }
 
    if (dumpInserts == true && oids == true)
    {
-       write_msg(NULL, "INSERT (-d, -D) and OID (-o) options cannot be used together\n");
+       write_msg(NULL, "options -d/-D/--inserts/--column-inserts and -o/--oids cannot be used together\n");
        write_msg(NULL, "(The INSERT command cannot set OIDs.)\n");
        exit(1);
    }
@@ -5524,7 +5524,7 @@ dumpEnumType(Archive *fout, TypeInfo *tinfo)
    /* should be at least 1 value */
    if (num == 0)
    {
-       write_msg(NULL, "No rows found for enum");
+       write_msg(NULL, "no label definitions found for enum ID %u", tinfo->dobj.catId.oid);
        exit_nicely();
    }
 

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index d38d6ff4d856295fd49146aa1b83a2a36307b06c..0968f926fe884b4da9ae0985bfc27d16cc54e77b 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.95 2007/11/07 12:24:24 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.96 2007/11/07 13:11:05 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -329,7 +329,7 @@ main(int argc, char *argv[])
    /* Make sure the user hasn't specified a mix of globals-only options */
    if (globals_only && roles_only)
    {
-       fprintf(stderr, _("%s: --globals-only and --roles-only cannot be used together\n"),
+       fprintf(stderr, _("%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"),
                progname);
        fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
                progname);
@@ -338,7 +338,7 @@ main(int argc, char *argv[])
    
    if (globals_only && tablespaces_only)
    {
-       fprintf(stderr, _("%s: --globals-only and --tablespaces-only cannot be used together\n"),
+       fprintf(stderr, _("%s: options -g/--globals-only and -t/--tablespaces-only cannot be used together\n"),
                progname);
        fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
                progname);
@@ -347,7 +347,7 @@ main(int argc, char *argv[])
    
    if (roles_only && tablespaces_only)
    {
-       fprintf(stderr, _("%s: --roles-only and --tablespaces-only cannot be used together\n"),
+       fprintf(stderr, _("%s: options -r/--roles-only and -t/--tablespaces-only cannot be used together\n"),
                progname);
        fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
                progname);
@@ -382,7 +382,8 @@ main(int argc, char *argv[])
                
        if (!conn)
        {
-           fprintf(stderr, _("%s: could not connect to databases \"postgres\" or \"template1\". Please specify an alternative database\n"),
+           fprintf(stderr, _("%s: could not connect to databases \"postgres\" or \"template1\"\n"
+                     "Please specify an alternative database.\n"),
                    progname);
            fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
                    progname);