Fixed bugs

Author: Gazizonoki

ydb/public/lib/ydb_cli/common/csv_parser.cpp

@@ -186,7 +186,7 @@ class TCsvToYdbConverter {
             break;
         }
         case TTypeParser::ETypeKind::Pg: {
-            if (token == NullValue) {
+            if (NullValue && token == NullValue) {
                 Builder.Pg(TPgValue(TPgValue::VK_NULL, {}, Parser.GetPg()));
             } else {
                 Builder.Pg(TPgValue(TPgValue::VK_TEXT, TString(token), Parser.GetPg()));
@@ -250,6 +250,9 @@ class TCsvToYdbConverter {
     }
 
     void EnsureNull(TStringBuf token) const {
+        if (!NullValue) {
+            throw TMisuseException() << "Expected null value instead of \"" << token << "\", but null value is not set.";
+        }
         if (token != NullValue) {
             throw TMisuseException() << "Expected null value: \"" << NullValue << "\", recieved: \"" << token << "\".";
         }

ydb/public/lib/ydb_cli/common/progress_bar.cpp

@@ -24,23 +24,30 @@ void TProgressBar::AddProgress(size_t value) {
     Render();
 }
 
+TProgressBar::~TProgressBar() {
+    if (!Finished) {
+        Cout << Endl;
+    }
+}
+
 void TProgressBar::Render()
 {
     std::optional<size_t> barLenOpt = GetTerminalWidth();
     if (!barLenOpt)
         return;
 
     size_t barLen = *barLenOpt;
-    TString output = ToString(CurProgress * 100 / Capacity);
+    TString output = "\r";
+    output += ToString(CurProgress * 100 / Capacity);
     output += "% |";
     TString outputEnd = "| [";
     outputEnd += ToString(CurProgress);
     outputEnd += "/";
     outputEnd += ToString(Capacity);
     outputEnd += "]";
 
-    if (barLen > output.Size()) {
-        barLen -= output.Size();
+    if (barLen > output.Size() - 1) {
+        barLen -= output.Size() - 1;
     } else {
         barLen = 1;
     }
@@ -55,10 +62,10 @@ void TProgressBar::Render()
     output += TString("█") * filledBarLen;
     output += TString("░") * (barLen - filledBarLen);
     output += outputEnd;
-    output += "\r";
     Cout << output;
     if (CurProgress == Capacity) {
         Cout << "\n";
+        Finished = true;
     }
     Cout.Flush();
 }

ydb/public/lib/ydb_cli/common/progress_bar.h

@@ -9,6 +9,8 @@ class TProgressBar {
 public:
     explicit TProgressBar(size_t capacity);
 
+    ~TProgressBar();
+
     void SetProcess(size_t progress);
 
     void AddProgress(size_t value);
@@ -18,6 +20,7 @@ class TProgressBar {
 
     size_t Capacity = 0;
     size_t CurProgress = 0;
+    bool Finished = false;
 };
 
 } // namespace NConsoleClient