Fixes

Author: shnikd

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

@@ -528,9 +528,6 @@ void TCommandExecuteQuery::PrintDataQueryResponse(NTable::TDataQueryResult& resu
         ast = stats->GetAst();
         statsStr = stats->ToString();
         Cout << Endl << "Statistics:" << Endl << statsStr;
-        if (meta) {
-            Cout << Endl << "Meta:" << Endl << NJson::PrettifyJson(*meta, true) << Endl;
-        }
         PrintFlameGraph(plan);
     }
 
@@ -553,6 +550,7 @@ void TCommandExecuteQuery::PrintDataQueryResponse(NTable::TDataQueryResult& resu
         if (meta) {
             NJson::TJsonValue metaJson;
             NJson::ReadJsonTree(*meta, &metaJson, true);
+            metaJson.InsertValue("query_text", EscapeC(Query));
             diagnosticsJson.InsertValue("meta", metaJson);
         }
         file << NJson::PrettifyJson(NJson::WriteJson(diagnosticsJson, true), false);
@@ -818,10 +816,6 @@ bool TCommandExecuteQuery::PrintQueryResponse(TIterator& result) {
         queryPlanPrinter.Print(TString{*fullStats});
     }
 
-    if (meta) {
-        Cout << Endl << "Meta:" << Endl << NJson::PrettifyJson(*meta, true) << Endl;;
-    }
-
     if (!DiagnosticsFile.empty()) {
         TFileOutput file(TStringBuilder() << DiagnosticsFile << ".json");
 

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

@@ -231,10 +231,6 @@ int TCommandSql::PrintResponse(NQuery::TExecuteQueryIterator& result) {
         Cout << Endl << "Statistics:" << Endl << *stats;
     }
 
-    if (meta) {
-        Cout << Endl << "Meta:" << Endl << NJson::PrettifyJson(*meta, true) << Endl;;
-    }
-
     if (plan) {
         if (!ExplainMode && !ExplainAnalyzeMode
                 && (OutputFormat == EDataFormat::Default || OutputFormat == EDataFormat::Pretty)) {