From 5bd49a08c1846639ec638469d92f62681488ba13 Mon Sep 17 00:00:00 2001 From: Joel Jakobsson Date: Sat, 12 Oct 2024 01:23:55 +0200 Subject: [PATCH 1/2] Fix thinko in tests for COPY options force_not_null and force_null. Use COPY FROM for the negative tests that check that FORMAT text cannot be used for these options, since if testing COPY TO, which is invalid for these two options, we're testing two invalid options at the same time, which doesn't seem intentional, since the other tests seems to be testing invalid options one by one. In passing, consistently use "stdin" for COPY FROM and "stdout" for COPY TO, even though it has no effect on the tests per se, it seems better to be consistent, to avoid confusion. --- src/test/regress/expected/copy2.out | 20 ++++++++++---------- src/test/regress/sql/copy2.sql | 16 ++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out index 4e752977b5..6b89657285 100644 --- a/src/test/regress/expected/copy2.out +++ b/src/test/regress/expected/copy2.out @@ -86,9 +86,9 @@ ERROR: conflicting or redundant options LINE 1: COPY x from stdin (log_verbosity default, log_verbosity verb... ^ -- incorrect options -COPY x to stdin (format BINARY, delimiter ','); +COPY x to stdout (format BINARY, delimiter ','); ERROR: cannot specify DELIMITER in BINARY mode -COPY x to stdin (format BINARY, null 'x'); +COPY x to stdout (format BINARY, null 'x'); ERROR: cannot specify NULL in BINARY mode COPY x from stdin (format BINARY, on_error ignore); ERROR: only ON_ERROR STOP is allowed in BINARY mode @@ -96,22 +96,22 @@ COPY x from stdin (on_error unsupported); ERROR: COPY ON_ERROR "unsupported" not recognized LINE 1: COPY x from stdin (on_error unsupported); ^ -COPY x to stdin (format TEXT, force_quote(a)); +COPY x to stdout (format TEXT, force_quote(a)); ERROR: COPY FORCE_QUOTE requires CSV mode COPY x from stdin (format CSV, force_quote(a)); ERROR: COPY FORCE_QUOTE cannot be used with COPY FROM -COPY x to stdout (format TEXT, force_not_null(a)); +COPY x from stdin (format TEXT, force_not_null(a)); ERROR: COPY FORCE_NOT_NULL requires CSV mode -COPY x to stdin (format CSV, force_not_null(a)); +COPY x to stdout (format CSV, force_not_null(a)); ERROR: COPY FORCE_NOT_NULL cannot be used with COPY TO -COPY x to stdout (format TEXT, force_null(a)); +COPY x from stdin (format TEXT, force_null(a)); ERROR: COPY FORCE_NULL requires CSV mode -COPY x to stdin (format CSV, force_null(a)); +COPY x to stdout (format CSV, force_null(a)); ERROR: COPY FORCE_NULL cannot be used with COPY TO -COPY x to stdin (format BINARY, on_error unsupported); +COPY x to stdout (format BINARY, on_error unsupported); ERROR: COPY ON_ERROR cannot be used with COPY TO -LINE 1: COPY x to stdin (format BINARY, on_error unsupported); - ^ +LINE 1: COPY x to stdout (format BINARY, on_error unsupported); + ^ COPY x to stdout (log_verbosity unsupported); ERROR: COPY LOG_VERBOSITY "unsupported" not recognized LINE 1: COPY x to stdout (log_verbosity unsupported); diff --git a/src/test/regress/sql/copy2.sql b/src/test/regress/sql/copy2.sql index fa6aa17344..4b0831004b 100644 --- a/src/test/regress/sql/copy2.sql +++ b/src/test/regress/sql/copy2.sql @@ -70,17 +70,17 @@ COPY x from stdin (on_error ignore, on_error ignore); COPY x from stdin (log_verbosity default, log_verbosity verbose); -- incorrect options -COPY x to stdin (format BINARY, delimiter ','); -COPY x to stdin (format BINARY, null 'x'); +COPY x to stdout (format BINARY, delimiter ','); +COPY x to stdout (format BINARY, null 'x'); COPY x from stdin (format BINARY, on_error ignore); COPY x from stdin (on_error unsupported); -COPY x to stdin (format TEXT, force_quote(a)); +COPY x to stdout (format TEXT, force_quote(a)); COPY x from stdin (format CSV, force_quote(a)); -COPY x to stdout (format TEXT, force_not_null(a)); -COPY x to stdin (format CSV, force_not_null(a)); -COPY x to stdout (format TEXT, force_null(a)); -COPY x to stdin (format CSV, force_null(a)); -COPY x to stdin (format BINARY, on_error unsupported); +COPY x from stdin (format TEXT, force_not_null(a)); +COPY x to stdout (format CSV, force_not_null(a)); +COPY x from stdin (format TEXT, force_null(a)); +COPY x to stdout (format CSV, force_null(a)); +COPY x to stdout (format BINARY, on_error unsupported); COPY x to stdout (log_verbosity unsupported); -- too many columns in column list: should fail -- 2.45.1