feat: create opt-in option for displaying columns in database tree

Refs #2069

Author: ansgarbecker

source/apphelpers.pas

@@ -225,7 +225,7 @@   TWinControlHelper = class helper for TWinControl
     asLogUserSQL, asLogSQL, asLogInfos, asLogDebug, asLogScript, asLogTimestamp, asFieldColorNumeric,
     asFieldColorReal, asFieldColorText, asFieldColorBinary, asFieldColorDatetime, asFieldColorSpatial,
     asFieldColorOther, asFieldEditorBinary, asFieldEditorDatetime, asFieldEditorDatetimePrefill, asFieldEditorEnum,
-    asFieldEditorSet, asFieldNullBackground, asRowBackgroundEven, asRowBackgroundOdd, asGroupTreeObjects, asDisplayObjectSizeColumn, asSQLfile,
+    asFieldEditorSet, asFieldNullBackground, asRowBackgroundEven, asRowBackgroundOdd, asGroupTreeObjects, asTreeShowColumns, asDisplayObjectSizeColumn, asSQLfile,
     asActionShortcut1, asActionShortcut2, asHighlighterForeground, asHighlighterBackground, asHighlighterStyle,
     asListColWidths, asListColsVisible, asListColPositions, asListColSort, asSessionFolder,
     asRecentFilter, asTimestampColumns, asDateTimeEditorCursorPos, asAppLanguage, asAutoExpand, asDoubleClickInsertsNodeText, asForeignDropDown,
@@ -4125,6 +4125,7 @@ constructor TAppSettings.Create;
   InitSetting(asRowBackgroundEven,                'RowBackgroundEven',                     clNone);
   InitSetting(asRowBackgroundOdd,                 'RowBackgroundOdd',                      clNone);
   InitSetting(asGroupTreeObjects,                 'GroupTreeObjects',                      0, False);
+  InitSetting(asTreeShowColumns,                  'TreeShowColumns',                       0, False);
   InitSetting(asDisplayObjectSizeColumn,          'DisplayObjectSizeColumn',               0, True);
   InitSetting(asDisplayLogPanel,                  'DisplayLogPanel',                       0, True);
   InitSetting(asDisplayTreeFilters,               'DisplayTreeFilters',                    0, True);

source/main.dfm

@@ -1927,6 +1927,10 @@ object MainForm: TMainForm
         Action = actDisplayTreeFilters
         AutoCheck = True
       end
+      object menuTreeShowColumns1: TMenuItem
+        Action = actTreeShowColumns
+        AutoCheck = True
+      end
       object N27: TMenuItem
         Caption = '-'
       end
@@ -3464,6 +3468,12 @@ object MainForm: TMainForm
       ImageIndex = 58
       OnExecute = actDataEditWithoutLookupExecute
     end
+    object actTreeShowColumns: TAction
+      Category = 'Various'
+      AutoCheck = True
+      Caption = 'Columns below tables in tree'
+      OnExecute = actTreeShowColumnsExecute
+    end
   end
   object menuConnections: TPopupMenu
     AutoHotkeys = maManual
@@ -3592,6 +3602,10 @@ object MainForm: TMainForm
         Action = actFavoriteObjectsOnly
         AutoCheck = True
       end
+      object menuTreeShowColumns2: TMenuItem
+        Action = actTreeShowColumns
+        AutoCheck = True
+      end
     end
     object menuPrint: TMenuItem
       Action = actPrintList

source/main.pas

@@ -198,12 +198,15 @@   TQueryHistoryItemComparer = class(TComparer<TQueryHistoryItem>)
 
   TMainForm = class(TExtForm)
     actDataEditWithoutLookup: TAction;
+    actTreeShowColumns: TAction;
     MainMenu1: TMainMenu;
     MainMenuFile: TMenuItem;
     FileNewItem: TMenuItem;
     MainMenuHelp: TMenuItem;
     FollowForeignKey: TMenuItem;
     menuDataEditWithoutLookup: TMenuItem;
