Merge pull request ClickHouse#61530 from ClickHouse/fix-client-s

Fix client `-s` argument

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")

tests/queries/0_stateless/00505_secure.reference

@@ -1,3 +1,5 @@
+0
+1
 2
 3
 4

tests/queries/0_stateless/00505_secure.sh

@@ -7,6 +7,12 @@ 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;"
+
 $CLICKHOUSE_CLIENT_SECURE -q "SELECT 2;"
 
 #disable test