From 1b4bec3c2223246ec59ffb9eb7de2f1de27315f7 Mon Sep 17 00:00:00 2001 From: Atsushi Torikoshi Date: Fri, 29 Mar 2024 11:36:12 +0900 Subject: [PATCH v1] Disallow ON_ERROR option without value Currently ON_ERROR option of COPY allows to omit its value, but the syntax synopsis in the documentation requires it. Since it seems non-boolean parameters usually require its value and it's not obvious what happens when value of ON_ERROR is omitted, this patch disallows ON_ERROR without its value. --- src/backend/commands/copy.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 28cf8b040a..2719bf28b7 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -392,7 +392,7 @@ defGetCopyHeaderChoice(DefElem *def, bool is_from) static CopyOnErrorChoice defGetCopyOnErrorChoice(DefElem *def, ParseState *pstate, bool is_from) { - char *sval; + char *sval = defGetString(def); if (!is_from) ereport(ERROR, @@ -400,16 +400,9 @@ defGetCopyOnErrorChoice(DefElem *def, ParseState *pstate, bool is_from) errmsg("COPY ON_ERROR cannot be used with COPY TO"), parser_errposition(pstate, def->location))); - /* - * If no parameter value given, assume the default value. - */ - if (def->arg == NULL) - return COPY_ON_ERROR_STOP; - /* * Allow "stop", or "ignore" values. */ - sval = defGetString(def); if (pg_strcasecmp(sval, "stop") == 0) return COPY_ON_ERROR_STOP; if (pg_strcasecmp(sval, "ignore") == 0) base-commit: 0075d78947e3800c5a807f48fd901f16db91101b -- 2.39.2