Fixes

Author: shnikd

ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp

@@ -551,7 +551,7 @@ void TCommandExecuteQuery::PrintDataQueryResponse(NTable::TDataQueryResult& resu
             NJson::ReadJsonTree(*meta, &metaJson, true);
             diagnosticsJson.InsertValue("meta", metaJson);
         }
-        file << NJson::PrettifyJson(NJson::WriteJson(diagnosticsJson, true), false);
+        file << NJson::PrettifyJson(NJson::WriteJson(diagnosticsJson, true), true);
     }
 
     if (FlameGraphPath && !stats.has_value()) {
@@ -796,7 +796,9 @@ bool TCommandExecuteQuery::PrintQueryResponse(TIterator& result) {
                 if (queryStats.GetPlan()) {
                     fullStats = queryStats.GetPlan();
                 }
-                meta = queryStats.GetMeta();
+                if (queryStats.GetMeta()) {
+                    meta = queryStats.GetMeta();
+                }
             }
         }
     } // TResultSetPrinter destructor should be called before printing stats
@@ -838,7 +840,7 @@ bool TCommandExecuteQuery::PrintQueryResponse(TIterator& result) {
             metaJson.InsertValue("query_text", EscapeC(Query));
             diagnosticsJson.InsertValue("meta", metaJson);
         }
-        file << NJson::PrettifyJson(NJson::WriteJson(diagnosticsJson, true), false);
+        file << NJson::PrettifyJson(NJson::WriteJson(diagnosticsJson, true), true);
     }
 
     PrintFlameGraph(fullStats);

ydb/public/lib/ydb_cli/commands/ydb_sql.cpp

@@ -206,12 +206,13 @@ int TCommandSql::PrintResponse(NQuery::TExecuteQueryIterator& result) {
                 const auto& queryStats = *streamPart.GetStats();
                 stats = queryStats.ToString();
                 ast = queryStats.GetAst();
-                meta = queryStats.GetMeta();
 
                 if (queryStats.GetPlan()) {
                     plan = queryStats.GetPlan();
                 }
-                meta = queryStats.GetMeta();
+                if (queryStats.GetMeta()) {
+                    meta = queryStats.GetMeta();
+                }
             }
         }
     } // TResultSetPrinter destructor should be called before printing stats
@@ -269,7 +270,7 @@ int TCommandSql::PrintResponse(NQuery::TExecuteQueryIterator& result) {
             metaJson.InsertValue("query_text", EscapeC(Query));
             diagnosticsJson.InsertValue("meta", metaJson);
         }
-        file << NJson::PrettifyJson(NJson::WriteJson(diagnosticsJson, true), false);
+        file << NJson::PrettifyJson(NJson::WriteJson(diagnosticsJson, true), true);
     }
 
     if (IsInterrupted()) {