From a0aa30a4e982367d35a2f8734d919cd8b5f6ef49 Mon Sep 17 00:00:00 2001 From: avogar Date: Thu, 21 Oct 2021 19:41:43 +0300 Subject: [PATCH] Fix tests --- tests/queries/0_stateless/00301_csv.sh | 2 +- tests/queries/0_stateless/01474_custom_null_tsv.sh | 2 +- .../02029_output_csv_null_representation.reference | 4 ++-- .../0_stateless/02029_output_csv_null_representation.sql | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/queries/0_stateless/00301_csv.sh b/tests/queries/0_stateless/00301_csv.sh index 0aee9abe25c..333af9dcfe0 100755 --- a/tests/queries/0_stateless/00301_csv.sh +++ b/tests/queries/0_stateless/00301_csv.sh @@ -33,7 +33,7 @@ $CLICKHOUSE_CLIENT --query="CREATE TABLE csv (t Nullable(DateTime('Europe/Moscow echo 'NULL, NULL "2016-01-01 01:02:03",NUL -"2016-01-02 01:02:03",Nhello' | $CLICKHOUSE_CLIENT --input_format_csv_unquoted_null_literal_as_null=1 --query="INSERT INTO csv FORMAT CSV"; +"2016-01-02 01:02:03",Nhello' | $CLICKHOUSE_CLIENT --format_csv_null_representation='NULL' --query="INSERT INTO csv FORMAT CSV"; $CLICKHOUSE_CLIENT --query="SELECT * FROM csv ORDER BY s NULLS LAST"; $CLICKHOUSE_CLIENT --query="DROP TABLE csv"; diff --git a/tests/queries/0_stateless/01474_custom_null_tsv.sh b/tests/queries/0_stateless/01474_custom_null_tsv.sh index 9dc1c4b7777..fb5939faf5e 100755 --- a/tests/queries/0_stateless/01474_custom_null_tsv.sh +++ b/tests/queries/0_stateless/01474_custom_null_tsv.sh @@ -9,7 +9,7 @@ $CLICKHOUSE_CLIENT --query="CREATE TABLE tsv_custom_null (id Nullable(UInt32)) E $CLICKHOUSE_CLIENT --query="INSERT INTO tsv_custom_null VALUES (NULL)"; -$CLICKHOUSE_CLIENT --output_format_tsv_null_representation='MyNull' --query="SELECT * FROM tsv_custom_null FORMAT TSV"; +$CLICKHOUSE_CLIENT --format_tsv_null_representation='MyNull' --query="SELECT * FROM tsv_custom_null FORMAT TSV"; $CLICKHOUSE_CLIENT --query="DROP TABLE tsv_custom_null"; diff --git a/tests/queries/0_stateless/02029_output_csv_null_representation.reference b/tests/queries/0_stateless/02029_output_csv_null_representation.reference index a5174f4424f..eda4b09e312 100644 --- a/tests/queries/0_stateless/02029_output_csv_null_representation.reference +++ b/tests/queries/0_stateless/02029_output_csv_null_representation.reference @@ -1,4 +1,4 @@ -# output_format_csv_null_representation should initially be \\N +# format_csv_null_representation should initially be \\N "val1",\N,"val3" -# Changing output_format_csv_null_representation +# Changing format_csv_null_representation "val1",∅,"val3" diff --git a/tests/queries/0_stateless/02029_output_csv_null_representation.sql b/tests/queries/0_stateless/02029_output_csv_null_representation.sql index 772c6c89144..a27c552ee60 100644 --- a/tests/queries/0_stateless/02029_output_csv_null_representation.sql +++ b/tests/queries/0_stateless/02029_output_csv_null_representation.sql @@ -7,10 +7,10 @@ CREATE TABLE test_data ( INSERT INTO test_data VALUES ('val1', NULL, 'val3'); -SELECT '# output_format_csv_null_representation should initially be \\N'; +SELECT '# format_csv_null_representation should initially be \\N'; SELECT * FROM test_data FORMAT CSV; -SELECT '# Changing output_format_csv_null_representation'; -SET output_format_csv_null_representation = '∅'; +SELECT '# Changing format_csv_null_representation'; +SET format_csv_null_representation = '∅'; SELECT * FROM test_data FORMAT CSV; -SET output_format_csv_null_representation = '\\N'; +SET format_csv_null_representation = '\\N';