From 0c47dd4ec2eacfbc0c559e6a21ef156e102a0522 Mon Sep 17 00:00:00 2001
From: taiyang-li <654010905@qq.com>
Date: Sun, 6 Feb 2022 12:17:03 +0800
Subject: [PATCH 1/3] format override input-format

---
 programs/local/LocalServer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index a6c9a6a4524..2217f2bbdbe 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -337,8 +337,9 @@ std::string LocalServer::getInitialCreateTableQuery()
         format_from_file_name = FormatFactory::instance().getFormatFromFileName(file_name, false);
     }
 
-    auto data_format
-        = backQuoteIfNeed(config().getString("table-data-format", format_from_file_name.empty() ? "TSV" : format_from_file_name));
+    auto data_format = backQuoteIfNeed(
+        config().getString("table-data-format", config().getString("format", format_from_file_name.empty() ? "TSV" : format_from_file_name)));
+
 
     if (table_structure == "auto")
         table_structure = "";

From bcd077fdc3f8b7c2b1ae4544cb9076b4146fbca3 Mon Sep 17 00:00:00 2001
From: taiyang-li <654010905@qq.com>
Date: Fri, 11 Feb 2022 21:20:57 +0800
Subject: [PATCH 2/3] add stateless test

---
 .../02206_format_override.reference           | 33 +++++++++++++++++++
 .../0_stateless/02206_format_override.sh      | 25 ++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 tests/queries/0_stateless/02206_format_override.reference
 create mode 100644 tests/queries/0_stateless/02206_format_override.sh

diff --git a/tests/queries/0_stateless/02206_format_override.reference b/tests/queries/0_stateless/02206_format_override.reference
new file mode 100644
index 00000000000..e1bb01eeb2f
--- /dev/null
+++ b/tests/queries/0_stateless/02206_format_override.reference
@@ -0,0 +1,33 @@
+File generated:
+Options: --input-format=CSV --output-format JSONEachRow --format TSV
+{"num1":"0","num2":"0"}
+{"num1":"1","num2":"2"}
+{"num1":"2","num2":"4"}
+{"num1":"3","num2":"6"}
+{"num1":"4","num2":"8"}
+{"num1":"5","num2":"10"}
+{"num1":"6","num2":"12"}
+Options: --input-format=CSV --format TSV
+0	0
+1	2
+2	4
+3	6
+4	8
+5	10
+6	12
+Options: --output-format=JSONEachRow --format CSV
+{"num1":"0","num2":"0"}
+{"num1":"1","num2":"2"}
+{"num1":"2","num2":"4"}
+{"num1":"3","num2":"6"}
+{"num1":"4","num2":"8"}
+{"num1":"5","num2":"10"}
+{"num1":"6","num2":"12"}
+Options: --format CSV
+0,0
+1,2
+2,4
+3,6
+4,8
+5,10
+6,12
diff --git a/tests/queries/0_stateless/02206_format_override.sh b/tests/queries/0_stateless/02206_format_override.sh
new file mode 100644
index 00000000000..1359f1edeb8
--- /dev/null
+++ b/tests/queries/0_stateless/02206_format_override.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+SAMPLE_FILE="$CURDIR/02206_sample_data.csv"
+
+echo 'File generated:'
+${CLICKHOUSE_LOCAL} -q "SELECT number, number * 2 from numbers(7) FORMAT TSV" | tr '\t' ',' >"$SAMPLE_FILE"
+
+
+echo "Options: --input-format=CSV --output-format JSONEachRow --format TSV"
+cat "$SAMPLE_FILE" | ${CLICKHOUSE_LOCAL} --input-format CSV --output-format JSONEachRow --format TSV --structure='num1 Int64, num2 Int64' --query='SELECT * from table'
+
+echo "Options: --input-format=CSV --format TSV"
+cat "$SAMPLE_FILE" | ${CLICKHOUSE_LOCAL} --input-format CSV --format TSV --structure='num1 Int64, num2 Int64' --query='SELECT * from table'
+
+echo "Options: --output-format=JSONEachRow --format CSV"
+cat "$SAMPLE_FILE" | ${CLICKHOUSE_LOCAL} --output-format JSONEachRow --format CSV --structure='num1 Int64, num2 Int64' --query='SELECT * from table'
+
+echo "Options: --format CSV"
+cat "$SAMPLE_FILE" | ${CLICKHOUSE_LOCAL} --format CSV --structure='num1 Int64, num2 Int64' --query='SELECT * from table'
+
+rm "$SAMPLE_FILE"
\ No newline at end of file

From 8e20cf9face8e210ae819ded42cc94e03c6f7200 Mon Sep 17 00:00:00 2001
From: taiyang-li <654010905@qq.com>
Date: Sat, 12 Feb 2022 19:30:02 +0800
Subject: [PATCH 3/3] chmod bash shell

---
 tests/queries/0_stateless/02206_format_override.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tests/queries/0_stateless/02206_format_override.sh

diff --git a/tests/queries/0_stateless/02206_format_override.sh b/tests/queries/0_stateless/02206_format_override.sh
old mode 100644
new mode 100755