feat: bypass automatic foreign key lookup in data grid editing through new menu item

Refs #2454

Author: ansgarbecker

extra/locale/heidisql.po

@@ -6842,3 +6842,6 @@ msgstr "Copy formatted text"
 
 msgid "Copies selected text with formatting from current editor to clipboard"
 msgstr "Copies selected text with formatting from current editor to clipboard"
+
+msgid "Edit value without foreign key lookup"
+msgstr "Edit value without foreign key lookup"

source/main.lfm

@@ -5113,6 +5113,12 @@ object MainForm: TMainForm
       ImageIndex = 3
       OnExecute = actCopyFormattedExecute
     end
+    object actDataEditWithoutLookup: TAction
+      Category = 'Data'
+      Caption = 'Edit value without foreign key lookup'
+      ImageIndex = 58
+      OnExecute = actDataEditWithoutLookupExecute
+    end
   end
   object ImageListMain: TImageList
     Scaled = True
@@ -20633,6 +20639,9 @@ object MainForm: TMainForm
         ImageIndex = 28
         OnClick = InsertValue
       end
+      object menuDataEditWithoutLookup: TMenuItem
+        Action = actDataEditWithoutLookup
+      end
       object N11: TMenuItem
         Caption = '-'
       end

source/main.pas

@@ -216,6 +216,7 @@   TQueryHistoryItemComparer = class(TComparer<TQueryHistoryItem>)
 
   TMainForm = class(TExtForm)
     actCopyColumnNames: TAction;
+    actDataEditWithoutLookup: TAction;
     actPreferencesSQL: TAction;
     MainMenu1: TMainMenu;
     MainMenuFile: TMenuItem;
@@ -224,6 +225,7 @@   TMainForm = class(TExtForm)
     FollowForeignKey: TMenuItem;
     menuColorScheme: TMenuItem;
     MenuItem3: TMenuItem;
+    menuDataEditWithoutLookup: TMenuItem;
     menuRenameSnippet: TMenuItem;
     menuSQLpreferences: TMenuItem;
     menuQFdummy: TMenuItem;
@@ -831,6 +833,7 @@   TMainForm = class(TExtForm)
     actCopyFormatted: TAction;
     Copyformattedtext1: TMenuItem;
     procedure actCreateDBObjectExecute(Sender: TObject);
