Make SQL/JSON error code names match SQL standard
authorPeter Eisentraut <[email protected]>
Thu, 30 Apr 2020 07:34:54 +0000 (09:34 +0200)
committerPeter Eisentraut <[email protected]>
Thu, 30 Apr 2020 07:34:54 +0000 (09:34 +0200)
see also a00c53b0cb

src/backend/utils/adt/jsonpath_exec.c
src/backend/utils/errcodes.txt

index bc063061cf2ccf1ac9d908fd58ca18e149959cf9..135025cf570f1d8c3dc1606e4bf9b04571151acb 100644 (file)
@@ -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."))));
index 914e533c7deb36ae9f872442f880ad8d70112260..c79312ed039748ab24020395accf6f9f531ea76d 100644 (file)
@@ -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