Fix error output formatting

ydb-platform · Sep 24, 2024 · 6e597f4 · 6e597f4
1 parent 7916118
commit 6e597f4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_service_scripting.cpp b/ydb/public/lib/ydb_cli/commands/ydb_service_scripting.cpp
@@ -84,8 +84,9 @@ void TCommandExecuteYqlScript::Parse(TConfig& config) {
     TClientCommand::Parse(config);
     ParseFormats();
     if (!Script && !ScriptFile) {
-        throw TMisuseException() << "Neither \"Text of script\" (\"--script\", \"-s\") "
-            << "nor \"Path to file with script text\" (\"--file\", \"-f\") were provided.";
+        Cerr << "Neither \"Text of script\" (\"--script\", \"-s\") "
+            << "nor \"Path to file with script text\" (\"--file\", \"-f\") were provided." << Endl;
+        config.PrintHelpAndExit();
     }
     if (Script && ScriptFile) {
         throw TMisuseException() << "Both mutually exclusive options \"Text of script\" (\"--script\", \"-s\") "
@@ -94,11 +95,6 @@ void TCommandExecuteYqlScript::Parse(TConfig& config) {
     if (ScriptFile) {
         Script = ReadFromFile(ScriptFile, "script");
     }
-    if (Script.Empty()) {
-        Cerr << "Neither text of script (\"--script\", \"-s\") "
-            << "nor path to file with script text (\"--file\", \"-f\") were provided.";
-        config.PrintHelpAndExit();
-    }
     if(FlameGraphPath && FlameGraphPath->Empty())
     {
         throw TMisuseException() << "FlameGraph path can not be empty.";

diff --git a/ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp b/ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp
@@ -330,7 +330,7 @@ int TCommandDropTable::Run(TConfig& config) {
 void TCommandQueryBase::CheckQueryOptions(TClientCommand::TConfig& config) const {
     if (!Query && !QueryFile) {
         Cerr << "Neither \"Text of query\" (\"--query\", \"-q\") "
-            << "nor \"Path to file with query text\" (\"--file\", \"-f\") were provided.";
+            << "nor \"Path to file with query text\" (\"--file\", \"-f\") were provided." << Endl;
         config.PrintHelpAndExit();
     }
     if (Query && QueryFile) {

diff --git a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp
@@ -78,7 +78,7 @@ void TCommandSql::Parse(TConfig& config) {
     }
     if (Query.Empty()) {
         Cerr << "Neither text of script (\"--script\", \"-s\") "
-            << "nor path to file with script text (\"--file\", \"-f\") were provided.";
+            << "nor path to file with script text (\"--file\", \"-f\") were provided." << Endl;
         config.PrintHelpAndExit();
     }
 }

diff --git a/ydb/public/lib/ydb_cli/commands/ydb_yql.cpp b/ydb/public/lib/ydb_cli/commands/ydb_yql.cpp
@@ -80,7 +80,7 @@ void TCommandYql::Parse(TConfig& config) {
     }
     if (Script.Empty()) {
         Cerr << "Neither text of script (\"--script\", \"-s\") "
-            << "nor path to file with script text (\"--file\", \"-f\") were provided.";
+            << "nor path to file with script text (\"--file\", \"-f\") were provided." << Endl;
         config.PrintHelpAndExit();
     }
     if(FlameGraphPath && FlameGraphPath->Empty())