|
12 | 12 | * by PostgreSQL
|
13 | 13 | *
|
14 | 14 | * IDENTIFICATION
|
15 |
| - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.474 2007/11/07 13:11:05 petere Exp $ |
| 15 | + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.475 2007/11/08 10:37:54 petere Exp $ |
16 | 16 | *
|
17 | 17 | *-------------------------------------------------------------------------
|
18 | 18 | */
|
@@ -5524,7 +5524,7 @@ dumpEnumType(Archive *fout, TypeInfo *tinfo)
|
5524 | 5524 | /* should be at least 1 value */
|
5525 | 5525 | if (num == 0)
|
5526 | 5526 | {
|
5527 |
| - write_msg(NULL, "no label definitions found for enum ID %u", tinfo->dobj.catId.oid); |
| 5527 | + write_msg(NULL, "no label definitions found for enum ID %u\n", tinfo->dobj.catId.oid); |
5528 | 5528 | exit_nicely();
|
5529 | 5529 | }
|
5530 | 5530 |
|
@@ -5753,7 +5753,7 @@ dumpBaseType(Archive *fout, TypeInfo *tinfo)
|
5753 | 5753 | ntups = PQntuples(res);
|
5754 | 5754 | if (ntups != 1)
|
5755 | 5755 | {
|
5756 |
| - write_msg(NULL, "Got %d rows instead of one from: %s", |
| 5756 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
5757 | 5757 | ntups, query->data);
|
5758 | 5758 | exit_nicely();
|
5759 | 5759 | }
|
@@ -5938,7 +5938,7 @@ dumpDomain(Archive *fout, TypeInfo *tinfo)
|
5938 | 5938 | ntups = PQntuples(res);
|
5939 | 5939 | if (ntups != 1)
|
5940 | 5940 | {
|
5941 |
| - write_msg(NULL, "Got %d rows instead of one from: %s", |
| 5941 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
5942 | 5942 | ntups, query->data);
|
5943 | 5943 | exit_nicely();
|
5944 | 5944 | }
|
@@ -6057,7 +6057,7 @@ dumpCompositeType(Archive *fout, TypeInfo *tinfo)
|
6057 | 6057 | ntups = PQntuples(res);
|
6058 | 6058 | if (ntups < 1)
|
6059 | 6059 | {
|
6060 |
| - write_msg(NULL, "query yielded no rows: %s\n", query->data); |
| 6060 | + write_msg(NULL, "query returned no rows: %s\n", query->data); |
6061 | 6061 | exit_nicely();
|
6062 | 6062 | }
|
6063 | 6063 |
|
@@ -6537,7 +6537,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
|
6537 | 6537 | ntups = PQntuples(res);
|
6538 | 6538 | if (ntups != 1)
|
6539 | 6539 | {
|
6540 |
| - write_msg(NULL, "Got %d rows instead of one from: %s", |
| 6540 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
6541 | 6541 | ntups, query->data);
|
6542 | 6542 | exit_nicely();
|
6543 | 6543 | }
|
@@ -7029,7 +7029,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
|
7029 | 7029 | ntups = PQntuples(res);
|
7030 | 7030 | if (ntups != 1)
|
7031 | 7031 | {
|
7032 |
| - write_msg(NULL, "Got %d rows instead of one from: %s", |
| 7032 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
7033 | 7033 | ntups, query->data);
|
7034 | 7034 | exit_nicely();
|
7035 | 7035 | }
|
@@ -7276,7 +7276,7 @@ convertTSFunction(Oid funcOid)
|
7276 | 7276 | ntups = PQntuples(res);
|
7277 | 7277 | if (ntups != 1)
|
7278 | 7278 | {
|
7279 |
| - write_msg(NULL, "Got %d rows instead of one from \"%s\"\n", |
| 7279 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
7280 | 7280 | ntups, query);
|
7281 | 7281 | exit_nicely();
|
7282 | 7282 | }
|
@@ -7380,7 +7380,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
|
7380 | 7380 | ntups = PQntuples(res);
|
7381 | 7381 | if (ntups != 1)
|
7382 | 7382 | {
|
7383 |
| - write_msg(NULL, "Got %d rows instead of one from: %s", |
| 7383 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
7384 | 7384 | ntups, query->data);
|
7385 | 7385 | exit_nicely();
|
7386 | 7386 | }
|
@@ -7718,7 +7718,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
|
7718 | 7718 | ntups = PQntuples(res);
|
7719 | 7719 | if (ntups != 1)
|
7720 | 7720 | {
|
7721 |
| - write_msg(NULL, "Got %d rows instead of one from: %s", |
| 7721 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
7722 | 7722 | ntups, query->data);
|
7723 | 7723 | exit_nicely();
|
7724 | 7724 | }
|
@@ -7891,7 +7891,7 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
|
7891 | 7891 | ntups = PQntuples(res);
|
7892 | 7892 | if (ntups != 1)
|
7893 | 7893 | {
|
7894 |
| - write_msg(NULL, "Got %d rows instead of one from: %s", |
| 7894 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
7895 | 7895 | ntups, query->data);
|
7896 | 7896 | exit_nicely();
|
7897 | 7897 | }
|
@@ -8085,7 +8085,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
|
8085 | 8085 | ntups = PQntuples(res);
|
8086 | 8086 | if (ntups != 1)
|
8087 | 8087 | {
|
8088 |
| - write_msg(NULL, "Got %d rows instead of one from: %s", |
| 8088 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
8089 | 8089 | ntups, query->data);
|
8090 | 8090 | exit_nicely();
|
8091 | 8091 | }
|
@@ -8308,7 +8308,7 @@ dumpTSDictionary(Archive *fout, TSDictInfo * dictinfo)
|
8308 | 8308 | ntups = PQntuples(res);
|
8309 | 8309 | if (ntups != 1)
|
8310 | 8310 | {
|
8311 |
| - write_msg(NULL, "Got %d rows instead of one from \"%s\"\n", |
| 8311 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
8312 | 8312 | ntups, query->data);
|
8313 | 8313 | exit_nicely();
|
8314 | 8314 | }
|
@@ -8459,7 +8459,7 @@ dumpTSConfig(Archive *fout, TSConfigInfo * cfginfo)
|
8459 | 8459 | ntups = PQntuples(res);
|
8460 | 8460 | if (ntups != 1)
|
8461 | 8461 | {
|
8462 |
| - write_msg(NULL, "Got %d rows instead of one from \"%s\"\n", |
| 8462 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
8463 | 8463 | ntups, query->data);
|
8464 | 8464 | exit_nicely();
|
8465 | 8465 | }
|
@@ -9810,7 +9810,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
|
9810 | 9810 |
|
9811 | 9811 | if (PQntuples(res) != 1)
|
9812 | 9812 | {
|
9813 |
| - write_msg(NULL, "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned", |
| 9813 | + write_msg(NULL, "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned\n", |
9814 | 9814 | rinfo->dobj.name, tbinfo->dobj.name);
|
9815 | 9815 | exit_nicely();
|
9816 | 9816 | }
|
@@ -10093,7 +10093,7 @@ getFormattedTypeName(Oid oid, OidOptions opts)
|
10093 | 10093 | ntups = PQntuples(res);
|
10094 | 10094 | if (ntups != 1)
|
10095 | 10095 | {
|
10096 |
| - write_msg(NULL, "query yielded %d rows instead of one: %s\n", |
| 10096 | + write_msg(NULL, "query returned %d rows instead of one: %s\n", |
10097 | 10097 | ntups, query->data);
|
10098 | 10098 | exit_nicely();
|
10099 | 10099 | }
|
|
0 commit comments