diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2020-04-30 09:34:54 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2020-04-30 09:34:54 +0200 |
| commit | eb892102e01a2073df9250d65e33ec1ed21798df (patch) | |
| tree | cef6c494637eef23d656c561670e1162f88f9f7d | |
| parent | 7462c1d78cd8bc1cfca352cef0e3e234b9d3b62b (diff) | |
| download | postgresql-eb892102e01a2073df9250d65e33ec1ed21798df.tar.gz postgresql-eb892102e01a2073df9250d65e33ec1ed21798df.zip | |
Make SQL/JSON error code names match SQL standard
see also a00c53b0cb
| -rw-r--r-- | src/backend/utils/adt/jsonpath_exec.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/errcodes.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index bc063061cf2..135025cf570 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -1791,7 +1791,7 @@ executeDateTimeMethod(JsonPathExecContext *cxt, JsonPathItem *jsp, if (!(jb = getScalar(jb, jbvString))) RETURN_ERROR(ereport(ERROR, - (errcode(ERRCODE_INVALID_ARGUMENT_FOR_JSON_DATETIME_FUNCTION), + (errcode(ERRCODE_INVALID_ARGUMENT_FOR_SQL_JSON_DATETIME_FUNCTION), errmsg("jsonpath item method .%s() can only be applied to a string", jspOperationName(jsp->type))))); @@ -1879,7 +1879,7 @@ executeDateTimeMethod(JsonPathExecContext *cxt, JsonPathItem *jsp, if (res == jperNotFound) RETURN_ERROR(ereport(ERROR, - (errcode(ERRCODE_INVALID_ARGUMENT_FOR_JSON_DATETIME_FUNCTION), + (errcode(ERRCODE_INVALID_ARGUMENT_FOR_SQL_JSON_DATETIME_FUNCTION), errmsg("datetime format is not recognized: \"%s\"", text_to_cstring(datetime)), errhint("Use a datetime template argument to specify the input data format.")))); diff --git a/src/backend/utils/errcodes.txt b/src/backend/utils/errcodes.txt index 914e533c7de..c79312ed039 100644 --- a/src/backend/utils/errcodes.txt +++ b/src/backend/utils/errcodes.txt @@ -207,7 +207,7 @@ Section: Class 22 - Data Exception 2200S E ERRCODE_INVALID_XML_COMMENT invalid_xml_comment 2200T E ERRCODE_INVALID_XML_PROCESSING_INSTRUCTION invalid_xml_processing_instruction 22030 E ERRCODE_DUPLICATE_JSON_OBJECT_KEY_VALUE duplicate_json_object_key_value -22031 E ERRCODE_INVALID_ARGUMENT_FOR_JSON_DATETIME_FUNCTION invalid_argument_for_json_datetime_function +22031 E ERRCODE_INVALID_ARGUMENT_FOR_SQL_JSON_DATETIME_FUNCTION invalid_argument_for_sql_json_datetime_function 22032 E ERRCODE_INVALID_JSON_TEXT invalid_json_text 22033 E ERRCODE_INVALID_SQL_JSON_SUBSCRIPT invalid_sql_json_subscript 22034 E ERRCODE_MORE_THAN_ONE_SQL_JSON_ITEM more_than_one_sql_json_item |