From cf0ce6d2e9362d3c36755a306b913c9cc89b0007 Mon Sep 17 00:00:00 2001 From: Atsushi Torikoshi Date: Mon, 7 Oct 2024 20:10:22 +0900 Subject: [PATCH v7 2/2] Move check for binary mode and on_error option to appropriate location The current location for checking for binary mode and on_error option is not appropriate, as this is where checks should be performed before inserting default values. Additionally, the comment mentions two checks, but there are now three. This patch moves the check for incompatible options to the end of ProcessCopyOptions() and updates the comment accordingly. --- src/backend/commands/copy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index befab92074..0b093dbb2a 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -672,7 +672,7 @@ ProcessCopyOptions(ParseState *pstate, } /* - * Check for incompatible options (must do these two before inserting + * Check for incompatible options (must do these three before inserting * defaults) */ if (opts_out->binary && opts_out->delim) @@ -691,11 +691,6 @@ ProcessCopyOptions(ParseState *pstate, (errcode(ERRCODE_SYNTAX_ERROR), errmsg("cannot specify %s in BINARY mode", "DEFAULT"))); - if (opts_out->binary && opts_out->on_error != COPY_ON_ERROR_STOP) - ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("only ON_ERROR STOP is allowed in BINARY mode"))); - /* Set defaults for omitted options */ if (!opts_out->delim) opts_out->delim = opts_out->csv_mode ? "," : "\t"; @@ -900,6 +895,11 @@ ProcessCopyOptions(ParseState *pstate, errmsg("NULL specification and DEFAULT specification cannot be the same"))); } /* Check on_error */ + if (opts_out->binary && opts_out->on_error != COPY_ON_ERROR_STOP) + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("only ON_ERROR STOP is allowed in BINARY mode"))); + if (opts_out->reject_limit && !opts_out->on_error) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), -- 2.39.2