Fixes

programs/client/Client.cpp

@@ -408,6 +408,9 @@ void Client::prepareForInteractive()
     clearTerminal();
     showClientVersion();
 
+    if (delayed_interactive)
+        std::cout << std::endl;
+
     /// Load Warnings at the beginning of connection
     if (!config().has("no-warnings"))
     {
@@ -563,8 +566,9 @@ void Client::connect()
     if (is_interactive)
     {
         std::cout << "Connected to " << server_name << " server version " << server_version << " revision " << server_revision << "."
-                    << std::endl
                     << std::endl;
+        if (!delayed_interactive)
+            std::cout << std::endl;
 
         auto client_version_tuple = std::make_tuple(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
         auto server_version_tuple = std::make_tuple(server_version_major, server_version_minor, server_version_patch);

src/Client/ClientBase.cpp

@@ -1705,6 +1705,9 @@ void ClientBase::init(int argc, char ** argv)
         config().setString("history_file", options["history_file"].as<std::string>());
     if (options.count("verbose"))
         config().setBool("verbose", true);
+    if (options.count("interactive"))
+        config().setBool("interactive", true);
+
     if (options.count("log-level"))
         Poco::Logger::root().setLevel(options["log-level"].as<std::string>());
     if (options.count("server_logs_file"))

tests/queries/0_stateless/02112_delayed_clickhouse_client_with_queries_file.expect

@@ -23,8 +23,5 @@ send -- "select * from t format TSV\r"
 expect "1"
 expect ":) "
 
-send -- "exit\r"
-expect eof
-
 spawn bash -c "\$CLICKHOUSE_TESTS_DIR/helpers/02112_clean.sh"
 

tests/queries/0_stateless/02112_delayed_clickhouse_local_with_queries_file.expect

@@ -23,8 +23,5 @@ send -- "select * from t format TSV\r"
 expect "1"
 expect ":) "
 
-send -- "exit\r"
-expect eof
-
 spawn bash -c "\$CLICKHOUSE_TESTS_DIR/helpers/02112_clean.sh"