feat: show NULL values in system variables listing

ansgarbecker · ansgarbecker · commit 06b44eb483d9 · 2025-11-29T21:26:56.000+01:00
Refs #1281
diff --git a/source/main.pas b/source/main.pas
@@ -9476,12 +9476,16 @@ procedure TMainForm.HostListGetText(Sender: TBaseVirtualTree; Node: PVirtualNode
 procedure TMainForm.menuEditVariableClick(Sender: TObject);
 var
   Dialog: TfrmEditVariable;
+  VarValue: String;
 begin
   Dialog := TfrmEditVariable.Create(Self);
   try
     try
       Dialog.VarName := ListVariables.Text[ListVariables.FocusedNode, 0];
-      Dialog.VarValue := ListVariables.Text[ListVariables.FocusedNode, 1];
+      VarValue := ListVariables.Text[ListVariables.FocusedNode, 1];
+      if VarValue = TEXT_NULL then
+        VarValue := '';
+      Dialog.VarValue := VarValue;
       // Refresh list node
       if Dialog.ShowModal = mrOK then
         InvalidateVT(ListVariables, VTREE_NOTLOADED, False);
@@ -11559,14 +11563,15 @@ procedure TMainForm.HostListBeforePaint(Sender: TBaseVirtualTree; TargetCanvas:
       Variables := Conn.GetResults(Conn.GetSQLSpecifity(spSessionVariables));
       while not Variables.Eof do begin
         FVariableNames.Add(Variables.Col(0));
-        FSessionVars.Values[Variables.Col(0)] := Variables.Col(1);
+        FSessionVars.Values[Variables.Col(0)] := IfThen(Variables.IsNull(1), TEXT_NULL, Variables.Col(1));
         Variables.Next;
       end;
       Variables.Free;
       Variables := Conn.GetResults(Conn.GetSQLSpecifity(spGlobalVariables));
       while not Variables.Eof do begin
         FVariableNames.Add(Variables.Col(0));
         FGlobalVars.Values[Variables.Col(0)] := Variables.Col(1);
+        FGlobalVars.Values[Variables.Col(0)] := IfThen(Variables.IsNull(1), TEXT_NULL, Variables.Col(1));
         Variables.Next;
       end;
       Variables.Free;
@@ -11713,7 +11718,7 @@ procedure TMainForm.HostListBeforeCellPaint(Sender: TBaseVirtualTree; TargetCanv
     SessionVal := vt.Text[Node, 1];
     GlobalVal := vt.Text[Node, 2];
     if SessionVal <> GlobalVal then begin
-      //TargetCanvas.Brush.Color := clWebBlanchedAlmond;
+      TargetCanvas.Brush.Color := clYellow;
       TargetCanvas.Pen.Color := TargetCanvas.Brush.Color;
       TargetCanvas.Rectangle(CellRect);
     end;
