Fixed issue bug #3 on anonymizedb command

Author: segovoni

Packages/d103/sqlcmdcli.dpr

@@ -74,13 +74,15 @@ begin
     end;
 
     TCommandHandler.ExecuteCommand(LParseResult.Command);
-
-    Readln;
+    TConsole.Log(RS_THANKS_FOR_USING, Info, True);
+    Exit;
   except
-      on E: Exception do
+    on E: Exception do
       begin
         Writeln(E.ClassName, ': ', E.Message);
         ExitCode := 1;
+        TConsole.Log(RS_THANKS_FOR_USING, Info, True);
+        Exit
       end;
   end;
 end.

Packages/d103/sqlcmdcli.dproj

@@ -112,8 +112,8 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
-        <VerInfo_Keys>CompanyName=;FileDescription=Command-line utility for ad hoc, interactive execution of commands on SQL Server;FileVersion=1.0.0.80;InternalName=sqlcmdcli;LegalCopyright=;LegalTrademarks=;OriginalFilename=sqlcmdcli.exe;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0;Comments=https://github.com/segovoni/sqlcmdcli</VerInfo_Keys>
-        <VerInfo_Build>80</VerInfo_Build>
+        <VerInfo_Keys>CompanyName=;FileDescription=Command-line utility for ad hoc, interactive execution of commands on SQL Server;FileVersion=1.0.0.112;InternalName=sqlcmdcli;LegalCopyright=;LegalTrademarks=;OriginalFilename=sqlcmdcli.exe;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0;Comments=https://github.com/segovoni/sqlcmdcli</VerInfo_Keys>
+        <VerInfo_Build>112</VerInfo_Build>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">

Sources/sqlcmdcli.AnonymizeDB.pas

