From 5c1a54f643b9c72bf87ab03358a6244a7adf692b Mon Sep 17 00:00:00 2001
From: "Mikhail f. Shiryaev" <felixoid@clickhouse.com>
Date: Mon, 18 Mar 2024 15:22:50 +0100
Subject: [PATCH 1/3] Fix `clickhouse-client -s` argument

---
 programs/client/Client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 4203e4738ddc..9e90596b4f86 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -933,7 +933,7 @@ void Client::addOptions(OptionsDescription & options_description)
         ("config,c", po::value<std::string>(), "config-file path (another shorthand)")
         ("connection", po::value<std::string>(), "connection to use (from the client config), by default connection name is hostname")
         ("secure,s", "Use TLS connection")
-        ("no-secure,s", "Don't use TLS connection")
+        ("no-secure", "Don't use TLS connection")
         ("user,u", po::value<std::string>()->default_value("default"), "user")
         ("password", po::value<std::string>(), "password")
         ("ask-password", "ask-password")

From 55f7595c43f7f694dca65fad2880ba92b6d5de41 Mon Sep 17 00:00:00 2001
From: "Mikhail f. Shiryaev" <felixoid@clickhouse.com>
Date: Mon, 18 Mar 2024 15:24:55 +0100
Subject: [PATCH 2/3] Test `-s` argument for clickhouse-client

---
 tests/queries/0_stateless/00505_secure.reference | 1 +
 tests/queries/0_stateless/00505_secure.sh        | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/tests/queries/0_stateless/00505_secure.reference b/tests/queries/0_stateless/00505_secure.reference
index 9a8656bf4915..73bdbdbafbe7 100644
--- a/tests/queries/0_stateless/00505_secure.reference
+++ b/tests/queries/0_stateless/00505_secure.reference
@@ -1,3 +1,4 @@
+1
 2
 3
 4
diff --git a/tests/queries/0_stateless/00505_secure.sh b/tests/queries/0_stateless/00505_secure.sh
index b7c12911b90e..dcda2c0f2e83 100755
--- a/tests/queries/0_stateless/00505_secure.sh
+++ b/tests/queries/0_stateless/00505_secure.sh
@@ -7,6 +7,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+# Use $CLICKHOUSE_CLIENT_SECURE, but replace `--secure` by `-s` to test it
+CLICKHOUSE_CLIENT_S=${CLICKHOUSE_CLIENT_SECURE/ --secure / -s }
+$CLICKHOUSE_CLIENT_S -q "SELECT 1;"
+
 $CLICKHOUSE_CLIENT_SECURE -q "SELECT 2;"
 
 #disable test

From 463b90e058c1c6f0b5cd692e2fd699f5b5a1b3f8 Mon Sep 17 00:00:00 2001
From: "Mikhail f. Shiryaev" <felixoid@clickhouse.com>
Date: Mon, 18 Mar 2024 16:23:07 +0100
Subject: [PATCH 3/3] Add test for `--no-secure`

---
 tests/queries/0_stateless/00505_secure.reference | 1 +
 tests/queries/0_stateless/00505_secure.sh        | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/tests/queries/0_stateless/00505_secure.reference b/tests/queries/0_stateless/00505_secure.reference
index 73bdbdbafbe7..24319e2c136f 100644
--- a/tests/queries/0_stateless/00505_secure.reference
+++ b/tests/queries/0_stateless/00505_secure.reference
@@ -1,3 +1,4 @@
+0
 1
 2
 3
diff --git a/tests/queries/0_stateless/00505_secure.sh b/tests/queries/0_stateless/00505_secure.sh
index dcda2c0f2e83..eaa50bce6b1b 100755
--- a/tests/queries/0_stateless/00505_secure.sh
+++ b/tests/queries/0_stateless/00505_secure.sh
@@ -7,6 +7,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+$CLICKHOUSE_CLIENT --no-secure -q "SELECT 0;"
+
 # Use $CLICKHOUSE_CLIENT_SECURE, but replace `--secure` by `-s` to test it
 CLICKHOUSE_CLIENT_S=${CLICKHOUSE_CLIENT_SECURE/ --secure / -s }
 $CLICKHOUSE_CLIENT_S -q "SELECT 1;"