+    procedure actDataEditWithoutLookupExecute(Sender: TObject);
     procedure actNextTabExecute(Sender: TObject);
     procedure actPreviousTabExecute(Sender: TObject);
     procedure DataGridContextPopup(Sender: TObject; MousePos: TPoint;
@@ -1281,6 +1284,7 @@   TMainForm = class(TExtForm)
     FCreateDatabaseDialog: TCreateDatabaseForm;
     FTableToolsDialog: TfrmTableTools;
     FGridEditFunctionMode: Boolean;
+    FDataEditWithoutLookup: Boolean;
     FClipboardHasNull: Boolean;
     FTimeZoneOffset: Integer;
     FGridCopying: Boolean;
@@ -1705,6 +1709,11 @@ procedure TMainForm.actGridEditFunctionExecute(Sender: TObject);
   ActiveGrid.EditNode(ActiveGrid.FocusedNode, ActiveGrid.FocusedColumn);
 end;
 
+procedure TMainForm.actDataEditWithoutLookupExecute(Sender: TObject);
+begin
+  FDataEditWithoutLookup := True;
+  DataGrid.EditNode(DataGrid.FocusedNode, DataGrid.FocusedColumn);
+end;
 
 procedure TMainForm.StoreLastSessions;
 var
@@ -5918,7 +5927,7 @@ procedure TMainForm.DataGridBeforePaint(Sender: TBaseVirtualTree; TargetCanvas:
     col := vt.Header.Columns.Add;
     col.Text := TblCol.Name;
     col.Hint := TblCol.Comment;
-    col.Options := col.Options + [coSmartResize];
+    col.Options := col.Options + [coSmartResize, coEditable];
     if DatagridHiddenColumns.IndexOf(TblCol.Name) > -1 then
       col.Options := col.Options - [coVisible];
     // Column header icon
@@ -6602,6 +6611,7 @@ procedure TMainForm.ValidateControls(Sender: TObject);
   actDataCancelChanges.Enabled := HasConnection and GridHasChanges;
   actDataSaveBlobToFile.Enabled := HasConnection and inDataOrQueryTabNotEmpty and Assigned(Grid.FocusedNode);
   actGridEditFunction.Enabled := HasConnection and inDataOrQueryTabNotEmpty and Assigned(Grid.FocusedNode);
+  actDataEditWithoutLookup.Enabled := HasConnection and inDataTab;
   actDataPreview.Enabled := HasConnection and inDataOrQueryTabNotEmpty and Assigned(Grid.FocusedNode);
   actDataOpenUrl.Enabled := (Length(CellText)<SIZE_MB) and ExecRegExpr('^(https?://[^\s]+|www\.\w\S+)$', CellText);
   actUnixTimestampColumn.Enabled := HasConnection and inDataTab and EnableTimestamp;
@@ -7982,6 +7992,7 @@ procedure TMainForm.popupDataGridPopup(Sender: TObject);
 begin
   // Manipulate quick filter menuitems
   Grid := ActiveGrid;
+  FLastMouseButtonUpOnGrid := mbLeft;
   // Make sure ValidateControls detects the grid as focused, which is not the case when
   // it has 0 nodes, even with TreeOptions.SelectionOptions.RightclickSelect enabled
   Grid.SetFocus;
@@ -10710,7 +10721,6 @@ procedure TMainForm.AnyGridNewText(Sender: TBaseVirtualTree; Node: PVirtualNode;
     on E:Exception do
       ErrorDialog(E.Message);
   end;
-  FGridEditFunctionMode := False;
   ValidateControls(Sender);
 end;
 
@@ -10757,6 +10767,9 @@ procedure TMainForm.AnyGridFocusChanged(Sender: TBaseVirtualTree; Node: PVirtual
   Sender.ScrollIntoView(Sender.FocusedNode, False, True);
   // Required for highlighting fields with same text
   Sender.Invalidate;
+  // Reset flags when moving focus
+  FGridEditFunctionMode := False;
+  FDataEditWithoutLookup := False;
 end;
 
 
@@ -10837,7 +10850,6 @@ procedure TMainForm.AnyGridEdited(Sender: TBaseVirtualTree; Node:
   if ([tsEditing, tsEditPending] * Sender.TreeStates) = [] then begin
     actDataCancelChanges.ShortCut := KeyToShortCut(VK_ESCAPE, []);
     actDataPostChanges.ShortCut := KeyToShortCut(VK_RETURN, [ssCtrl]);
-    FGridEditFunctionMode := False;
   end;
 end;
 
@@ -10875,6 +10887,7 @@ procedure TMainForm.AnyGridCreateEditor(Sender: TBaseVirtualTree; Node:
   ResultCol: Integer;
 begin
   VT := Sender as TVirtualStringTree;
+  EditLink := nil;
   Results := GridResult(VT);
   RowNum := VT.GetNodeData(Node);
   Results.RecNo := RowNum^;
@@ -10885,7 +10898,7 @@ procedure TMainForm.AnyGridCreateEditor(Sender: TBaseVirtualTree; Node:
   TblColumn := Results.ColAttributes(ResultCol);
 
   // Find foreign key values
-  if AppSettings.ReadBool(asForeignDropDown) and (Sender = DataGrid) then begin
+  if AppSettings.ReadBool(asForeignDropDown) and (Sender = DataGrid) and (not FDataEditWithoutLookup) then begin
     for ForeignKey in SelectedTableForeignKeys do begin
       idx := ForeignKey.Columns.IndexOf(DataGrid.Header.Columns[Column].Text);
       if idx > -1 then try