@@ -348,7 +348,7 @@ class procedure TAnonymizeDB.Run(const AServerName, ADatabaseName, AUserName,
                     'AND (' + LSQLDBTableInfo.ColumnName + '<>'''')';
 
               if (AVerbose) then
-                TConsole.Log(LQry.SQL.Text, Success, True);
+                TConsole.Log(LQry.SQL.Text, Info, True);
 
               LQry.ExecSQL;
             end;
@@ -379,13 +379,16 @@ class procedure TAnonymizeDB.Run(const AServerName, ADatabaseName, AUserName,
       TConsole.Log(RS_CMD_ANONYMIZEDB_ENABLE_TR_END, Success, True);
 
       LConnection.CommitTrans;
-      TConsole.Log(Format(RS_CMD_ANONYMIZEDB_END, [ADatabaseName]), Success, False);
+      TConsole.Log(Format(RS_COMMIT_TRANSACTION, [ADatabaseName]), Success, True);
+      TConsole.Log(Format(RS_CMD_ANONYMIZEDB_END, [ADatabaseName]), Success, True);
     except
-      on E: Exception do begin
-        LConnection.RollbackTrans;
-        //Writeln(E.ClassName, ': ', E.Message);
-        TConsole.Log(E.ClassName + ': ' + E.Message, Error, True);
-      end;
+      on E: Exception do
+        begin
+          if (LConnection.InTransaction) then
+            LConnection.RollbackTrans;
+          TConsole.Log(E.ClassName + ': ' + E.Message, Error, True);
+          TConsole.Log(Format(RS_ROLLBACK_TRANSACTION, [ADatabaseName]), Warning, True);
+        end;
     end;
 
   finally
@@ -394,7 +397,6 @@ class procedure TAnonymizeDB.Run(const AServerName, ADatabaseName, AUserName,
     FreeAndNil(LConnection);
     FreeAndNil(LTableList);
   end;
-
 end;
 
 end.

Sources/sqlcmdcli.Console.pas

@@ -7,71 +7,94 @@ interface
 
 type
   TConsoleForegroundColor = (
+    BlackForeground = 0,
     GreenForeground = FOREGROUND_GREEN,
     NavyForeground = FOREGROUND_BLUE,
+    GrayForeground = FOREGROUND_RED or FOREGROUND_GREEN or FOREGROUND_BLUE,
+    AquaForeground = FOREGROUND_INTENSITY or FOREGROUND_GREEN or FOREGROUND_BLUE,
     RedForeground = FOREGROUND_INTENSITY or FOREGROUND_RED,
-    LimeForeground = FOREGROUND_INTENSITY or FOREGROUND_GREEN
+    LimeForeground = FOREGROUND_INTENSITY or FOREGROUND_GREEN,
+    WhiteForeground = FOREGROUND_INTENSITY or FOREGROUND_RED or FOREGROUND_GREEN or FOREGROUND_BLUE
   );
 
   TConsoleBackgroundColor = (
-    BlackBackground = 0
+    BlackBackground = 0,
+    WhiteBackground = BACKGROUND_INTENSITY or BACKGROUND_RED or BACKGROUND_GREEN or BACKGROUND_BLUE
   );
 
   TConsoleState = (Default, Info, Success, Warning, Error);
 
   TConsole = class(TObject)
   private
     class var FHandle: Cardinal;
+    class var FConOut: THandle;
+    class var FBufInfo: TConsoleScreenBufferInfo;
   public
     class constructor Create;
     class procedure SetForegroundColor(const AValue: TConsoleForegroundColor);
-    class procedure SetBackgroundColor(const AValue: TConsoleBackgroundColor);
+    //class procedure SetBackgroundColor(const AValue: TConsoleBackgroundColor);
     class procedure SetTitle(const AValue: string);
     class procedure Log(const AMessage: string; AState: TConsoleState;
       const ANewLine: Boolean);
   end;
 
 implementation
 
+uses
+  sqlcmdcli.Constants;
+
 { TConsole }
 
 class constructor TConsole.Create;
 begin
   inherited;
   FHandle := GetStdHandle(STD_OUTPUT_HANDLE);
-end;
-
-class procedure TConsole.SetBackgroundColor(
-  const AValue: TConsoleBackgroundColor);
-begin
-
+  // Get console screen buffer handle
+  FConOut := TTextRec(Output).Handle;
+  // Save current text attributes
+  GetConsoleScreenBufferInfo(FConOut, FBufInfo);
 end;
 
 class procedure TConsole.SetForegroundColor(
   const AValue: TConsoleForegroundColor);
 begin
-  //SetConsoleTextAttribute(FHandle, AValue);
+  SetConsoleTextAttribute(FHandle, Word(AValue));
 end;
 
 class procedure TConsole.SetTitle(const AValue: string);
 begin
-
+  SetConsoleTitle(PChar(AValue));
 end;
 
 class procedure TConsole.Log(const AMessage: string; AState: TConsoleState;
   const ANewLine: Boolean);
+var
+  LConOut: THandle;
+  LBufInfo: TConsoleScreenBufferInfo;
 begin
+  // Get console screen buffer handle
+  LConOut := TTextRec(Output).Handle;
+
+  // Save current text attributes
+  GetConsoleScreenBufferInfo(LConOut, LBufInfo);
+
   case AState of
-    Default: SetForegroundColor(GreenForeground);
-    Info: SetForegroundColor(NavyForeground);
+    Default:   SetConsoleTextAttribute(FConOut, FBufInfo.wAttributes);
+    Info: SetForegroundColor(AquaForeground);
     Success: SetForegroundColor(GreenForeground);
     Warning: SetForegroundColor(RedForeground);
     Error: SetForegroundColor(RedForeground);
+  else
+    SetForegroundColor(BlackForeground);
   end;
+
   if ANewLine then
     Writeln(AMessage)
   else
     Write(AMessage);
+
+  // Reset to defaults
+  SetConsoleTextAttribute(LConOut, LBufInfo.wAttributes);
 end;
 
 end.

Sources/sqlcmdcli.ResourceStrings.pas

@@ -81,6 +81,9 @@ interface
   RS_ERROR_SQL_SERVER_NATIVE_CLIENT = 'SQL Server Native Client %s is not installed! ' +
                                       'Check here to know how to install SQL ' +
                                       'Server Native Client: https://bit.ly/3wFVJXz';
+  RS_THANKS_FOR_USING = 'Thanks for using sqlcmdcli https://github.com/segovoni/sqlcmdcli';
+  RS_COMMIT_TRANSACTION = 'The transaction has been committed!';
+  RS_ROLLBACK_TRANSACTION = 'The transaction has been rejected!';
 
 implementation