Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 56f9ff7

Browse files
committed
Add missing newlines to error messages, and normalize wording a bit.
1 parent 2de946b commit 56f9ff7

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/bin/pg_dump/pg_dump.c

+16-16
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* by PostgreSQL
1313
*
1414
* 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 $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -5524,7 +5524,7 @@ dumpEnumType(Archive *fout, TypeInfo *tinfo)
55245524
/* should be at least 1 value */
55255525
if (num == 0)
55265526
{
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);
55285528
exit_nicely();
55295529
}
55305530

@@ -5753,7 +5753,7 @@ dumpBaseType(Archive *fout, TypeInfo *tinfo)
57535753
ntups = PQntuples(res);
57545754
if (ntups != 1)
57555755
{
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",
57575757
ntups, query->data);
57585758
exit_nicely();
57595759
}
@@ -5938,7 +5938,7 @@ dumpDomain(Archive *fout, TypeInfo *tinfo)
59385938
ntups = PQntuples(res);
59395939
if (ntups != 1)
59405940
{
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",
59425942
ntups, query->data);
59435943
exit_nicely();
59445944
}
@@ -6057,7 +6057,7 @@ dumpCompositeType(Archive *fout, TypeInfo *tinfo)
60576057
ntups = PQntuples(res);
60586058
if (ntups < 1)
60596059
{
6060-
write_msg(NULL, "query yielded no rows: %s\n", query->data);
6060+
write_msg(NULL, "query returned no rows: %s\n", query->data);
60616061
exit_nicely();
60626062
}
60636063

@@ -6537,7 +6537,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
65376537
ntups = PQntuples(res);
65386538
if (ntups != 1)
65396539
{
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",
65416541
ntups, query->data);
65426542
exit_nicely();
65436543
}
@@ -7029,7 +7029,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
70297029
ntups = PQntuples(res);
70307030
if (ntups != 1)
70317031
{
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",
70337033
ntups, query->data);
70347034
exit_nicely();
70357035
}
@@ -7276,7 +7276,7 @@ convertTSFunction(Oid funcOid)
72767276
ntups = PQntuples(res);
72777277
if (ntups != 1)
72787278
{
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",
72807280
ntups, query);
72817281
exit_nicely();
72827282
}
@@ -7380,7 +7380,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
73807380
ntups = PQntuples(res);
73817381
if (ntups != 1)
73827382
{
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",
73847384
ntups, query->data);
73857385
exit_nicely();
73867386
}
@@ -7718,7 +7718,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
77187718
ntups = PQntuples(res);
77197719
if (ntups != 1)
77207720
{
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",
77227722
ntups, query->data);
77237723
exit_nicely();
77247724
}
@@ -7891,7 +7891,7 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
78917891
ntups = PQntuples(res);
78927892
if (ntups != 1)
78937893
{
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",
78957895
ntups, query->data);
78967896
exit_nicely();
78977897
}
@@ -8085,7 +8085,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
80858085
ntups = PQntuples(res);
80868086
if (ntups != 1)
80878087
{
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",
80898089
ntups, query->data);
80908090
exit_nicely();
80918091
}
@@ -8308,7 +8308,7 @@ dumpTSDictionary(Archive *fout, TSDictInfo * dictinfo)
83088308
ntups = PQntuples(res);
83098309
if (ntups != 1)
83108310
{
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",
83128312
ntups, query->data);
83138313
exit_nicely();
83148314
}
@@ -8459,7 +8459,7 @@ dumpTSConfig(Archive *fout, TSConfigInfo * cfginfo)
84598459
ntups = PQntuples(res);
84608460
if (ntups != 1)
84618461
{
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",
84638463
ntups, query->data);
84648464
exit_nicely();
84658465
}
@@ -9810,7 +9810,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
98109810

98119811
if (PQntuples(res) != 1)
98129812
{
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",
98149814
rinfo->dobj.name, tbinfo->dobj.name);
98159815
exit_nicely();
98169816
}
@@ -10093,7 +10093,7 @@ getFormattedTypeName(Oid oid, OidOptions opts)
1009310093
ntups = PQntuples(res);
1009410094
if (ntups != 1)
1009510095
{
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",
1009710097
ntups, query->data);
1009810098
exit_nicely();
1009910099
}

0 commit comments

Comments
 (0)