database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00
Code

Message style improvements

Browse Source
This commit is contained in:
Peter Eisentraut 2011-05-21 00:50:35 +03:00
parent c8e0c32119
commit bcf63a51e3
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/utils/adt/arrayfuncs.c
View File

@ -4805,7 +4805,7 @@ array_fill_with_lower_bounds(PG_FUNCTION_ARGS)
if (PG_ARGISNULL(1) || PG_ARGISNULL(2)) if (PG_ARGISNULL(1) || PG_ARGISNULL(2))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg("dimension array or low bound array cannot be NULL"))); errmsg("dimension array or low bound array cannot be null")));
dims = PG_GETARG_ARRAYTYPE_P(1); dims = PG_GETARG_ARRAYTYPE_P(1);
lbs = PG_GETARG_ARRAYTYPE_P(2); lbs = PG_GETARG_ARRAYTYPE_P(2);
@ -4845,7 +4845,7 @@ array_fill(PG_FUNCTION_ARGS)
if (PG_ARGISNULL(1)) if (PG_ARGISNULL(1))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg("dimension array or low bound array cannot be NULL"))); errmsg("dimension array or low bound array cannot be null")));
dims = PG_GETARG_ARRAYTYPE_P(1); dims = PG_GETARG_ARRAYTYPE_P(1);

2
src/pl/plpgsql/src/pl_exec.c
View File

@ -2060,7 +2060,7 @@ exec_stmt_foreach_a(PLpgSQL_execstate *estate, PLpgSQL_stmt_foreach_a *stmt)
if (isnull) if (isnull)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg("FOREACH expression must not be NULL"))); errmsg("FOREACH expression must not be null")));
/* check the type of the expression - must be an array */ /* check the type of the expression - must be an array */
if (!OidIsValid(get_element_type(arrtype))) if (!OidIsValid(get_element_type(arrtype)))

2
src/pl/plpython/plpython.c
View File

@ -3937,7 +3937,7 @@ PLy_add_exceptions(PyObject *plpy)
excmod = PyModule_Create(&PLy_exc_module); excmod = PyModule_Create(&PLy_exc_module);
#endif #endif
if (PyModule_AddObject(plpy, "spiexceptions", excmod) < 0) if (PyModule_AddObject(plpy, "spiexceptions", excmod) < 0)
PLy_elog(ERROR, "failed to add the spiexceptions module"); PLy_elog(ERROR, "could not add the spiexceptions module");
/* /*
* XXX it appears that in some circumstances the reference count of the * XXX it appears that in some circumstances the reference count of the

4
src/test/regress/expected/arrays.out
View File

@ -1292,9 +1292,9 @@ select array_fill('juhu'::text, array[3,3]);
-- raise exception -- raise exception
select array_fill(1, null, array[2,2]); select array_fill(1, null, array[2,2]);
ERROR: dimension array or low bound array cannot be NULL ERROR: dimension array or low bound array cannot be null
select array_fill(1, array[2,2], null); select array_fill(1, array[2,2], null);
ERROR: dimension array or low bound array cannot be NULL ERROR: dimension array or low bound array cannot be null
select array_fill(1, array[3,3], array[1,1,1]); select array_fill(1, array[3,3], array[1,1,1]);
ERROR: wrong number of array subscripts ERROR: wrong number of array subscripts
DETAIL: Low bound array has different size than dimensions array. DETAIL: Low bound array has different size than dimensions array.