+    menuTreeShowColumns2: TMenuItem;
+    menuTreeShowColumns1: TMenuItem;
     menuRenameSnippet: TMenuItem;
     N1: TMenuItem;
     FileExitItem: TMenuItem;
@@ -816,6 +819,7 @@   TMainForm = class(TExtForm)
     Copyformattedtext1: TMenuItem;
     procedure actCreateDBObjectExecute(Sender: TObject);
     procedure actDataEditWithoutLookupExecute(Sender: TObject);
+    procedure actTreeShowColumnsExecute(Sender: TObject);
     procedure menuConnectionsPopup(Sender: TObject);
     procedure actExitApplicationExecute(Sender: TObject);
     procedure WMCopyData(var Msg: TWMCopyData); message WM_COPYDATA;
@@ -1874,6 +1878,7 @@ procedure TMainForm.FormDestroy(Sender: TObject);
   AppSettings.WriteInt(asCompletionProposalNbLinesInWindow, SynCompletionProposal.NbLinesInWindow);
   AppSettings.WriteInt(asDbtreewidth, pnlLeft.width);
   AppSettings.WriteBool(asGroupTreeObjects, actGroupObjects.Checked);
+  AppSettings.WriteBool(asTreeShowColumns, actTreeShowColumns.Checked);
   AppSettings.WriteInt(asDataPreviewHeight, pnlPreview.Height);
   AppSettings.WriteBool(asDataPreviewEnabled, actDataPreview.Checked);
   AppSettings.WriteInt(asLogHeight, SynMemoSQLLog.Height);
@@ -2104,6 +2109,7 @@ procedure TMainForm.FormCreate(Sender: TObject);
 
   // Display options, and database tree options
   actGroupObjects.Checked := AppSettings.ReadBool(asGroupTreeObjects);
+  actTreeShowColumns.Checked := AppSettings.ReadBool(asTreeShowColumns);
   actDisplayObjectSize.Checked := AppSettings.ReadBool(asDisplayObjectSizeColumn);
   actDisplayObjectSizeExecute(nil);
   actDisplayLogPanel.Checked := AppSettings.ReadBool(asDisplayLogPanel);
@@ -4558,6 +4564,13 @@ procedure TMainForm.actCreateDBObjectExecute(Sender: TObject);
 end;
 
 
+procedure TMainForm.actTreeShowColumnsExecute(Sender: TObject);
+begin
+  // Show columns in table nodes on tree
+  RefreshTree(nil);
+end;
+
+
 procedure TMainForm.actEmptyTablesExecute(Sender: TObject);
 var
   TableOrView: TDBObject;
@@ -9896,6 +9909,14 @@ procedure TMainForm.DBtreeInitNode(Sender: TBaseVirtualTree; ParentNode, Node:
   Item, ParentObj: PDBObject;
   DBObjects: TDBObjectList;
   Columns: TTableColumnList;
+
+  function TreeShowColumns: Boolean;
+  begin
+    Result := Item.NodeType = lntTable;
+    if Sender = DBtree then // optional in dbtree
+      Result := actTreeShowColumns.Checked;
+  end;
+
 begin
   Item := Sender.GetNodeData(Node);
   if (not Assigned(ParentNode)) or (ParentNode = nil) then begin
@@ -9928,14 +9949,14 @@ procedure TMainForm.DBtreeInitNode(Sender: TBaseVirtualTree; ParentNode, Node:
         end else begin
           DBObjects := ParentObj.Connection.GetDBObjects(ParentObj.Database);
           Item^ := DBObjects[Node.Index];
-          if Item.NodeType = lntTable then
+          if TreeShowColumns then
             Include(InitialStates, ivsHasChildren);
         end;
       end;
       lntGroup: begin
         DBObjects := ParentObj.Connection.GetDBObjects(ParentObj.Database, False, ParentObj.GroupType);
         Item^ := DBObjects[Node.Index];
-        if Item.NodeType = lntTable then
+        if TreeShowColumns then
           Include(InitialStates, ivsHasChildren);
       end;
       lntTable: begin