Skip to content

Commit ef5d4a3

Browse files
peterepetere
committed
Message style improvements
1 parent 9492cf8 commit ef5d4a3

File tree

9 files changed

+61
-58
lines changed

9 files changed

+61
-58
lines changed

‎src/backend/access/brin/brin_validate.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ brinvalidate(Oid opclassoid)
112112
{
113113
ereport(INFO,
114114
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
115-
errmsg("brin opfamily %s contains function %s with invalid support number %d",
115+
errmsg("brin operator family \"%s\" contains function %s with invalid support number %d",
116116
opfamilyname,
117117
format_procedure(procform->amproc),
118118
procform->amprocnum)));
@@ -128,7 +128,7 @@ brinvalidate(Oid opclassoid)
128128
{
129129
ereport(INFO,
130130
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
131-
errmsg("brin opfamily %s contains function %s with wrong signature for support number %d",
131+
errmsg("brin operator family \"%s\" contains function %s with wrong signature for support number %d",
132132
opfamilyname,
133133
format_procedure(procform->amproc),
134134
procform->amprocnum)));
@@ -150,7 +150,7 @@ brinvalidate(Oid opclassoid)
150150
{
151151
ereport(INFO,
152152
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
153-
errmsg("brin opfamily %s contains operator %s with invalid strategy number %d",
153+
errmsg("brin operator family \"%s\" contains operator %s with invalid strategy number %d",
154154
opfamilyname,
155155
format_operator(oprform->amopopr),
156156
oprform->amopstrategy)));
@@ -179,7 +179,7 @@ brinvalidate(Oid opclassoid)
179179
{
180180
ereport(INFO,
181181
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
182-
errmsg("brin opfamily %s contains invalid ORDER BY specification for operator %s",
182+
errmsg("brin operator family \"%s\" contains invalid ORDER BY specification for operator %s",
183183
opfamilyname,
184184
format_operator(oprform->amopopr))));
185185
result = false;
@@ -192,7 +192,7 @@ brinvalidate(Oid opclassoid)
192192
{
193193
ereport(INFO,
194194
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
195-
errmsg("brin opfamily %s contains operator %s with wrong signature",
195+
errmsg("brin operator family \"%s\" contains operator %s with wrong signature",
196196
opfamilyname,
197197
format_operator(oprform->amopopr))));
198198
result = false;
@@ -230,7 +230,7 @@ brinvalidate(Oid opclassoid)
230230
{
231231
ereport(INFO,
232232
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
233-
errmsg("brin opfamily %s is missing operator(s) for types %s and %s",
233+
errmsg("brin operator family \"%s\" is missing operator(s) for types %s and %s",
234234
opfamilyname,
235235
format_type_be(thisgroup->lefttype),
236236
format_type_be(thisgroup->righttype))));
@@ -240,7 +240,7 @@ brinvalidate(Oid opclassoid)
240240
{
241241
ereport(INFO,
242242
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
243-
errmsg("brin opfamily %s is missing support function(s) for types %s and %s",
243+
errmsg("brin operator family \"%s\" is missing support function(s) for types %s and %s",
244244
opfamilyname,
245245
format_type_be(thisgroup->lefttype),
246246
format_type_be(thisgroup->righttype))));
@@ -253,7 +253,7 @@ brinvalidate(Oid opclassoid)
253253
{
254254
ereport(INFO,
255255
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
256-
errmsg("brin opclass %s is missing operator(s)",
256+
errmsg("brin operator class \"%s\" is missing operator(s)",
257257
opclassname)));
258258
result = false;
259259
}
@@ -264,7 +264,7 @@ brinvalidate(Oid opclassoid)
264264
continue; /* got it */
265265
ereport(INFO,
266266
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
267-
errmsg("brin opclass %s is missing support function %d",
267+
errmsg("brin operator class \"%s\" is missing support function %d",
268268
opclassname, i)));
269269
result = false;
270270
}

‎src/backend/access/gin/ginvalidate.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ ginvalidate(Oid opclassoid)
8989
{
9090
ereport(INFO,
9191
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
92-
errmsg("gin opfamily %s contains support procedure %s with cross-type registration",
92+
errmsg("gin operator family \"%s\" contains support procedure %s with cross-type registration",
9393
opfamilyname,
9494
format_procedure(procform->amproc))));
9595
result = false;
@@ -145,7 +145,7 @@ ginvalidate(Oid opclassoid)
145145
default:
146146
ereport(INFO,
147147
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
148-
errmsg("gin opfamily %s contains function %s with invalid support number %d",
148+
errmsg("gin operator family \"%s\" contains function %s with invalid support number %d",
149149
opfamilyname,
150150
format_procedure(procform->amproc),
151151
procform->amprocnum)));
@@ -157,7 +157,7 @@ ginvalidate(Oid opclassoid)
157157
{
158158
ereport(INFO,
159159
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
160-
errmsg("gin opfamily %s contains function %s with wrong signature for support number %d",
160+
errmsg("gin operator family \"%s\" contains function %s with wrong signature for support number %d",
161161
opfamilyname,
162162
format_procedure(procform->amproc),
163163
procform->amprocnum)));
@@ -176,7 +176,7 @@ ginvalidate(Oid opclassoid)
176176
{
177177
ereport(INFO,
178178
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
179-
errmsg("gin opfamily %s contains operator %s with invalid strategy number %d",
179+
errmsg("gin operator family \"%s\" contains operator %s with invalid strategy number %d",
180180
opfamilyname,
181181
format_operator(oprform->amopopr),
182182
oprform->amopstrategy)));
@@ -189,7 +189,7 @@ ginvalidate(Oid opclassoid)
189189
{
190190
ereport(INFO,
191191
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
192-
errmsg("gin opfamily %s contains invalid ORDER BY specification for operator %s",
192+
errmsg("gin operator family \"%s\" contains invalid ORDER BY specification for operator %s",
193193
opfamilyname,
194194
format_operator(oprform->amopopr))));
195195
result = false;
@@ -202,7 +202,7 @@ ginvalidate(Oid opclassoid)
202202
{
203203
ereport(INFO,
204204
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
205-
errmsg("gin opfamily %s contains operator %s with wrong signature",
205+
errmsg("gin operator family \"%s\" contains operator %s with wrong signature",
206206
opfamilyname,
207207
format_operator(oprform->amopopr))));
208208
result = false;
@@ -243,7 +243,7 @@ ginvalidate(Oid opclassoid)
243243
continue; /* don't need both, see check below loop */
244244
ereport(INFO,
245245
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
246-
errmsg("gin opclass %s is missing support function %d",
246+
errmsg("gin operator class \"%s\" is missing support function %d",
247247
opclassname, i)));
248248
result = false;
249249
}
@@ -253,7 +253,7 @@ ginvalidate(Oid opclassoid)
253253
{
254254
ereport(INFO,
255255
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
256-
errmsg("gin opclass %s is missing support function %d or %d",
256+
errmsg("gin operator class \"%s\" is missing support function %d or %d",
257257
opclassname,
258258
GIN_CONSISTENT_PROC, GIN_TRICONSISTENT_PROC)));
259259
result = false;

‎src/backend/access/gist/gistvalidate.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ gistvalidate(Oid opclassoid)
8989
{
9090
ereport(INFO,
9191
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
92-
errmsg("gist opfamily %s contains support procedure %s with cross-type registration",
92+
errmsg("gist operator family \"%s\" contains support procedure %s with cross-type registration",
9393
opfamilyname,
9494
format_procedure(procform->amproc))));
9595
result = false;
@@ -142,7 +142,7 @@ gistvalidate(Oid opclassoid)
142142
default:
143143
ereport(INFO,
144144
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
145-
errmsg("gist opfamily %s contains function %s with invalid support number %d",
145+
errmsg("gist operator family \"%s\" contains function %s with invalid support number %d",
146146
opfamilyname,
147147
format_procedure(procform->amproc),
148148
procform->amprocnum)));
@@ -154,7 +154,7 @@ gistvalidate(Oid opclassoid)
154154
{
155155
ereport(INFO,
156156
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
157-
errmsg("gist opfamily %s contains function %s with wrong signature for support number %d",
157+
errmsg("gist operator family \"%s\" contains function %s with wrong signature for support number %d",
158158
opfamilyname,
159159
format_procedure(procform->amproc),
160160
procform->amprocnum)));
@@ -174,7 +174,7 @@ gistvalidate(Oid opclassoid)
174174
{
175175
ereport(INFO,
176176
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
177-
errmsg("gist opfamily %s contains operator %s with invalid strategy number %d",
177+
errmsg("gist operator family \"%s\" contains operator %s with invalid strategy number %d",
178178
opfamilyname,
179179
format_operator(oprform->amopopr),
180180
oprform->amopstrategy)));
@@ -192,7 +192,7 @@ gistvalidate(Oid opclassoid)
192192
{
193193
ereport(INFO,
194194
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
195-
errmsg("gist opfamily %s contains unsupported ORDER BY specification for operator %s",
195+
errmsg("gist operator family \"%s\" contains unsupported ORDER BY specification for operator %s",
196196
opfamilyname,
197197
format_operator(oprform->amopopr))));
198198
result = false;
@@ -203,7 +203,7 @@ gistvalidate(Oid opclassoid)
203203
{
204204
ereport(INFO,
205205
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
206-
errmsg("gist opfamily %s contains incorrect ORDER BY opfamily specification for operator %s",
206+
errmsg("gist operator family \"%s\" contains incorrect ORDER BY opfamily specification for operator %s",
207207
opfamilyname,
208208
format_operator(oprform->amopopr))));
209209
result = false;
@@ -222,7 +222,7 @@ gistvalidate(Oid opclassoid)
222222
{
223223
ereport(INFO,
224224
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
225-
errmsg("gist opfamily %s contains operator %s with wrong signature",
225+
errmsg("gist operator family \"%s\" contains operator %s with wrong signature",
226226
opfamilyname,
227227
format_operator(oprform->amopopr))));
228228
result = false;
@@ -261,7 +261,7 @@ gistvalidate(Oid opclassoid)
261261
continue; /* optional methods */
262262
ereport(INFO,
263263
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
264-
errmsg("gist opclass %s is missing support function %d",
264+
errmsg("gist operator class \"%s\" is missing support function %d",
265265
opclassname, i)));
266266
result = false;
267267
}

‎src/backend/access/hash/hashvalidate.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ hashvalidate(Oid opclassoid)
9595
{
9696
ereport(INFO,
9797
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
98-
errmsg("hash opfamily %s contains support procedure %s with cross-type registration",
98+
errmsg("hash operator family \"%s\" contains support procedure %s with cross-type registration",
9999
opfamilyname,
100100
format_procedure(procform->amproc))));
101101
result = false;
@@ -110,7 +110,7 @@ hashvalidate(Oid opclassoid)
110110
{
111111
ereport(INFO,
112112
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
113-
errmsg("hash opfamily %s contains function %s with wrong signature for support number %d",
113+
errmsg("hash operator family \"%s\" contains function %s with wrong signature for support number %d",
114114
opfamilyname,
115115
format_procedure(procform->amproc),
116116
procform->amprocnum)));
@@ -127,7 +127,7 @@ hashvalidate(Oid opclassoid)
127127
default:
128128
ereport(INFO,
129129
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
130-
errmsg("hash opfamily %s contains function %s with invalid support number %d",
130+
errmsg("hash operator family \"%s\" contains function %s with invalid support number %d",
131131
opfamilyname,
132132
format_procedure(procform->amproc),
133133
procform->amprocnum)));
@@ -148,7 +148,7 @@ hashvalidate(Oid opclassoid)
148148
{
149149
ereport(INFO,
150150
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
151-
errmsg("hash opfamily %s contains operator %s with invalid strategy number %d",
151+
errmsg("hash operator family \"%s\" contains operator %s with invalid strategy number %d",
152152
opfamilyname,
153153
format_operator(oprform->amopopr),
154154
oprform->amopstrategy)));
@@ -161,7 +161,7 @@ hashvalidate(Oid opclassoid)
161161
{
162162
ereport(INFO,
163163
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
164-
errmsg("hash opfamily %s contains invalid ORDER BY specification for operator %s",
164+
errmsg("hash operator family \"%s\" contains invalid ORDER BY specification for operator %s",
165165
opfamilyname,
166166
format_operator(oprform->amopopr))));
167167
result = false;
@@ -174,7 +174,7 @@ hashvalidate(Oid opclassoid)
174174
{
175175
ereport(INFO,
176176
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
177-
errmsg("hash opfamily %s contains operator %s with wrong signature",
177+
errmsg("hash operator family \"%s\" contains operator %s with wrong signature",
178178
opfamilyname,
179179
format_operator(oprform->amopopr))));
180180
result = false;
@@ -186,7 +186,7 @@ hashvalidate(Oid opclassoid)
186186
{
187187
ereport(INFO,
188188
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
189-
errmsg("hash opfamily %s lacks support function for operator %s",
189+
errmsg("hash operator family \"%s\" lacks support function for operator %s",
190190
opfamilyname,
191191
format_operator(oprform->amopopr))));
192192
result = false;
@@ -214,7 +214,7 @@ hashvalidate(Oid opclassoid)
214214
{
215215
ereport(INFO,
216216
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
217-
errmsg("hash opfamily %s is missing operator(s) for types %s and %s",
217+
errmsg("hash operator family \"%s\" is missing operator(s) for types %s and %s",
218218
opfamilyname,
219219
format_type_be(thisgroup->lefttype),
220220
format_type_be(thisgroup->righttype))));
@@ -228,7 +228,7 @@ hashvalidate(Oid opclassoid)
228228
{
229229
ereport(INFO,
230230
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
231-
errmsg("hash opclass %s is missing operator(s)",
231+
errmsg("hash operator class \"%s\" is missing operator(s)",
232232
opclassname)));
233233
result = false;
234234
}
@@ -244,7 +244,7 @@ hashvalidate(Oid opclassoid)
244244
{
245245
ereport(INFO,
246246
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
247-
errmsg("hash opfamily %s is missing cross-type operator(s)",
247+
errmsg("hash operator family \"%s\" is missing cross-type operator(s)",
248248
opfamilyname)));
249249
result = false;
250250
}

‎src/backend/access/nbtree/nbtvalidate.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ btvalidate(Oid opclassoid)
9797
default:
9898
ereport(INFO,
9999
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
100-
errmsg("btree opfamily %s contains function %s with invalid support number %d",
100+
errmsg("btree operator family \"%s\" contains function %s with invalid support number %d",
101101
opfamilyname,
102102
format_procedure(procform->amproc),
103103
procform->amprocnum)));
@@ -109,7 +109,7 @@ btvalidate(Oid opclassoid)
109109
{
110110
ereport(INFO,
111111
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
112-
errmsg("btree opfamily %s contains function %s with wrong signature for support number %d",
112+
errmsg("btree operator family \"%s\" contains function %s with wrong signature for support number %d",
113113
opfamilyname,
114114
format_procedure(procform->amproc),
115115
procform->amprocnum)));
@@ -129,7 +129,7 @@ btvalidate(Oid opclassoid)
129129
{
130130
ereport(INFO,
131131
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
132-
errmsg("btree opfamily %s contains operator %s with invalid strategy number %d",
132+
errmsg("btree operator family \"%s\" contains operator %s with invalid strategy number %d",
133133
opfamilyname,
134134
format_operator(oprform->amopopr),
135135
oprform->amopstrategy)));
@@ -142,7 +142,7 @@ btvalidate(Oid opclassoid)
142142
{
143143
ereport(INFO,
144144
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
145-
errmsg("btree opfamily %s contains invalid ORDER BY specification for operator %s",
145+
errmsg("btree operator family \"%s\" contains invalid ORDER BY specification for operator %s",
146146
opfamilyname,
147147
format_operator(oprform->amopopr))));
148148
result = false;
@@ -155,7 +155,7 @@ btvalidate(Oid opclassoid)
155155
{
156156
ereport(INFO,
157157
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
158-
errmsg("btree opfamily %s contains operator %s with wrong signature",
158+
errmsg("btree operator family \"%s\" contains operator %s with wrong signature",
159159
opfamilyname,
160160
format_operator(oprform->amopopr))));
161161
result = false;
@@ -197,7 +197,7 @@ btvalidate(Oid opclassoid)
197197
{
198198
ereport(INFO,
199199
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
200-
errmsg("btree opfamily %s is missing operator(s) for types %s and %s",
200+
errmsg("btree operator family \"%s\" is missing operator(s) for types %s and %s",
201201
opfamilyname,
202202
format_type_be(thisgroup->lefttype),
203203
format_type_be(thisgroup->righttype))));
@@ -207,7 +207,7 @@ btvalidate(Oid opclassoid)
207207
{
208208
ereport(INFO,
209209
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
210-
errmsg("btree opfamily %s is missing support function for types %s and %s",
210+
errmsg("btree operator family \"%s\" is missing support function for types %s and %s",
211211
opfamilyname,
212212
format_type_be(thisgroup->lefttype),
213213
format_type_be(thisgroup->righttype))));
@@ -221,7 +221,7 @@ btvalidate(Oid opclassoid)
221221
{
222222
ereport(INFO,
223223
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
224-
errmsg("btree opclass %s is missing operator(s)",
224+
errmsg("btree operator class \"%s\" is missing operator(s)",
225225
opclassname)));
226226
result = false;
227227
}
@@ -238,7 +238,7 @@ btvalidate(Oid opclassoid)
238238
{
239239
ereport(INFO,
240240
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
241-
errmsg("btree opfamily %s is missing cross-type operator(s)",
241+
errmsg("btree operator family \"%s\" is missing cross-type operator(s)",
242242
opfamilyname)));
243243
result = false;
244244
}

0 commit comments

Comments
 (0)