From ee16571c11390916ae6b693122edecda2d78c687 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 11 Mar 2026 08:55:55 +0100
Subject: [PATCH 01/45] fix: crash after canceling query

Refs #2426
---
 source/dbconnection.pas | 6 +++++-
 source/main.pas         | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 88fdccbbd..94bc1f08e 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -426,6 +426,7 @@   TDBConnection = class(TComponent)
       FServerUptime: Integer;
       FServerDateTimeOnStartup: String;
       FParameters: TConnectionParameters;
+      FOwnsParameters: Boolean;
       FSecureShellCmd: TSecureShellCmd;
       FDatabase: String;
       FAllDatabases: TStringList;
@@ -552,6 +553,7 @@   TDBConnection = class(TComponent)
       function ApplyLimitClause(QueryType, QueryBody: String; Limit, Offset: Int64): String;
       function LikeClauseTail: String;
       property Parameters: TConnectionParameters read FParameters write FParameters;
+      property OwnsParameters: Boolean read FOwnsParameters write FOwnsParameters;
       property ThreadId: Int64 read GetThreadId;
       property ConnectionUptime: Int64 read GetConnectionUptime;
       property ServerUptime: Int64 read GetServerUptime;
@@ -2017,6 +2019,7 @@ constructor TDBConnection.Create(AOwner: TComponent);
 begin
   inherited;
   FParameters := TConnectionParameters.Create;
+  FOwnsParameters := True;
   FRowsFound := 0;
   FRowsAffected := 0;
   FWarningCount := 0;
@@ -2138,7 +2141,8 @@ destructor TDBConnection.Destroy;
   FKeepAliveTimer.Free;
   FFavorites.Free;
   FInformationSchemaObjects.Free;
-  FParameters.Free;
+  if FOwnsParameters then
+    FParameters.Free;
   inherited;
 end;
 
diff --git a/source/main.pas b/source/main.pas
index de2f7158a..67aaf4c8a 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -13797,6 +13797,7 @@ procedure TMainForm.actCancelOperationExecute(Sender: TObject);
       Tab.ExecutionThread.Aborted := True;
       Killer := ActiveConnection.Parameters.CreateConnection(Self);
       Killer.Parameters := ActiveConnection.Parameters;
+      Killer.OwnsParameters := False;
       Killer.LogPrefix := _('Helper connection');
       Killer.OnLog := LogSQL;
       try

From 950e2ca28a9661e6a90d577d4396c4a0c607a66e Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 11 Mar 2026 11:52:29 +0100
Subject: [PATCH 02/45] feat: allow setting database to <none> in PostgreSQL
 connections, and show <none> and <default> in the pulldown selector

Refs #2424
---
 source/connections.pas  | 40 ++++++++++++++++++++++++++++++++--------
 source/dbconnection.pas | 10 ++++++++--
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/source/connections.pas b/source/connections.pas
index d02177da2..93dd882d2 100644
--- a/source/connections.pas
+++ b/source/connections.pas
@@ -1304,7 +1304,7 @@ procedure Tconnform.editDatabasesRightButtonClick(Sender: TObject);
     // Try to connect and lookup database names
     Params := CurrentParams;
     Connection := Params.CreateConnection(Self);
-    Connection.Parameters.AllDatabasesStr := '';
+    Connection.Parameters.AllDatabasesStr := TPgConnection.DBNAME_EMPTY;
     Connection.LogPrefix := SelectedSessionPath;
     Connection.OnLog := Mainform.LogSQL;
     FPopupDatabases := TPopupMenu.Create(Self);
@@ -1312,16 +1312,29 @@ procedure Tconnform.editDatabasesRightButtonClick(Sender: TObject);
     Screen.Cursor := crHourglass;
     try
       Connection.Active := True;
-      if Params.NetTypeGroup = ngPgSQL then
-        Databases := Connection.GetCol('SELECT datname FROM pg_database WHERE datistemplate=FALSE')
-      else
+      if Params.IsAnyPostgreSQL then begin
+        Databases := Connection.GetCol('SELECT datname FROM pg_database WHERE datistemplate=FALSE');
+        Item := TMenuItem.Create(FPopupDatabases);
+        Item.Caption := TPgConnection.DBNAME_EMPTY + ' (' + _('No database') + ')';
+        Item.Tag := TPgConnection.DBTAG_EMPTY;
+        Item.OnClick := MenuDatabasesClick;
+        Item.AutoCheck := True;
+        Item.RadioItem := True;
+        FPopupDatabases.Items.Add(Item);
+      end
+      else begin
         Databases := Connection.AllDatabases;
+      end;
       for DB in Databases do begin
         Item := TMenuItem.Create(FPopupDatabases);
         Item.Caption := DB;
+        if Params.IsAnyPostgreSQL and (DB = TPgConnection.DBNAME_DEFAULT) then begin
+          Item.Caption := Item.Caption + ' (' + _('Default') + ')';
+          Item.Tag := TPgConnection.DBTAG_DEFAULT;
+        end;
         Item.OnClick := MenuDatabasesClick;
         Item.AutoCheck := True;
-        Item.RadioItem := Params.NetTypeGroup = ngPgSQL;
+        Item.RadioItem := Params.IsAnyPostgreSQL;
         FPopupDatabases.Items.Add(Item);
       end;
       Databases.Free;
@@ -1334,7 +1347,14 @@ procedure Tconnform.editDatabasesRightButtonClick(Sender: TObject);
   // Check/uncheck items, based on semicolon list
   Databases := Explode(';', editDatabases.Text);
   for Item in FPopupDatabases.Items do begin
-    Item.Checked := Databases.IndexOf(Item.Caption) > -1;
+    case Item.Tag of
+      TPgConnection.DBTAG_EMPTY:
+        Item.Checked := Databases.Contains(TPgConnection.DBNAME_EMPTY);
+      TPgConnection.DBTAG_DEFAULT:
+        Item.Checked := Databases.Contains(TPgConnection.DBNAME_DEFAULT) or Databases.IsEmpty;
+      else
+        Item.Checked := Databases.IndexOf(Item.Caption) > -1;
+    end;
   end;
   Databases.Free;
 
@@ -1351,8 +1371,12 @@ procedure Tconnform.MenuDatabasesClick(Sender: TObject);
 begin
   Databases := TStringList.Create;
   for Item in FPopupDatabases.Items do begin
-    if Item.Checked then
-      Databases.Add(Item.Caption);
+    if Item.Checked then begin
+      if Item.Tag in [TPgConnection.DBTAG_EMPTY, TPgConnection.DBTAG_DEFAULT] then // Remove hint
+        Databases.Add(ReplaceRegExpr('\s\(.+$', Item.Caption, ''))
+      else
+        Databases.Add(Item.Caption);
+    end;
   end;
   SelStart := editDatabases.SelStart;
   editDatabases.Text := Implode(';', Databases);
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 94bc1f08e..e4964c46f 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -690,6 +690,11 @@   TSqlSrvConnection = class(TDBConnection)
   TPGRawResults = Array of PPGresult;
   TPQerrorfields = (PG_DIAG_SEVERITY, PG_DIAG_SQLSTATE, PG_DIAG_MESSAGE_PRIMARY, PG_DIAG_MESSAGE_DETAIL, PG_DIAG_MESSAGE_HINT, PG_DIAG_STATEMENT_POSITION, PG_DIAG_INTERNAL_POSITION, PG_DIAG_INTERNAL_QUERY, PG_DIAG_CONTEXT, PG_DIAG_SOURCE_FILE, PG_DIAG_SOURCE_LINE, PG_DIAG_SOURCE_FUNCTION);
   TPgConnection = class(TDBConnection)
+    const
+      DBNAME_DEFAULT = 'postgres';
+      DBNAME_EMPTY = '!';
+      DBTAG_EMPTY = 1;
+      DBTAG_DEFAULT = 2;
     private
       FHandle: PPGconn;
       FLib: TPostgreSQLLib;
@@ -2740,7 +2745,7 @@ procedure TPgConnection.SetActive(Value: Boolean);
     // "You should connect as "postgres" database by default, with an option to change. Don't use template1"
     dbname := FParameters.AllDatabasesStr;
     if dbname = '' then
-      dbname := 'postgres';
+      dbname := DBNAME_DEFAULT;
 
     // Prepare special stuff for SSH tunnel
     FinalHost := FParameters.Hostname;
@@ -2756,9 +2761,10 @@ procedure TPgConnection.SetActive(Value: Boolean);
       .AddPair('port', IntToStr(FinalPort))
       .AddPair('user', FParameters.Username)
       .AddPair('password', FParameters.Password)
-      .AddPair('dbname', dbname)
       .AddPair('application_name', APPNAME)
       .AddPair('sslmode', 'disable');
+    if dbname <> DBNAME_EMPTY then
+      ConnectOptions.AddPair('dbname', dbname);
     if FParameters.WantSSL then begin
       // Be aware .AddPair would add duplicates
       case FParameters.SSLVerification of

From dc046e9cda46c7d22f3423429656106e28cb7328 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 11 Mar 2026 15:14:45 +0100
Subject: [PATCH 03/45] feat: make HTML export dark/light mode aware

Refs #2418
---
 source/exportgrid.pas | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/exportgrid.pas b/source/exportgrid.pas
index 40ffc24aa..1105a5ef8 100644
--- a/source/exportgrid.pas
+++ b/source/exportgrid.pas
@@ -724,15 +724,15 @@ procedure TfrmExportGrid.btnOKClick(Sender: TObject);
           CodeIndent(2) + '<title>' + TableName + '</title>' + sLineBreak +
           CodeIndent(2) + '<meta name="GENERATOR" content="'+ APPNAME+' '+Mainform.AppVersion + '">' + sLineBreak +
           CodeIndent(2) + '<meta http-equiv="Content-Type" content="text/html; charset='+GetHTMLCharsetByEncoding(Encoding)+'" />' + sLineBreak +
+          CodeIndent(2) + '<meta name="color-scheme" content="light dark">' + sLineBreak +
           CodeIndent(2) + '<style type="text/css">' + sLineBreak +
-          CodeIndent(3) + 'th, td {vertical-align: top;}' + sLineBreak +
-          CodeIndent(3) + 'table, td {border: 1px solid silver; padding: 2px;}' + sLineBreak +
-          CodeIndent(3) + 'table {border-collapse: collapse;}' + sLineBreak;
+          CodeIndent(3) + 'th, td { vertical-align:top; border:1px solid currentColor; padding:0.25rem 0.5rem; }' + sLineBreak +
+          CodeIndent(3) + 'table { border-collapse:collapse; }' + sLineBreak;
         Col := Grid.Header.Columns.GetFirstVisibleColumn(True);
         while Col > NoColumn do begin
           // Right-justify all cells to match the grid on screen.
           if Grid.Header.Columns[Col].Alignment = taRightJustify then
-            Header := Header + CodeIndent(3) + '.col' + IntToStr(Col) + ' {text-align: right;}' + sLineBreak;
+            Header := Header + CodeIndent(3) + '.col' + IntToStr(Col) + ' { text-align:right; }' + sLineBreak;
           Col := Grid.Header.Columns.GetNextVisibleColumn(Col);
         end;
         Header := Header +
@@ -740,7 +740,7 @@ procedure TfrmExportGrid.btnOKClick(Sender: TObject);
           CodeIndent + '</head>' + sLineBreak + sLineBreak +
           CodeIndent + '<body>' + sLineBreak + sLineBreak;
         if chkIncludeQuery.Checked then
-          Header := Header + '<p style="font-family: monospace; white-space: pre;">' + GridData.SQL + '</p>' + CRLF + CRLF;
+          Header := Header + '<p style="font-family:monospace; white-space:pre;">' + GridData.SQL + '</p>' + CRLF + CRLF;
         Header := Header + CodeIndent(2) + '<table caption="' + TableName + ' (' + inttostr(NodeCount) + ' rows)">' + sLineBreak;
         if chkIncludeColumnNames.Checked then begin
           Header := Header +

From f5c5f335304e55b07a1f16c64b64819158f2e050 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 11 Mar 2026 15:47:05 +0100
Subject: [PATCH 04/45] fix: do not delete selected SQL text from editor when
 trying to focus the position of erroneous SQL

See https://www.heidisql.com/forum.php?t=44494
---
 source/main.pas | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index 67aaf4c8a..5c752f9d7 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -3377,9 +3377,10 @@ procedure TMainForm.FinishedQueryExecution(Thread: TQueryThread);
       ErrorPos := Pos(ErroneousSQL, Copy(Tab.Memo.Text, SelStart, SIZE_MB));
       if ErrorPos > 0 then begin
         Inc(SelStart, ErrorPos-1);
-        Tab.Memo.ClearSelection;
-        Tab.Memo.SelStart := SelStart;
         ErrorCoord := Tab.Memo.CharIndexToRowCol(SelStart);
+        Tab.Memo.CaretXY := ErrorCoord;
+        Tab.Memo.BlockBegin := ErrorCoord;
+        Tab.Memo.BlockEnd := ErrorCoord;
         Tab.ErrorLine := ErrorCoord.Y;
       end;
     end;

From 90f99374262c485b61cb54f7cc4a025fc0ffe6c5 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 11 Mar 2026 17:09:21 +0100
Subject: [PATCH 05/45] feat: keep EXPLAIN output format traditional, on newer
 MySQL servers

Refs #2423
---
 source/dbstructures.mysql.pas |  5 +++++
 source/dbstructures.pas       |  2 +-
 source/main.pas               | 18 +++++++++++-------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/source/dbstructures.mysql.pas b/source/dbstructures.mysql.pas
index 5a0bcd62c..100a8e094 100644
--- a/source/dbstructures.mysql.pas
+++ b/source/dbstructures.mysql.pas
@@ -3346,6 +3346,11 @@ function TMySqlProvider.GetSql(AId: TQueryId): string;
       ' WHERE'+
       '   REFERENCED_TABLE_SCHEMA = :EscapedDatabase AND'+
       '   REFERENCED_TABLE_NAME = :EscapedName';
+    qExplain: Result := IfThen(
+      (FServerVersion >= 80400) and (FServerVersion < 100000), // Not MariaDB
+      'EXPLAIN FORMAT=TRADITIONAL %s',
+      'EXPLAIN %s'
+    );
     else Result := inherited;
   end;
 end;
diff --git a/source/dbstructures.pas b/source/dbstructures.pas
index 6a62375f8..72d2b84bb 100644
--- a/source/dbstructures.pas
+++ b/source/dbstructures.pas
@@ -46,7 +46,7 @@ interface
     qLockedTables, qDisableForeignKeyChecks, qEnableForeignKeyChecks,
     qOrderAsc, qOrderDesc, qGetRowCountExact, qGetRowCountApprox,
     qForeignKeyDrop, qGetTableColumns, qGetCollations, qGetCollationsExtended, qGetCharsets,
-    qGetReverseForeignKeys);
+    qGetReverseForeignKeys, qExplain);
   TSqlProvider = class
     strict protected
       FNetType: TNetType;
diff --git a/source/main.pas b/source/main.pas
index 5c752f9d7..0eb9f9a7d 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -3145,6 +3145,7 @@ function TMainForm.GetCurrentQuery(Tab: TQueryTab): String;
 procedure TMainForm.actExecuteQueryExecute(Sender: TObject);
 var
   ProfileNode: PVirtualNode;
+  Conn: TDBConnection;
   Batch: TSQLBatch;
   Tab: TQueryTab;
   BindParam: Integer;
@@ -3154,11 +3155,12 @@ procedure TMainForm.actExecuteQueryExecute(Sender: TObject);
   ContainsUnsafeQueries, DoExecute: Boolean;
 begin
   Tab := QueryTabs.ActiveTab;
+  Conn := ActiveConnection;
   OperationRunning(True);
   DoExecute := True;
 
   ShowStatusMsg(_('Splitting SQL queries ...'));
-  Batch := TSQLBatch.Create(ActiveConnection.Parameters.NetTypeGroup);
+  Batch := TSQLBatch.Create(Conn.Parameters.NetTypeGroup);
   if Sender = actExecuteSelection then begin
     Batch.SQL := Tab.Memo.SelText;
     Tab.LeftOffsetInMemo := Tab.Memo.SelStart;
@@ -3170,7 +3172,7 @@ procedure TMainForm.actExecuteQueryExecute(Sender: TObject);
       ErrorDialog(_('Current query is empty'), _('Please move the cursor inside the query you want to use.'));
       DoExecute := False;
     end else begin
-      Batch.SQL := 'EXPLAIN ' + CurrentQuery;
+      Batch.SQL := Conn.SqlProvider.GetSql(qExplain, [CurrentQuery]);
     end;
   end else begin
     Batch.SQL := Tab.Memo.Text;
@@ -3226,7 +3228,7 @@ procedure TMainForm.actExecuteQueryExecute(Sender: TObject);
     ProfileNode := FindNode(Tab.treeHelpers, TQueryTab.HelperNodeProfile, nil);
     Tab.DoProfile := Assigned(ProfileNode) and (Tab.treeHelpers.CheckState[ProfileNode] in CheckedStates);
     if Tab.DoProfile then try
-      ActiveConnection.Query('SET profiling=1');
+      Conn.Query('SET profiling=1');
     except
       on E:EDbError do begin
         ErrorDialog(f_('Query profiling requires %s or later, and the server must not be configured with %s.', ['MySQL 5.0.37', '--disable-profiling']), E.Message);
@@ -3236,9 +3238,9 @@ procedure TMainForm.actExecuteQueryExecute(Sender: TObject);
 
     // Start the execution thread
     Screen.Cursor := crAppStart;
-    ActiveConnection.Ping(True); // Prevents SynEdit paint exceptions if connection was killed outside
+    Conn.Ping(True); // Prevents SynEdit paint exceptions if connection was killed outside
     Tab.QueryRunning := True;
-    Tab.ExecutionThread := TQueryThread.Create(ActiveConnection, Batch, Tab.Number);
+    Tab.ExecutionThread := TQueryThread.Create(Conn, Batch, Tab.Number);
   end;
 
   ValidateQueryControls(Sender);
@@ -13713,15 +13715,17 @@ procedure TMainForm.lblExplainProcessClick(Sender: TObject);
 var
   Tab: TQueryTab;
   UsedDatabase: String;
+  Conn: TDBConnection;
 begin
   // Click on "Explain" link label, in process viewer
+  Conn := ActiveConnection;
   actNewQueryTabExecute(Sender);
   Tab := QueryTabs[QueryTabs.Count-1];
   UsedDatabase := listProcesses.Text[listProcesses.FocusedNode, 3];
   if not UsedDatabase.IsEmpty then begin
-    Tab.Memo.Lines.Add('USE ' + ActiveConnection.QuoteIdent(UsedDatabase) + ';');
+    Tab.Memo.Lines.Add('USE ' + Conn.QuoteIdent(UsedDatabase) + ';');
   end;
-  Tab.Memo.Lines.Add('EXPLAIN' + sLineBreak + SynMemoProcessView.Text + ';');
+  Tab.Memo.Lines.Add(Conn.SqlProvider.GetSql(qExplain, [SynMemoProcessView.Text]) + ';');
   Tab.TabSheet.Show;
   actExecuteQueryExecute(Sender);
 end;

From 9f21853299153e3803927492d4ebb872761f32d0 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Thu, 12 Mar 2026 20:42:36 +0100
Subject: [PATCH 06/45] refactor: convert more TFeatureOrRequirement's to
 TQueryId

---
 source/dbconnection.pas       | 83 ++++++++++++++++++-----------------
 source/dbstructures.mysql.pas | 44 ++++++++++++++++++-
 source/dbstructures.pas       |  4 +-
 source/main.pas               |  4 +-
 source/sqlhelp.pas            | 10 ++---
 5 files changed, 94 insertions(+), 51 deletions(-)

diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index e4964c46f..f0783fc83 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -412,12 +412,20 @@   TDBLogItem = class(TObject)
   TDBLogEvent = procedure(Msg: String; Category: TDBLogCategory=lcInfo; Connection: TDBConnection=nil) of object;
   TDBEvent = procedure(Connection: TDBConnection; Database: String) of object;
   TDBDataTypeArray = Array of TDBDataType;
-  TFeatureOrRequirement = (frSrid, frTimezoneVar, frTemporalTypesFraction,
-    frShowCreateTrigger, frShowWarnings,
-    frIntegerDisplayWidth, frShowFunctionStatus, frShowProcedureStatus,
-    frShowTriggers, frShowEvents, frColumnDefaultParentheses,
-    frHelpKeyword, frEditVariables, frCreateView, frCreateProcedure, frCreateFunction,
-    frCreateTrigger, frCreateEvent, frInvisibleColumns, frCompressedColumns);
+  TFeatureOrRequirement = (
+    frSrid,
+    frTemporalTypesFraction,
+    frIntegerDisplayWidth,
+    frColumnDefaultParentheses,
+    frEditVariables,
+    frCreateView,
+    frCreateProcedure,
+    frCreateFunction,
+    frCreateTrigger,
+    frCreateEvent,
+    frInvisibleColumns,
+    frCompressedColumns
+    );
 
   TDBConnection = class(TComponent)
     private
@@ -3260,6 +3268,8 @@ procedure TDBConnection.DoAfterConnect;
   StartupScript: String;
   StartupBatch: TSQLBatch;
   SqlQuery: TSQLSentence;
+  Minutes, Hours: Integer;
+  Offset: String;
 begin
   FSqlProvider.ServerVersion := ServerVersionInt;
   AppSettings.SessionPath := FParameters.SessionPath;
@@ -3294,6 +3304,19 @@ procedure TDBConnection.DoAfterConnect;
     SQLFunctionsFileOrder := '';
   FSQLFunctions := TSQLFunctionList.Create(Self, SQLFunctionsFileOrder);
 
+  // Set timezone offset to UTC
+  if FSqlProvider.Has(qSetTimezone) and Parameters.LocalTimeZone then begin
+    Minutes := GetLocalTimeOffset;
+    Hours := Minutes div 60;
+    Minutes := Minutes mod 60;
+    if Hours < 0 then
+      Offset := '+'
+    else
+      Offset := '-';
+    Offset := Offset + Format('%.2d:%.2d', [Abs(Hours), Abs(Minutes)]);
+    Query(FSqlProvider.GetSql(qSetTimezone, [EscapeString(Offset)]));
+  end;
+
   // Process startup script
   StartupScript := Trim(FParameters.StartupScriptFilename);
   if StartupScript <> '' then begin
@@ -3316,25 +3339,11 @@ procedure TDBConnection.DoAfterConnect;
 
 procedure TMySQLConnection.DoAfterConnect;
 var
-  Minutes, Hours, i: Integer;
-  Offset: String;
   ObjNames: TStringList;
+  i: Integer;
 begin
   inherited;
 
-  // Set timezone offset to UTC
-  if Has(frTimezoneVar) and Parameters.LocalTimeZone then begin
-    Minutes := GetLocalTimeOffset;
-    Hours := Minutes div 60;
-    Minutes := Minutes mod 60;
-    if Hours < 0 then
-      Offset := '+'
-    else
-      Offset := '-';
-    Offset := Offset + Format('%.2d:%.2d', [Abs(Hours), Abs(Minutes)]);
-    Query('SET time_zone='+EscapeString(Offset));
-  end;
-
   // Support microseconds in some temporal datatypes of MariaDB 5.3+ and MySQL 5.6
   if Has(frTemporalTypesFraction) then begin
     for i:=Low(FDatatypes) to High(FDatatypes) do begin
@@ -4201,7 +4210,7 @@ procedure TDBConnection.PrefetchCreateCode(Objects: TDBObjectList);
         // SHOW CREATE TRIGGER was introduced in MySQL 5.1.21
         // See #111
         if Obj.NodeType = lntTrigger then
-          UseIt := UseIt and Has(frShowCreateTrigger);
+          UseIt := UseIt and FSqlProvider.Has(qShowCreateTrigger);
         if UseIt then
           Queries.Add('SHOW CREATE '+UpperCase(Obj.ObjType)+' '+QuoteIdent(Obj.Database)+'.'+QuoteIdent(Obj.Name));
       end;
@@ -4620,8 +4629,8 @@ procedure TMySQLConnection.ShowWarnings;
 begin
   // Log warnings
   // SHOW WARNINGS is implemented as of MySQL 4.1.0
-  if (WarningCount > 0) and Has(frShowWarnings) then begin
-    Warnings := GetResults('SHOW WARNINGS');
+  if (WarningCount > 0) and FSqlProvider.Has(qShowWarnings) then begin
+    Warnings := GetResults(FSqlProvider.GetSql(qShowWarnings));
     while not Warnings.Eof do begin
       Log(lcError, _(Warnings.Col('Level')) + ': ('+Warnings.Col('Code')+') ' + Warnings.Col('Message'));
       Warnings.Next;
@@ -6505,19 +6514,11 @@ function TDBConnection.Has(Item: TFeatureOrRequirement): Boolean;
     ngMySQL:
       case Item of
         frSrid: Result := FParameters.IsMySQL(True) and (ServerVersionInt >= 80000);
-        frTimezoneVar: Result := ServerVersionInt >= 40103;
         frTemporalTypesFraction: Result := (FParameters.IsMariaDB and (ServerVersionInt >= 50300)) or
           (FParameters.IsMySQL(True) and (ServerVersionInt >= 50604));
-        frShowCreateTrigger: Result := ServerVersionInt >= 50121;
-        frShowWarnings: Result := ServerVersionInt >= 40100;
         frIntegerDisplayWidth: Result := (FParameters.IsMySQL(True) and (ServerVersionInt < 80017)) or
           (not FParameters.IsMySQL(True));
-        frShowFunctionStatus: Result := (not Parameters.IsProxySQLAdmin) and (ServerVersionInt >= 50000);
-        frShowProcedureStatus: Result := (not FParameters.IsProxySQLAdmin) and (ServerVersionInt >= 50000);
-        frShowTriggers: Result := (not FParameters.IsProxySQLAdmin) and (ServerVersionInt >= 50010);
-        frShowEvents: Result := (not Parameters.IsProxySQLAdmin) and (ServerVersionInt >= 50100);
         frColumnDefaultParentheses: Result := FParameters.IsMySQL(True) and (ServerVersionInt >= 80013);
-        frHelpKeyword: Result := (not FParameters.IsProxySQLAdmin) and (ServerVersionInt >= 40100);
         frEditVariables: Result := ServerVersionInt >= 40003;
         frCreateView: Result := ServerVersionInt >= 50001;
         frCreateProcedure: Result := ServerVersionInt >= 50003;
@@ -6979,8 +6980,8 @@ procedure TMySQLConnection.FetchDbObjects(db: String; var Cache: TDBObjectList);
   end;
 
   // Stored functions
-  if Has(frShowFunctionStatus) then try
-    Results := GetResults('SHOW FUNCTION STATUS WHERE '+QuoteIdent('Db')+'='+EscapeString(db));
+  if FSqlProvider.Has(qShowFunctionStatus) then try
+    Results := GetResults(FSqlProvider.GetSql(qShowFunctionStatus, [EscapeString(db)]));
   except
     on E:EDbError do;
   end;
@@ -7000,8 +7001,8 @@ procedure TMySQLConnection.FetchDbObjects(db: String; var Cache: TDBObjectList);
   end;
 
   // Stored procedures
-  if Has(frShowProcedureStatus) then try
-    Results := GetResults('SHOW PROCEDURE STATUS WHERE '+QuoteIdent('Db')+'='+EscapeString(db));
+  if FSqlProvider.Has(qShowProcedureStatus) then try
+    Results := GetResults(FSqlProvider.GetSql(qShowProcedureStatus, [EscapeString(db)]));
   except
     on E:EDbError do;
   end;
@@ -7021,8 +7022,8 @@ procedure TMySQLConnection.FetchDbObjects(db: String; var Cache: TDBObjectList);
   end;
 
   // Triggers
-  if Has(frShowTriggers) then try
-    Results := GetResults('SHOW TRIGGERS FROM '+QuoteIdent(db));
+  if FSqlProvider.Has(qShowTriggers) then try
+    Results := GetResults(FSqlProvider.GetSql(qShowTriggers, [QuoteIdent(db)]));
   except
     on E:EDbError do;
   end;
@@ -7041,9 +7042,8 @@ procedure TMySQLConnection.FetchDbObjects(db: String; var Cache: TDBObjectList);
   end;
 
   // Events
-  if Has(frShowEvents) then try
-    Results := GetResults('SELECT *, EVENT_SCHEMA AS '+QuoteIdent('Db')+', EVENT_NAME AS '+QuoteIdent('Name')+
-      ' FROM '+InfSch+'.'+QuoteIdent('EVENTS')+' WHERE '+QuoteIdent('EVENT_SCHEMA')+'='+EscapeString(db))
+  if FSqlProvider.Has(qShowEvents) then try
+    Results := GetResults(FSqlProvider.GetSql(qShowEvents, [EscapeString(db)]));
   except
     on E:EDbError do begin
       try
@@ -10432,6 +10432,7 @@ function TDBObject.AsStringMap: TStringMap;
   FMap.Add('QuotedDatabase', QuotedDatabase);
   FMap.Add('QuotedName', QuotedName);
   FMap.Add('QuotedDbAndTableName', QuotedDbAndTableName);
+  FMap.Add('ObjType', UpperCase(ObjType));
   Result := FMap;
 end;
 
diff --git a/source/dbstructures.mysql.pas b/source/dbstructures.mysql.pas
index 100a8e094..cae88f4c7 100644
--- a/source/dbstructures.mysql.pas
+++ b/source/dbstructures.mysql.pas
@@ -3326,7 +3326,7 @@ function TMySqlProvider.GetSql(AId: TQueryId): string;
         ', ID AS `Id`'+
         ', IS_DEFAULT AS `Default`'+
         ', 0 AS `Sortlen`'+
-        ' FROM information_schema.COLLATION_CHARACTER_SET_APPLICABILITY'+
+        ' FROM INFORMATION_SCHEMA.COLLATION_CHARACTER_SET_APPLICABILITY'+
         ' ORDER BY `Collation`',
       ''
       );
@@ -3350,7 +3350,47 @@ function TMySqlProvider.GetSql(AId: TQueryId): string;
       (FServerVersion >= 80400) and (FServerVersion < 100000), // Not MariaDB
       'EXPLAIN FORMAT=TRADITIONAL %s',
       'EXPLAIN %s'
-    );
+      );
+    qSetTimezone: Result := IfThen(
+      FServerVersion >= 40103,
+      'SET time_zone=%s',
+      ''
+      );
+    qShowFunctionStatus: Result := IfThen(
+      (FServerVersion >= 50000) and (FNetType <> ntMySQL_ProxySQLAdmin),
+      'SHOW FUNCTION STATUS WHERE Db = %s',
+      ''
+      );
+    qShowProcedureStatus: Result := IfThen(
+      (FServerVersion >= 50000) and (FNetType <> ntMySQL_ProxySQLAdmin),
+      'SHOW PROCEDURE STATUS WHERE Db = %s',
+      ''
+      );
+    qShowTriggers: Result := IfThen(
+      (FServerVersion >= 50010) and (FNetType <> ntMySQL_ProxySQLAdmin),
+      'SHOW TRIGGERS FROM %s',
+      ''
+      );
+    qShowEvents: Result := IfThen(
+      (FServerVersion >= 50010) and (FNetType <> ntMySQL_ProxySQLAdmin),
+      'SELECT *, EVENT_SCHEMA AS `Db`, EVENT_NAME AS `Name` FROM INFORMATION_SCHEMA.`EVENTS` WHERE EVENT_SCHEMA=%s',
+      ''
+      );
+    qHelpKeyword: Result := IfThen(
+      (FServerVersion >= 40100) and (FNetType <> ntMySQL_ProxySQLAdmin),
+      'HELP %s',
+      ''
+      );
+    qShowCreateTrigger: Result := IfThen(
+      FServerVersion >= 50121,
+      'SHOW CREATE TRIGGER :QuotedDatabase.:QuotedName',
+      ''
+      );
+    qShowWarnings: Result := IfThen(
+      FServerVersion >= 40100,
+      'SHOW WARNINGS',
+      ''
+      );
     else Result := inherited;
   end;
 end;
diff --git a/source/dbstructures.pas b/source/dbstructures.pas
index 72d2b84bb..e0734c3ee 100644
--- a/source/dbstructures.pas
+++ b/source/dbstructures.pas
@@ -46,7 +46,9 @@ interface
     qLockedTables, qDisableForeignKeyChecks, qEnableForeignKeyChecks,
     qOrderAsc, qOrderDesc, qGetRowCountExact, qGetRowCountApprox,
     qForeignKeyDrop, qGetTableColumns, qGetCollations, qGetCollationsExtended, qGetCharsets,
-    qGetReverseForeignKeys, qExplain);
+    qGetReverseForeignKeys, qExplain, qSetTimezone,
+    qShowFunctionStatus, qShowProcedureStatus, qShowTriggers, qShowEvents, qShowCreateTrigger,
+    qHelpKeyword, qShowWarnings);
   TSqlProvider = class
     strict protected
       FNetType: TNetType;
diff --git a/source/main.pas b/source/main.pas
index 0eb9f9a7d..b69118502 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -4898,7 +4898,7 @@ procedure TMainForm.actSynMoveUpExecute(Sender: TObject);
 }
 procedure TMainform.CallSQLHelpWithKeyword( keyword: String );
 begin
-  if FActiveDbObj.Connection.Has(frHelpKeyword) then begin
+  if FActiveDbObj.Connection.SqlProvider.Has(qHelpKeyword) then begin
     if not Assigned(SqlHelpDialog) then
       SqlHelpDialog := TfrmSQLhelp.Create(Self);
     SqlHelpDialog.Show;
@@ -13723,7 +13723,7 @@ procedure TMainForm.lblExplainProcessClick(Sender: TObject);
   Tab := QueryTabs[QueryTabs.Count-1];
   UsedDatabase := listProcesses.Text[listProcesses.FocusedNode, 3];
   if not UsedDatabase.IsEmpty then begin
-    Tab.Memo.Lines.Add('USE ' + Conn.QuoteIdent(UsedDatabase) + ';');
+    Tab.Memo.Lines.Add(Conn.SqlProvider.GetSql(qUSEQuery, [Conn.QuoteIdent(UsedDatabase)]) + ';');
   end;
   Tab.Memo.Lines.Add(Conn.SqlProvider.GetSql(qExplain, [SynMemoProcessView.Text]) + ';');
   Tab.TabSheet.Show;
diff --git a/source/sqlhelp.pas b/source/sqlhelp.pas
index 0da9d8f51..49dc122f1 100644
--- a/source/sqlhelp.pas
+++ b/source/sqlhelp.pas
@@ -8,7 +8,7 @@ interface
   SysUtils, Classes, Controls, Forms, Dialogs, StdCtrls, ComCtrls, ExtCtrls,
   Buttons, SynEdit, SynEditHighlighter, extra_controls, lazaruscompat,
   laz.VirtualTrees, Graphics, EditBtn,
-  dbconnection;
+  dbconnection, dbstructures;
 
 type
 
@@ -106,7 +106,7 @@ procedure TfrmSQLhelp.FormCreate(Sender: TObject);
   treeTopics.Clear;
   FreeAndNil(FRootTopics);
   FConnection := MainForm.ActiveConnection;
-  FRootTopics := FConnection.GetResults('HELP '+FConnection.EscapeString('CONTENTS'));
+  FRootTopics := FConnection.GetResults(FConnection.SqlProvider.GetSql(qHelpKeyword, [FConnection.EscapeString('CONTENTS')]));
   treeTopics.RootNodeCount := FRootTopics.RecordCount;
 end;
 
@@ -148,7 +148,7 @@ procedure TfrmSQLhelp.treeTopicsFocusChanged(Sender: TBaseVirtualTree; Node: PVi
 
   if FKeyword <> '' then try
     Screen.Cursor := crHourglass;
-    Results := FConnection.GetResults('HELP '+FConnection.EscapeString(FKeyword));
+    Results := FConnection.GetResults(FConnection.SqlProvider.GetSql(qHelpKeyword, [FConnection.EscapeString(FKeyword)]));
     Caption := Caption + ' - ' + FKeyword;
     MemoDescription.Text := fixNewlines(Results.Col('description', True));
     MemoExample.Text := fixNewlines(Results.Col('example', True));
@@ -235,7 +235,7 @@ procedure TfrmSQLhelp.treeTopicsInitChildren(Sender: TBaseVirtualTree; Node: PVi
   // Return number of children for folder
   VT := Sender as TVirtualStringTree;
   Results := VT.GetNodeData(Node);
-  Results^ := FConnection.GetResults('HELP '+FConnection.EscapeString(VT.Text[Node, VT.Header.MainColumn]));
+  Results^ := FConnection.GetResults(FConnection.SqlProvider.GetSql(qHelpKeyword, [FConnection.EscapeString(VT.Text[Node, VT.Header.MainColumn])]));
   ChildCount := Results.RecordCount;
 end;
 
@@ -319,7 +319,7 @@ procedure TfrmSQLhelp.SetKeyword(Value: string);
   FKeyword := Value;
   if FKeyword = '' then
     Exit;
-  Results := FConnection.GetResults('HELP '+FConnection.EscapeString(FKeyword));
+  Results := FConnection.GetResults(FConnection.SqlProvider.GetSql(qHelpKeyword, [FConnection.EscapeString(FKeyword)]));
   while not Results.Eof do begin
     if Results.Col('is_it_category', true) = 'N' then begin
       FKeyword := Results.Col('name');

From e5b9574528a94c0b06a424735679d091fab52cda Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Thu, 12 Mar 2026 20:55:41 +0100
Subject: [PATCH 07/45] feat: support cancelling server login dialog

Refs #349
---
 extra/locale/heidisql.po |  5 ++++-
 source/dbconnection.pas  | 13 +++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/extra/locale/heidisql.po b/extra/locale/heidisql.po
index 1db89328b..08b9c000c 100644
--- a/extra/locale/heidisql.po
+++ b/extra/locale/heidisql.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2026-02-28 15:20+0100\n"
+"PO-Revision-Date: 2026-03-12 20:54+0100\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
 "Language: en\n"
@@ -6800,3 +6800,6 @@ msgstr "Reverse"
 
 msgid "Show reverse foreign keys"
 msgstr "Show reverse foreign keys"
+
+msgid "Login cancelled"
+msgstr "Login cancelled"
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index f0783fc83..5d7dbc9e7 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -3130,10 +3130,15 @@ procedure TDBConnection.DoBeforeConnect;
     Dialog.lblPrompt.Caption := f_('Login to %s:', [FParameters.Hostname]);
     Dialog.editUsername.Text := FParameters.Username;
     Dialog.editPassword.Text := FParameters.Password;
-    Dialog.ShowModal;
-    FParameters.Username := Dialog.editUsername.Text;
-    FParameters.Password := Dialog.editPassword.Text;
-    Dialog.Free;
+    if Dialog.ShowModal = mrOk then begin
+      FParameters.Username := Dialog.editUsername.Text;
+      FParameters.Password := Dialog.editPassword.Text;
+      Dialog.Free;
+    end
+    else begin
+      Dialog.Free;
+      raise EDbError.Create(_('Login cancelled'));
+    end;
   end;
 
   // Prepare connection

From 0422bb3837f3eab52066e27f29738ccebe200972 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 13 Mar 2026 14:54:47 +0100
Subject: [PATCH 08/45] feat: reset a table's current auto_increment value in
 "delete + insert data" mode

Refs #2358
---
 source/tabletools.pas | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/tabletools.pas b/source/tabletools.pas
index a2ab16471..a68accb74 100644
--- a/source/tabletools.pas
+++ b/source/tabletools.pas
@@ -2057,8 +2057,11 @@ procedure TfrmTableTools.DoExport(DBObj: TDBObject);
       // Calculate limit so we select ~100MB per loop
       // Take care of disabled "Get full table status" session setting, where AvgRowLen is 0
       Limit := Round(100 * SIZE_MB / IfThen(DBObj.AvgRowLen>0, DBObj.AvgRowLen, AssumedAvgRowLen));
-      if comboExportData.Text = DATA_REPLACE then
+      if comboExportData.Text = DATA_REPLACE then begin
         Output('DELETE FROM '+TargetDbAndObject, True, True, True, True, True);
+        if menuExportRemoveAutoIncrement.Checked then
+          Output('/*!50000 ALTER TABLE '+TargetDbAndObject+' AUTO_INCREMENT = 1 */', True, True, True, True, True);
+      end;
       while true do begin
         Data := DBObj.Connection.GetResults(
           DBObj.Connection.ApplyLimitClause(

From 056b5e906637971c530dea08fae00b82d364721d Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 13 Mar 2026 14:59:39 +0100
Subject: [PATCH 09/45] fix: crash in SQL export to database for zero length
 SQL, plus upgrade old-style string handling

---
 source/apphelpers.pas | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/apphelpers.pas b/source/apphelpers.pas
index e2a728aaa..6637ed6db 100644
--- a/source/apphelpers.pas
+++ b/source/apphelpers.pas
@@ -713,10 +713,13 @@ function EncodeURLParam(const Value: String): String;
 }
 procedure StreamWrite(S: TStream; Text: String = '');
 var
-  utf8: AnsiString;
+  utf8: UTF8String;
+  L: Integer;
 begin
   utf8 := Utf8Encode(Text);
-  S.Write(utf8[1], Length(utf8));
+  L := Length(utf8);
+  if L > 0 then
+    S.WriteBuffer(utf8[1], L);
 end;
 
 

From 0035d5e46c2545bda5560d414cca467e49082407 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 13 Mar 2026 16:15:39 +0100
Subject: [PATCH 10/45] feat: add context menu item for deleting a single query
 from the history

Refs #171
---
 extra/locale/heidisql.po |  5 +++-
 source/main.lfm          |  1 +
 source/main.pas          | 58 +++++++++++++++++++++++++++++++---------
 3 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/extra/locale/heidisql.po b/extra/locale/heidisql.po
index 08b9c000c..46ed7eaed 100644
--- a/extra/locale/heidisql.po
+++ b/extra/locale/heidisql.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2026-03-12 20:54+0100\n"
+"PO-Revision-Date: 2026-03-13 16:14+0100\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
 "Language: en\n"
@@ -2605,6 +2605,9 @@ msgstr "Explore folder"
 msgid "Clear query history ..."
 msgstr "Clear query history ..."
 
+msgid "Delete this query from history"
+msgstr "Delete this query from history"
+
 #. MainForm..popupQueryHelpers..menuQueryHelpersGenerateInsert..Caption
 #: main.dfm:9218
 msgid "Generate %s ..."
diff --git a/source/main.lfm b/source/main.lfm
index 99bd4eb06..c71422697 100644
--- a/source/main.lfm
+++ b/source/main.lfm
@@ -21026,6 +21026,7 @@ object MainForm: TMainForm
     object menuClearQueryHistory: TMenuItem
       Caption = 'Clear query history ...'
       Enabled = False
+      ImageIndex = 26
       OnClick = menuClearQueryHistoryClick
     end
     object menuQueryHelpersGenerateSelect: TMenuItem
diff --git a/source/main.pas b/source/main.pas
index b69118502..97ed810e7 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -8588,21 +8588,53 @@ procedure TMainForm.menuExploreClick(Sender: TObject);
 procedure TMainForm.menuClearQueryHistoryClick(Sender: TObject);
 var
   Values: TStringList;
-  PathToDelete: String;
+  HistoryRootKey, ValueNameToDelete: String;
+  Tab: TQueryTab;
+  ClickNode: PVirtualNode;
+  History: TQueryHistory;
+  DialogResult: TModalResult;
 begin
   // Clear query history items in registry
-  // Take care of MessageDialog, probably changing the current SessionPath
-  PathToDelete := AppSettings.AppendDelimiter(ActiveConnection.Parameters.SessionPath) + REGKEY_QUERYHISTORY;
-  AppSettings.SessionPath := PathToDelete;
-  Values := AppSettings.GetValueNames;
-  if MessageDialog(_('Clear query history?'), f_('%s history items will be deleted.', [FormatNumber(Values.Count)]), mtConfirmation, [mbYes, mbNo]) = mrYes then begin
-    Screen.Cursor := crHourglass;
-    AppSettings.SessionPath := PathToDelete;
-    AppSettings.DeleteCurrentKey;
-    RefreshHelperNode(TQueryTab.HelperNodeHistory);
-    Screen.Cursor := crDefault;
+  HistoryRootKey := AppSettings.AppendDelimiter(ActiveConnection.Parameters.SessionPath) + REGKEY_QUERYHISTORY;
+  AppSettings.SessionPath := HistoryRootKey;
+
+  Tab := QueryTabs.ActiveTab;
+  ClickNode := Tab.treeHelpers.FocusedNode;
+
+  case Tab.treeHelpers.GetNodeLevel(ClickNode) of
+    1: begin
+      Values := AppSettings.GetValueNames;
+      //showmessage(Values.Text);
+      DialogResult := MessageDialog(
+        _('Clear query history?'),
+        f_('%s history items will be deleted.', [FormatNumber(Values.Count)]),
+        mtConfirmation,
+        [mbYes, mbNo]
+        );
+      if DialogResult = mrYes then begin
+        Screen.Cursor := crHourglass;
+        // MessageDialog may have changed the current SessionPath
+        AppSettings.SessionPath := HistoryRootKey;
+        AppSettings.DeleteCurrentKey;
+        RefreshHelperNode(TQueryTab.HelperNodeHistory);
+        Screen.Cursor := crDefault;
+      end;
+      Values.Free;
+    end;
+
+    2: begin
+      History := Tab.HistoryDays.Objects[ClickNode.Parent.Index] as TQueryHistory;
+      ValueNameToDelete := History[ClickNode.Index].RegValue.ToString;
+      //showmessage(ValueNameToDelete);
+      Screen.Cursor := crHourglass;
+      // MessageDialog may have changed the current SessionPath
+      AppSettings.SessionPath := HistoryRootKey;
+      AppSettings.DeleteValue(ValueNameToDelete);
+      RefreshHelperNode(TQueryTab.HelperNodeHistory);
+      Screen.Cursor := crDefault;
+    end;
   end;
-  Values.Free;
+
   AppSettings.ResetPath;
 end;
 
@@ -14441,6 +14473,7 @@ procedure TMainForm.treeQueryHelpersContextPopup(Sender: TObject; MousePos: TPoi
   menuExplore.Enabled := False;
   menuHelp.Enabled := False;
   menuClearQueryHistory.Enabled := False;
+  menuClearQueryHistory.Caption := _('Clear query history ...');
 
   case Tree.GetNodeLevel(Tree.FocusedNode) of
     0: ;
@@ -14477,6 +14510,7 @@ procedure TMainForm.treeQueryHelpersContextPopup(Sender: TObject; MousePos: TPoi
     2: case Tree.FocusedNode.Parent.Parent.Index of
       TQueryTab.HelperNodeHistory: begin
         menuClearQueryHistory.Enabled := True;
+        menuClearQueryHistory.Caption := _('Delete this query from history');
         menuInsertAtCursor.Enabled := True;
       end;
     end;

From e9af525010db56b7ba400fa34d51a36a005c815a Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Sat, 14 Mar 2026 12:29:27 +0100
Subject: [PATCH 11/45] fix: TSQLBatch using backslash for escaping single
 quotes on all server types. Introduce server type specific TSQLBatch.FEscape
 char.

Refs #2336
---
 source/apphelpers.pas | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/apphelpers.pas b/source/apphelpers.pas
index 6637ed6db..e7cecba7b 100644
--- a/source/apphelpers.pas
+++ b/source/apphelpers.pas
@@ -74,12 +74,13 @@   TSQLBatch = class(TObjectList<TSQLSentence>)
     private
       FSQL: String;
       FQuotes: THashedStringList;
+      FEscape: Char;
       procedure SetSQL(Value: String);
       function GetSize: Integer;
       function GetSQLWithoutComments: String; overload;
     public
       constructor Create(NetTypeGroup: TNetTypeGroup);
-      destructor Destroy; overload;
+      destructor Destroy; override;
       class function GetSQLWithoutComments(FullSQL: String): String; overload;
       property Size: Integer read GetSize;
       property SQL: String read FSQL write SetSQL;
@@ -3228,13 +3229,15 @@ constructor TSQLBatch.Create(NetTypeGroup: TNetTypeGroup);
   FQuotes.Sorted := True;
   FQuotes.Add('"');
   FQuotes.Add('''');
+  FEscape := '\';
   case NetTypeGroup of
     ngMySQL: FQuotes.Add('`'); // MySQL/MariaDB only
     ngPgSQL: FQuotes.Add('$$'); // PostgreSQL only ($abc$ unsupported)
+    ngSQLite: FEscape := '''';
   end;
 end;
 
-destructor TSQLBatch.Destroy; overload;
+destructor TSQLBatch.Destroy;
 begin
   FQuotes.Free;
   inherited;
@@ -3321,7 +3324,7 @@ procedure TSQLBatch.SetSQL(Value: String);
       end;
     end;
     if not InEscape then
-      InEscape := c = '\'
+      InEscape := c = FEscape
     else
       InEscape := False;
 

From b2f4d5b4735d717fb6158f7f7e3c6af08f216865 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Sat, 14 Mar 2026 12:45:33 +0100
Subject: [PATCH 12/45] fix: call to non existent inherited constructor version
 of TSQLBatch

---
 source/apphelpers.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/apphelpers.pas b/source/apphelpers.pas
index e7cecba7b..d82092db2 100644
--- a/source/apphelpers.pas
+++ b/source/apphelpers.pas
@@ -3223,7 +3223,7 @@ function TSQLSentence.GetSQLWithoutComments: String;
 
 constructor TSQLBatch.Create(NetTypeGroup: TNetTypeGroup);
 begin
-  inherited;
+  inherited Create;
   FQuotes := THashedStringList.Create;
   FQuotes.CaseSensitive := True;
   FQuotes.Sorted := True;

From 94cc401738d1defb7b06d0dcb2df96b2dfa73ea1 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Mon, 16 Mar 2026 16:38:09 +0100
Subject: [PATCH 13/45] feat: read and display PostgreSQL ENUM column types in
 table editor feat: use correct CREATE and ALTER syntax for PostgreSQL ENUM
 columns, and provide ENUM labels in grid cells

Refs #1125
---
 source/dbconnection.pas            | 155 ++++++++++++++++++++---------
 source/dbstructures.pas            |   2 +-
 source/dbstructures.postgresql.pas |  31 +++++-
 source/table_editor.pas            |  24 +++--
 4 files changed, 158 insertions(+), 54 deletions(-)

diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 5d7dbc9e7..21f7e79a9 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -482,6 +482,7 @@   TDBConnection = class(TComponent)
       FMaxRowsPerInsert: Int64;
       FCaseSensitivity: Integer;
       FSQLFunctions: TSQLFunctionList;
+      FNamedEnums: TStringList;
       procedure SetActive(Value: Boolean); virtual; abstract;
       procedure DoBeforeConnect; virtual;
       procedure StartSSHTunnel(var FinalHost: String; var FinalPort: Integer);
@@ -616,6 +617,7 @@   TDBConnection = class(TComponent)
       function IsHex(Text: String): Boolean;
       function Has(Item: TFeatureOrRequirement): Boolean;
       property SqlProvider: TSqlProvider read FSqlProvider;
+      property NamedEnums: TStringList read FNamedEnums;
     published
       property Active: Boolean read FActive write SetActive default False;
       property Database: String read FDatabase write SetDatabase;
@@ -2066,6 +2068,9 @@ constructor TDBConnection.Create(AOwner: TComponent);
   FStringQuoteChar := '''';
   FCollationTable := nil;
   FCharsetTable := nil;
+  FQuoteChar := '"';
+  FQuoteChars := '"[]';
+  FNamedEnums := TStringList.Create;
 end;
 
 
@@ -2090,8 +2095,6 @@ constructor TSqlSrvConnection.Create(AOwner: TComponent);
   i: Integer;
 begin
   inherited;
-  FQuoteChar := '"';
-  FQuoteChars := '"[]';
   SetLength(FDatatypes, Length(MSSQLDatatypes));
   for i:=0 to High(MSSQLDatatypes) do
     FDatatypes[i] := MSSQLDatatypes[i];
@@ -2106,7 +2109,6 @@ constructor TPgConnection.Create(AOwner: TComponent);
   i: Integer;
 begin
   inherited;
-  FQuoteChar := '"';
   FQuoteChars := '"';
   SetLength(FDatatypes, Length(PostGreSQLDatatypes));
   for i:=0 to High(PostGreSQLDatatypes) do
@@ -2123,8 +2125,6 @@ constructor TSQLiteConnection.Create(AOwner: TComponent);
   i: Integer;
 begin
   inherited;
-  FQuoteChar := '"';
-  FQuoteChars := '"[]';
   SetLength(FDatatypes, Length(SQLiteDatatypes));
   for i:=0 to High(SQLiteDatatypes) do
     FDatatypes[i] := SQLiteDatatypes[i];
@@ -2138,8 +2138,6 @@ constructor TSQLiteConnection.Create(AOwner: TComponent);
   i: Integer;
 begin
   inherited;
-  FQuoteChar := '"';
-  FQuoteChars := '"[]';
   SetLength(FDatatypes, Length(InterbaseDatatypes));
   for i:=0 to High(InterbaseDatatypes) do
     FDatatypes[i] := InterbaseDatatypes[i];
@@ -2154,6 +2152,7 @@ destructor TDBConnection.Destroy;
   FKeepAliveTimer.Free;
   FFavorites.Free;
   FInformationSchemaObjects.Free;
+  FNamedEnums.Free;
   if FOwnsParameters then
     FParameters.Free;
   inherited;
@@ -2230,7 +2229,7 @@ function TDBConnection.GetDatatypeByName(var DataType: String; DeleteFromSource:
       TypesSorted.Free;
     end;
 
-    rx.Expression := '^('+Types+')\b(\[\])?';
+    rx.Expression := '\b('+Types+')\b(\[\])?';
     Match := rx.Exec(DataType);
     // Prefer a later match which is longer than the one found before.
     // See http://www.heidisql.com/forum.php?t=17061
@@ -2271,27 +2270,18 @@ function TDBConnection.GetDatatypeByNativeType(NativeType: Integer; Identifier:
   i: Integer;
   rx: TRegExpr;
   TypeFound: Boolean;
-  TypeOid: String;
 begin
   Result := Default(TDBDatatype);
   rx := TRegExpr.Create;
   TypeFound := False;
+
   for i:=0 to High(Datatypes) do begin
-    if Datatypes[i].NativeTypes = '?' then begin
-      // PG oid is set to be populated via '?'
-      Datatypes[i].NativeTypes := '';
-      TypeOid := GetVar('SELECT oid FROM '+QuoteIdent('pg_type')+' WHERE '+QuoteIdent('typname')+' = '+EscapeString(Datatypes[i].Name.ToLower));
-      if IsNumeric(TypeOid) then begin
-        Datatypes[i].NativeTypes := TypeOid;
-        Log(lcInfo, 'Found oid/NativeTypes of '+Datatypes[i].Name+' data type: '+Datatypes[i].NativeTypes);
-      end
-      else begin
-        Log(lcInfo, 'No support for '+Datatypes[i].Name+' data type on this server.');
-      end;
-    end;
-    // Skip if native ids / oid's are (still) empty
+    // Skip if native ids / oid's are (yet) empty
     if Datatypes[i].NativeTypes.IsEmpty then
       Continue;
+    // Skip ? and e which have a special meaning
+    if Datatypes[i].NativeTypes.Length = 1 then
+      Continue;
     rx.Expression := '\b('+Datatypes[i].NativeTypes+')\b';
     if rx.Exec(IntToStr(NativeType)) then begin
       Result := Datatypes[i];
@@ -3268,6 +3258,10 @@ procedure TDBConnection.EndSSHTunnel;
 
 procedure TDBConnection.DoAfterConnect;
 var
+  i: Integer;
+  TypeOid: String;
+  AllEnums: TDBQuery;
+  AllEnumsList: TStringList;
   SQLFunctionsFileOrder: String;
   MajorMinorVer, MajorVer: String;
   StartupScript: String;
@@ -3277,6 +3271,46 @@ procedure TDBConnection.DoAfterConnect;
   Offset: String;
 begin
   FSqlProvider.ServerVersion := ServerVersionInt;
+
+  for i:=0 to High(Datatypes) do begin
+
+    if Datatypes[i].NativeTypes = '?' then begin
+      // PG oid is set to be populated via '?'
+      TypeOid := GetVar('SELECT oid FROM '+QuoteIdent('pg_type')+' WHERE '+QuoteIdent('typname')+' = '+EscapeString(Datatypes[i].Name.ToLower));
+      if IsNumeric(TypeOid) then begin
+        Datatypes[i].NativeTypes := TypeOid;
+        Log(lcInfo, 'Found oid/NativeTypes of '+Datatypes[i].Name+' data type: '+Datatypes[i].NativeTypes);
+      end
+      else begin
+        Log(lcInfo, 'No support for '+Datatypes[i].Name+' data type on this server.');
+      end;
+    end
+
+    else if (Datatypes[i].NativeTypes = 'e') and FSqlProvider.Has(qGetEnumTypes) then begin
+      // PG ENUM types populated via 'e'
+      AllEnums := GetResults(FSqlProvider.GetSql(qGetEnumTypes));
+      AllEnumsList := TStringList.Create;
+      while not AllEnums.Eof do begin
+        AllEnumsList.Add(AllEnums.Col('enum_name'));
+        AllEnumsList.Add(AllEnums.Col('enum_schema') + '.' + AllEnums.Col('enum_name'));
+        FNamedEnums.AddPair(
+          AllEnums.Col('enum_name'),
+          AllEnums.Col('enum_labels')
+          );
+        FNamedEnums.AddPair(
+          AllEnums.Col('enum_schema') + '.' + AllEnums.Col('enum_name'),
+          AllEnums.Col('enum_labels')
+          );
+        AllEnums.Next;
+      end;
+      AllEnums.Free;
+      Datatypes[i].Names := Implode('|', AllEnumsList);
+      AllEnumsList.Free;
+    end;
+
+  end;
+
+
   AppSettings.SessionPath := FParameters.SessionPath;
   AppSettings.WriteString(asServerVersionFull, FServerVersionUntouched);
   FParameters.ServerVersion := FServerVersionUntouched;
@@ -8979,19 +9013,33 @@ function TDBQuery.ValueList(Column: Integer): TStringList;
   i: Integer;
 begin
   Result := TStringList.Create;
-  Result.QuoteChar := '''';
-  Result.Delimiter := ',';
   ColAttr := ColAttributes(Column);
   if Assigned(ColAttr) then case ColAttr.DataType.Index of
+
     dbdtEnum, dbdtSet: begin
-      Result.DelimitedText := ColAttr.LengthSet;
-      // Take care for escaped ENUM definitions, see issue #799
+      // Lool up PostgreSQL enum labels in prefetched list
+      i := FConnection.NamedEnums.IndexOfName(ColAttr.LengthSet);
+      if i > -1 then begin
+        Result.Delimiter := '|';
+        Result.DelimitedText := FConnection.NamedEnums.ValueFromIndex[i];
+      end
+      else begin
+        // .. or in MySQL Length/Set
+        Result.QuoteChar := '''';
+        Result.Delimiter := ',';
+        Result.DelimitedText := ColAttr.LengthSet;
+      end;
+      // In any case, take care for escaped ENUM definitions, see issue #799
       for i:=0 to Result.Count-1 do begin
         Result[i] := FConnection.UnescapeString(Result[i]);
       end;
     end;
-    dbdtBool:
+
+    dbdtBool: begin
+      Result.Delimiter := ',';
       Result.DelimitedText := 'true,false';
+    end;
+
   end;
 end;
 
@@ -10610,25 +10658,29 @@ function TTableColumn.SQLCode(OverrideCollation: String=''; Parts: TColumnParts=
   end;
 
   if InParts(cpType) then begin
-    case FConnection.Parameters.NetTypeGroup of
-      ngPgSQL: begin
-        if DefaultType = cdtAutoInc then
-          Result := Result + 'SERIAL'
-        else
-          Result := Result + DataType.Name;
+
+    if FConnection.Parameters.IsAnyPostgreSQL and (DefaultType = cdtAutoInc) then begin
+      Result := Result + 'SERIAL';
+    end
+    else begin
+
+      if (DataType.Index = dbdtEnum) and (FConnection.NamedEnums.IndexOfName(LengthSet) > -1) then begin
+        Result := Result + LengthSet;
+      end
+      else begin
+        Result := Result + DataType.Name;
+        if (LengthSet <> '') and DataType.HasLength then
+          Result := Result + '(' + LengthSet + ')';
       end;
-      else Result := Result + DataType.Name;
-    end;
 
-    if (LengthSet <> '') and DataType.HasLength then
-      Result := Result + '(' + LengthSet + ')';
-    if (DataType.Category in [dtcInteger, dtcReal]) and Unsigned then
-      Result := Result + ' UNSIGNED';
-    if (DataType.Category in [dtcInteger, dtcReal]) and ZeroFill then
-      Result := Result + ' ZEROFILL';
-    if Compressed and FConnection.Parameters.IsMariaDB then
-      Result := Result + ' /*!100301 COMPRESSED*/';
-    Result := Result + ' '; // Add space after each part
+      if (DataType.Category in [dtcInteger, dtcReal]) and Unsigned then
+        Result := Result + ' UNSIGNED';
+      if (DataType.Category in [dtcInteger, dtcReal]) and ZeroFill then
+        Result := Result + ' ZEROFILL';
+      if Compressed and FConnection.Parameters.IsMariaDB then
+        Result := Result + ' /*!100301 COMPRESSED*/';
+      Result := Result + ' '; // Add space after each part
+    end;
   end;
 
   if InParts(cpAllowNull) and (not IsVirtual) and (not FConnection.Parameters.IsAnyMSSQL) then begin
@@ -10719,7 +10771,9 @@ procedure TTableColumn.ParseDatatype(Source: String);
 var
   InLiteral: Boolean;
   ParenthLeft, i: Integer;
+  OrgSource: String;
 begin
+  OrgSource := Source;
   DataType := Connection.GetDatatypeByName(Source, True);
   // Length / Set
   // Various datatypes, e.g. BLOBs, don't have any length property
@@ -10738,6 +10792,11 @@ procedure TTableColumn.ParseDatatype(Source: String);
       LengthSet := '';
   end else begin
     LengthSet := '';
+    if DataType.Index = dbdtEnum then begin
+      // Assign PostgreSQL enum type to LengthSet, so we can provide it in table editor
+      // Some enum types are wrapped in double quotes
+      LengthSet := OrgSource.Trim([FConnection.QuoteChar]);
+    end;
   end;
   Unsigned :=  ExecRegExpr('\bunsigned\b', Source.ToLowerInvariant);
   ZeroFill := ExecRegExpr('\bzerofill\b', Source.ToLowerInvariant);
@@ -10780,8 +10839,12 @@ function TTableColumn.AutoIncName: String;
 function TTableColumn.FullDataType: String;
 begin
   Result := DataType.Name;
-  if not LengthSet.IsEmpty then
-    Result := Result + '(' + LengthSet + ')';
+  if not LengthSet.IsEmpty then begin
+    if (DataType.Index = dbdtEnum) and (FConnection.NamedEnums.IndexOfName(LengthSet) > -1) then
+      Result := LengthSet
+    else
+      Result := Result + '(' + LengthSet + ')';
+  end;
 end;
 
 
diff --git a/source/dbstructures.pas b/source/dbstructures.pas
index e0734c3ee..9682c2f75 100644
--- a/source/dbstructures.pas
+++ b/source/dbstructures.pas
@@ -48,7 +48,7 @@ interface
     qForeignKeyDrop, qGetTableColumns, qGetCollations, qGetCollationsExtended, qGetCharsets,
     qGetReverseForeignKeys, qExplain, qSetTimezone,
     qShowFunctionStatus, qShowProcedureStatus, qShowTriggers, qShowEvents, qShowCreateTrigger,
-    qHelpKeyword, qShowWarnings);
+    qHelpKeyword, qShowWarnings, qGetEnumTypes);
   TSqlProvider = class
     strict protected
       FNetType: TNetType;
diff --git a/source/dbstructures.postgresql.pas b/source/dbstructures.postgresql.pas
index a01de8762..84014cdf5 100644
--- a/source/dbstructures.postgresql.pas
+++ b/source/dbstructures.postgresql.pas
@@ -46,7 +46,7 @@   TPostgreSQLProvider = class(TSqlProvider)
 const InvalidOid: POid = 0;
 
 var
-  PostgreSQLDatatypes: Array[0..38] of TDBDatatype =
+  PostgreSQLDatatypes: Array[0..39] of TDBDatatype =
   (
     (
       Index:           dbdtUnknown;
@@ -511,6 +511,19 @@   TPostgreSQLProvider = class(TSqlProvider)
       LoadPart:        False;
       Category:        dtcOther;
     ),
+    (
+      Index:           dbdtEnum;
+      NativeTypes:     'e';
+      Name:            'ENUM';
+      Names:           '';
+      Description:     'A list of quoted labels, each of which must be less than NAMEDATALEN bytes long (64 bytes in a standard PostgreSQL build)';
+      HasLength:       True; // Enables the Length/set field in table editor
+      RequiresLength:  True;
+      HasBinary:       False;
+      HasDefault:      True;
+      LoadPart:        False;
+      Category:        dtcOther;
+    ),
     (
       Index:           dbdtJson;
       NativeTypes:     '114';
@@ -716,6 +729,22 @@ function TPostgreSQLProvider.GetSql(AId: TQueryId): string;
       ' WHERE pg_class.relkind=''r'''+
       '   AND pg_namespace.nspname=:EscapedDatabase'+
       '   AND pg_class.relname=:EscapedName';
+    qGetEnumTypes: Result := IfThen(
+      FServerVersion >= 90000,
+      'SELECT ' +
+      '  n.nspname AS enum_schema, ' +
+      '  t.typname AS enum_name, ' +
+      '  string_agg(e.enumlabel, ''|'' ORDER BY e.enumsortorder) AS enum_labels ' +
+      'FROM pg_type AS t ' +
+      'JOIN pg_enum AS e ' +
+      '  ON t.oid = e.enumtypid ' +
+      'JOIN pg_namespace AS n ' +
+      '  ON n.oid = t.typnamespace ' +
+      'WHERE t.typtype = ''e'' ' +
+      'GROUP BY n.nspname, t.typname ' +
+      'ORDER BY UPPER(t.typname)',
+      '' // ServerVersion < 9
+      );
     else Result := inherited;
   end;
 end;
diff --git a/source/table_editor.pas b/source/table_editor.pas
index ca98076eb..a851c6261 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -1861,6 +1861,17 @@ procedure TfrmTableEditor.listColumnsCreateEditor(Sender: TBaseVirtualTree;
       EditLink := DataTypeEditor;
       end;
 
+    ColNumLengthSet: begin
+      if DBObject.Connection.Parameters.IsAnyPostgreSQL and (Col.DataType.Index = dbdtEnum) then begin
+        EnumEditor := TEnumEditorLink.Create(VT, True, Col^);
+        EnumEditor.AllowCustomText := True;
+        EnumEditor.ItemMustExist := False;
+        EnumEditor.ValueList := Explode('|', Col.DataType.Names);
+        EnumEditor.ValueList.Insert(0, '');
+        EditLink := EnumEditor;
+      end;
+    end;
+
     ColNumCollation: begin // Collation pulldown
       EnumEditor := TEnumEditorLink.Create(VT, True, Col^);
       EnumEditor.AllowCustomText := True;
@@ -1891,12 +1902,13 @@ procedure TfrmTableEditor.listColumnsCreateEditor(Sender: TBaseVirtualTree;
       EditLink := EnumEditor;
     end
 
-    else begin
-      Edit := TInplaceEditorLink.Create(VT, True, Col^);
-      Edit.TitleText := VT.Header.Columns[Column].Text;
-      Edit.ButtonVisible := True;
-      EditLink := Edit;
-    end;
+  end;
+
+  if (not Assigned(EditLink)) then begin
+    Edit := TInplaceEditorLink.Create(VT, True, Col^);
+    Edit.TitleText := VT.Header.Columns[Column].Text;
+    Edit.ButtonVisible := True;
+    EditLink := Edit;
   end;
 end;
 

From 3249401d3c6013021ba4d60fadaeda55675854a4 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Mon, 16 Mar 2026 17:19:22 +0100
Subject: [PATCH 14/45] feat: basic support for MariaDB user roles, loaded
 without SQL error and shown with a different icon

Refs #1155
---
 source/usermanager.pas | 64 ++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/source/usermanager.pas b/source/usermanager.pas
index 73e2a29db..1635af525 100644
--- a/source/usermanager.pas
+++ b/source/usermanager.pas
@@ -7,7 +7,8 @@ interface
 uses
   SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ComCtrls, StdCtrls, EditBtn, Buttons,
   ExtCtrls, ClipBrd, Generics.Collections, Generics.Defaults, RegExpr, extra_controls,
-  dbconnection, dbstructures, dbstructures.mysql, apphelpers, laz.VirtualTrees, Menus, SpinEx;
+  dbconnection, dbstructures, dbstructures.mysql, apphelpers, laz.VirtualTrees, Menus, SpinEx,
+  StrUtils;
 
 {$I const.inc}
 
@@ -34,6 +35,7 @@   TUser = class(TObject)
     Username, Host, Password, Cipher, Issuer, Subject: String;
     MaxQueries, MaxUpdates, MaxConnections, MaxUserConnections, SSL: Integer;
     Problem: TUserProblem;
+    IsRole: Boolean;
     public
       constructor Create;
       function HostRequiresNameResolve: Boolean;
@@ -268,10 +270,9 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
   Version, i: Integer;
   Users: TDBQuery;
   U: TUser;
-  tmp, PasswordExpr: String;
+  tmp, PasswordExpr, IsRoleExpr: String;
   SkipNameResolve,
-  HasPassword,
-  HasAuthString,
+  HasPassword, HasAuthString, HasIsRole: Boolean;
   PasswordLengthMatters: Boolean;
   UserTableColumns: TStringList;
 
@@ -392,6 +393,7 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
     UserTableColumns := FConnection.GetCol('SHOW COLUMNS FROM '+FConnection.QuoteIdent('mysql')+'.'+FConnection.QuoteIdent('user'));
     HasPassword := UserTableColumns.IndexOf('password') > -1;
     HasAuthString := UserTableColumns.IndexOf('authentication_string') > -1;
+    HasIsRole := UserTableColumns.IndexOf('is_role') > -1;
     if HasPassword and (not HasAuthString) then
       PasswordExpr := 'password'
     else if (not HasPassword) and HasAuthString then
@@ -401,9 +403,14 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
     else
       Raise Exception.Create(_('No password hash column available'));
     PasswordExpr := PasswordExpr + ' AS ' + FConnection.QuoteIdent('password');
+    IsRoleExpr := IfThen(HasIsRole, 'is_role', FConnection.EscapeString('N')+' AS is_role');
 
     Users := FConnection.GetResults(
-      'SELECT '+FConnection.QuoteIdent('user')+', '+FConnection.QuoteIdent('host')+', '+PasswordExpr+' '+
+      'SELECT '+
+      FConnection.QuoteIdent('user') + ', ' +
+      FConnection.QuoteIdent('host') + ', ' +
+      PasswordExpr + ', ' +
+      IsRoleExpr + ' ' +
       'FROM '+FConnection.QuoteIdent('mysql')+'.'+FConnection.QuoteIdent('user')
       );
     FUsers := TUserList.Create(True);
@@ -412,13 +419,16 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
       U.Username := Users.Col('user');
       U.Host := Users.Col('host');
       U.Password := Users.Col('password');
+      U.IsRole := UpperCase(Users.Col('is_role')) = 'Y';
       U.Problem := upNone;
-      if Length(U.Password) = 0 then
-        U.Problem := upEmptyPassword;
-      if PasswordLengthMatters and (not (Length(U.Password) {%H-}in [0, 16, 41])) then
-        U.Problem := upInvalidPasswordLen
-      else if SkipNameResolve and U.HostRequiresNameResolve then
-        U.Problem := upSkipNameResolve;
+      if not U.IsRole then begin
+        if Length(U.Password) = 0 then
+          U.Problem := upEmptyPassword;
+        if PasswordLengthMatters and (not (Length(U.Password) in [0, 16, 41])) then
+          U.Problem := upInvalidPasswordLen
+        else if SkipNameResolve and U.HostRequiresNameResolve then
+          U.Problem := upSkipNameResolve;
+      end;
       FUsers.Add(U);
       Users.Next;
     end;
@@ -576,7 +586,10 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
 
   if UserSelected then begin
     User := Sender.GetNodeData(Node);
-    UserHost := FConnection.EscapeString(User.Username)+'@'+FConnection.EscapeString(User.Host);
+    if not User.IsRole then
+      UserHost := FConnection.EscapeString(User.Username)+'@'+FConnection.EscapeString(User.Host)
+    else
+      UserHost := FConnection.EscapeString(User.Username);
     editUsername.Text := User.Username;
     editFromHost.Text := User.Host;
     Caption := Caption + ' - ' + User.Username;
@@ -732,7 +745,7 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
 
 
     CreateUser := '';
-    try
+    if not User.IsRole then try
       CreateUser := FConnection.GetVar('SHOW CREATE USER '+UserHost);
       User.ParseSettings(CreateUser, nil);
     except
@@ -782,12 +795,12 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
   // Enable input boxes
   lblUsername.Enabled := UserSelected;
   editUsername.Enabled := UserSelected;
-  lblFromHost.Enabled := UserSelected;
-  editFromHost.Enabled := UserSelected;
-  lblPassword.Enabled := UserSelected;
-  editPassword.Enabled := UserSelected;
-  lblRepeatPassword.Enabled := UserSelected;
-  editRepeatPassword.Enabled := UserSelected;
+  lblFromHost.Enabled := UserSelected and (not User.IsRole);
+  editFromHost.Enabled := UserSelected and (not User.IsRole);
+  lblPassword.Enabled := UserSelected and (not User.IsRole);
+  editPassword.Enabled := UserSelected and (not User.IsRole);
+  lblRepeatPassword.Enabled := UserSelected and (not User.IsRole);
+  editRepeatPassword.Enabled := UserSelected and (not User.IsRole);
   tabCredentials.Enabled := UserSelected;
   lblMaxQueries.Enabled := UserSelected and (FConnection.ServerVersionInt >= 40002);
 
@@ -819,10 +832,15 @@ procedure TUserManagerForm.listUsersGetImageIndex(Sender: TBaseVirtualTree; Node
 begin
   if Column <> 0 then
     Exit;
+  User := Sender.GetNodeData(Node);
   case Kind of
-    ikNormal, ikSelected: ImageIndex := 43;
+    ikNormal, ikSelected: begin
+      if not User.IsRole then
+        ImageIndex := 43
+      else
+        ImageIndex := 95;
+    end;
     ikOverlay: begin
-      User := Sender.GetNodeData(Node);
       if User.Password = '' then
         ImageIndex := 161;
       if FModified and (Node = Sender.FocusedNode) then
@@ -1544,12 +1562,16 @@ constructor TUser.Create;
   MaxUserConnections := 0;
   SSL := 0;
   Problem := upNone;
+  IsRole := False;
 end;
 
 function TUser.HostRequiresNameResolve: Boolean;
 var
   rx: TRegExpr;
 begin
+  Result := False;
+  if IsRole then
+    Exit;
   rx := TRegExpr.Create;
   // Valid ips or wildcards which do not need name resolving:
   rx.Expression := '^(localhost|[\d\.\/\:_]+|.*%.*|[\w\d_]{4}\:.*)$';

From 9ecdff0d2bc6aca60cb0f84ab90f2be9a971a9b0 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Mon, 16 Mar 2026 17:24:59 +0100
Subject: [PATCH 15/45] feat: prevent editing contents of generated columns in
 data grid

Refs #462
---
 extra/locale/heidisql.po |  5 ++++-
 source/main.pas          | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/extra/locale/heidisql.po b/extra/locale/heidisql.po
index 46ed7eaed..fd68836a2 100644
--- a/extra/locale/heidisql.po
+++ b/extra/locale/heidisql.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2026-03-13 16:14+0100\n"
+"PO-Revision-Date: 2026-03-16 17:18+0100\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
 "Language: en\n"
@@ -4931,6 +4931,9 @@ msgstr "Could not find node to focus."
 msgid "Could not load full row data."
 msgstr "Could not load full row data."
 
+msgid "Column %s is defined as generated. You cannot edit its content."
+msgstr "Column %s is defined as generated. You cannot edit its content."
+
 #: main.pas:8462
 msgid "Not available on %s"
 msgstr "Not available on %s"
diff --git a/source/main.pas b/source/main.pas
index 97ed810e7..2d9c91b71 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -10753,6 +10753,8 @@ procedure TMainForm.AnyGridKeyDown(Sender: TObject; var Key: Word; Shift: TShift
 
 procedure TMainForm.AnyGridEditing(Sender: TBaseVirtualTree; Node:
     PVirtualNode; Column: TColumnIndex; var Allowed: Boolean);
+var
+  ColInfo: TTableColumn;
 begin
   Allowed := False;
   // Do not edit on right-click
@@ -10763,6 +10765,15 @@ procedure TMainForm.AnyGridEditing(Sender: TBaseVirtualTree; Node:
       ErrorDialog(_('Could not load full row data.'))
     else begin
       Allowed := True;
+      if Sender = DataGrid then begin
+        ColInfo := SelectedTableColumns.FindByName(DataGrid.Header.Columns[Column].Text);
+        if Assigned(ColInfo) then begin
+          Allowed := ColInfo.GenerationExpression.IsEmpty;
+          if not Allowed then
+            ErrorDialog(f_('Column %s is defined as generated. You cannot edit its content.', [IntToStr(Column)]));
+        end;
+      end;
+
       // Move Esc shortcut from "Cancel row editing" to "Cancel cell editing"
       actDataCancelChanges.ShortCut := 0;
       actDataPostChanges.ShortCut := 0;

From 37f57ced06bc23f671a7fc473e0ffc6bf195ed07 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Mon, 16 Mar 2026 17:32:38 +0100
Subject: [PATCH 16/45] fix: populate SSH executable combo with only a global
 "ssh" command, do not add .exe files on Linux and macOS

Refs #2429
---
 source/connections.pas | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/connections.pas b/source/connections.pas
index 93dd882d2..e7b925e8d 100644
--- a/source/connections.pas
+++ b/source/connections.pas
@@ -311,6 +311,7 @@ procedure Tconnform.FormCreate(Sender: TObject);
   editLogFilePath.Hint := FilenameHint;
 
   // Populate dropdown with supported SSH executables
+  {$IFDEF WINDOWS}
   ExeFiles := FindAllFiles(GetAppDir, '*.exe', False);
   for ExePath in ExeFiles do begin
     ExeFile := ExtractFileName(ExePath);
@@ -320,6 +321,10 @@ procedure Tconnform.FormCreate(Sender: TObject);
   end;
   ExeFiles.Free;
   comboSSHExe.Items.Add('ssh.exe');
+  {$ELSE}
+  // Linux and macOS go here, no executable shipped
+  comboSSHExe.Items.Add('ssh');
+  {$ENDIF}
 
   // Translate combo items
   for i:=0 to comboSSLVerification.Items.Count-1 do begin

From b4ec2236db1e1e1ca020219a68d8033b8c2bea9b Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 18 Mar 2026 08:51:03 +0100
Subject: [PATCH 17/45] fix: clear data grid before indicating a broken or
 temporary table for which we get no columns from IS.COLUMNS

Refs #1883
---
 source/main.pas | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/main.pas b/source/main.pas
index 2d9c91b71..aef6fa843 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -5946,6 +5946,8 @@ procedure TMainForm.DataGridBeforePaint(Sender: TBaseVirtualTree; TargetCanvas:
   DBObj.Connection.Ping(True);
 
   if SelectedTableColumns.Count = 0 then begin
+    vt.Header.Columns.Clear;
+    vt.Clear;
     EnableDataTab(False);
   end else begin
     EnableDataTab(True);

From 83472c5654062f44e91962122844ed6091beff5d Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 18 Mar 2026 19:49:25 +0100
Subject: [PATCH 18/45] feat: disable role rename, add menu item for creating a
 role, support role deletion

Refs #1155
---
 extra/locale/heidisql.po      |   6 +-
 source/dbconnection.pas       |  15 ++-
 source/dbstructures.mysql.pas |   8 ++
 source/dbstructures.pas       |   2 +-
 source/main.pas               |   8 +-
 source/tabletools.pas         |   4 +-
 source/usermanager.lfm        |  15 +++
 source/usermanager.pas        | 217 ++++++++++++++++++++++++----------
 8 files changed, 201 insertions(+), 74 deletions(-)

diff --git a/extra/locale/heidisql.po b/extra/locale/heidisql.po
index fd68836a2..8202af7fb 100644
--- a/extra/locale/heidisql.po
+++ b/extra/locale/heidisql.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2026-03-16 17:18+0100\n"
+"PO-Revision-Date: 2026-03-18 19:40+0100\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
 "Language: en\n"
@@ -5442,8 +5442,8 @@ msgid "Unhandled privilege object: %s"
 msgstr "Unhandled privilege object: %s"
 
 #: usermanager.pas:1297
-msgid "Delete user %s@%s?"
-msgstr "Delete user %s@%s?"
+msgid "Delete user or role %s?"
+msgstr "Delete user or role %s?"
 
 #. dbconnection.pas
 msgid "Yes"
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 21f7e79a9..ed6c1d134 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -519,7 +519,9 @@   TDBConnection = class(TComponent)
     public
       constructor Create(AOwner: TComponent); override;
       destructor Destroy; override;
-      procedure Query(SQL: String; DoStoreResult: Boolean=False; LogCategory: TDBLogCategory=lcSQL); virtual;
+      procedure Query(SQL: String; DoStoreResult: Boolean=False; LogCategory: TDBLogCategory=lcSQL); overload; virtual;
+      procedure Query(QueryId: TQueryId); overload;
+      procedure Query(QueryId: TQueryId; const Args: array of const); overload;
       procedure Log(Category: TDBLogCategory; Msg: String);
       function EscapeString(Text: String; ProcessJokerChars: Boolean=False; DoQuote: Boolean=True): String; overload;
       function EscapeString(Text: String; Datatype: TDBDatatype): String; overload;
@@ -3589,6 +3591,17 @@ procedure TDBConnection.Query(SQL: String; DoStoreResult: Boolean=False; LogCate
 end;
 
 
+procedure TDBConnection.Query(QueryId: TQueryId);
+begin
+  Query(FSqlProvider.GetSql(QueryId));
+end;
+
+procedure TDBConnection.Query(QueryId: TQueryId; const Args: array of const);
+begin
+  Query(FSqlProvider.GetSql(QueryId, Args));
+end;
+
+
 procedure TMySQLConnection.Query(SQL: String; DoStoreResult: Boolean=False; LogCategory: TDBLogCategory=lcSQL);
 var
   QueryStatus: Integer;
diff --git a/source/dbstructures.mysql.pas b/source/dbstructures.mysql.pas
index cae88f4c7..717feada9 100644
--- a/source/dbstructures.mysql.pas
+++ b/source/dbstructures.mysql.pas
@@ -3391,6 +3391,14 @@ function TMySqlProvider.GetSql(AId: TQueryId): string;
       'SHOW WARNINGS',
       ''
       );
+    qDropUser: Result := IfThen(
+      FServerVersion < 40101,
+      'DELETE FROM mysql.user WHERE User=%s AND Host=%s',
+      'DROP USER %s@%s'
+      );
+    qCreateRole: Result := 'CREATE ROLE %s';
+    qDropRole: Result := 'DROP ROLE %s';
+    qReloadPrivileges: Result := 'FLUSH PRIVILEGES';
     else Result := inherited;
   end;
 end;
diff --git a/source/dbstructures.pas b/source/dbstructures.pas
index 9682c2f75..6f0129323 100644
--- a/source/dbstructures.pas
+++ b/source/dbstructures.pas
@@ -48,7 +48,7 @@ interface
     qForeignKeyDrop, qGetTableColumns, qGetCollations, qGetCollationsExtended, qGetCharsets,
     qGetReverseForeignKeys, qExplain, qSetTimezone,
     qShowFunctionStatus, qShowProcedureStatus, qShowTriggers, qShowEvents, qShowCreateTrigger,
-    qHelpKeyword, qShowWarnings, qGetEnumTypes);
+    qHelpKeyword, qShowWarnings, qGetEnumTypes, qDropUser, qCreateRole, qDropRole, qReloadPrivileges);
   TSqlProvider = class
     strict protected
       FNetType: TNetType;
diff --git a/source/main.pas b/source/main.pas
index aef6fa843..51fc8154e 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -3768,7 +3768,7 @@ procedure TMainForm.actDropObjectsExecute(Sender: TObject);
           db := DBObject.Database;
           Node := FindDBNode(DBtree, Conn, db);
           SetActiveDatabase('', Conn);
-          Conn.Query(Conn.SqlProvider.GetSql(qDatabaseDrop, [Conn.QuoteIdent(db)]));
+          Conn.Query(qDatabaseDrop, [Conn.QuoteIdent(db)]);
           DBtree.DeleteNode(Node);
           Conn.ClearDbObjects(db);
           Conn.RefreshAllDatabases;
@@ -3808,7 +3808,7 @@ procedure TMainForm.actDropObjectsExecute(Sender: TObject);
     try
       // Disable foreign key checks to avoid SQL errors
       if Conn.SqlProvider.Has(qDisableForeignKeyChecks) then
-        Conn.Query(Conn.SqlProvider.GetSql(qDisableForeignKeyChecks));
+        Conn.Query(qDisableForeignKeyChecks);
       // Compose and run DROP [TABLE|VIEW|...] queries
       Editor := ActiveObjectEditor;
       for DBObject in ObjectList do begin
@@ -3817,7 +3817,7 @@ procedure TMainForm.actDropObjectsExecute(Sender: TObject);
           Editor.Modified := False;
       end;
       if Conn.SqlProvider.Has(qEnableForeignKeyChecks) then
-        Conn.Query(Conn.SqlProvider.GetSql(qEnableForeignKeyChecks));
+        Conn.Query(qEnableForeignKeyChecks);
       // Refresh ListTables + dbtree so the dropped tables are gone:
       Conn.ClearDbObjects(ActiveDatabase);
       RefreshTree;
@@ -6706,7 +6706,7 @@ procedure TMainForm.KillProcess(Sender: TObject);
       if pid = Conn.ThreadId then
         LogSQL(f_('Ignoring own process id #%d when trying to kill it.', [pid]))
       else try
-        Conn.Query(Conn.SqlProvider.GetSql(qKillQuery, [pid]));
+        Conn.Query(qKillQuery, [pid]);
       except
         on E:EDbError do begin
           if Conn.LastErrorCode <> ER_NO_SUCH_THREAD then
diff --git a/source/tabletools.pas b/source/tabletools.pas
index a68accb74..0099572ee 100644
--- a/source/tabletools.pas
+++ b/source/tabletools.pas
@@ -2255,7 +2255,7 @@ procedure TfrmTableTools.DoBeforeGenerateData(Sender: TObject);
     Exit;
   Conn := MainForm.ActiveConnection;
   if Conn.SqlProvider.Has(qDisableForeignKeyChecks) then
-    Conn.Query(Conn.SqlProvider.GetSql(qDisableForeignKeyChecks));
+    Conn.Query(qDisableForeignKeyChecks);
 end;
 
 
@@ -2268,7 +2268,7 @@ procedure TfrmTableTools.DoAfterGenerateData(Sender: TObject);
     Exit;
   Conn := MainForm.ActiveConnection;
   if Conn.SqlProvider.Has(qEnableForeignKeyChecks) then
-    Conn.Query(Conn.SqlProvider.GetSql(qEnableForeignKeyChecks));
+    Conn.Query(qEnableForeignKeyChecks);
 end;
 
 
diff --git a/source/usermanager.lfm b/source/usermanager.lfm
index e494bd991..9abae1b4e 100644
--- a/source/usermanager.lfm
+++ b/source/usermanager.lfm
@@ -115,7 +115,9 @@ object UserManagerForm: TUserManagerForm
         Left = 1
         Top = 2
         Caption = 'Add'
+        DropdownMenu = menuAdd
         ImageIndex = 45
+        Style = tbsDropDown
         OnClick = btnAddUserClick
       end
       object btnCloneUser: TToolButton
@@ -691,4 +693,17 @@ object UserManagerForm: TUserManagerForm
       end
     end
   end
+  object menuAdd: TPopupMenu
+    OnPopup = menuAddPopup
+    Left = 80
+    Top = 280
+    object menuItemUser: TMenuItem
+      Caption = 'User'
+      OnClick = btnAddUserClick
+    end
+    object menuItemRole: TMenuItem
+      Caption = 'Role'
+      OnClick = menuItemRoleClick
+    end
+  end
 end
diff --git a/source/usermanager.pas b/source/usermanager.pas
index 1635af525..4e229d185 100644
--- a/source/usermanager.pas
+++ b/source/usermanager.pas
@@ -40,6 +40,7 @@   TUser = class(TObject)
       constructor Create;
       function HostRequiresNameResolve: Boolean;
       procedure ParseSettings(GrantOrCreate: String; Priv: TPrivObj);
+      function IsUser: Boolean;
   end;
   PUser = ^TUser;
   TUserList = TObjectList<TUser>;
@@ -113,6 +114,9 @@   TUserManagerForm = class(TExtForm)
     comboSSL: TComboBox;
     lblSSL: TLabel;
     editFilterUsers: TEditButton;
+    menuAdd: TPopupMenu;
+    menuItemUser: TMenuItem;
+    menuItemRole: TMenuItem;
     procedure btnCancelClick(Sender: TObject);
     procedure editFromHostButtonClick(Sender: TObject);
     procedure editPasswordButtonClick(Sender: TObject);
@@ -165,10 +169,13 @@   TUserManagerForm = class(TExtForm)
     procedure FormResize(Sender: TObject);
     procedure editFilterUsersButtonClick(Sender: TObject);
     procedure editFilterUsersChange(Sender: TObject);
+    procedure menuItemRoleClick(Sender: TObject);
+    procedure menuAddPopup(Sender: TObject);
   private
     { Private declarations }
     FUsers: TUserList;
     FModified, FAdded: Boolean;
+    FHasIsRole: Boolean;
     FCloneGrants: TStringList;
     FPrivObjects: TPrivObjList;
     FPrivsGlobal, FPrivsDb, FPrivsTable, FPrivsRoutine, FPrivsColumn: TStringList;
@@ -177,6 +184,7 @@   TUserManagerForm = class(TExtForm)
     procedure SetModified(Value: Boolean);
     property Modified: Boolean read FModified write SetModified;
     function GetPrivByNode(Node: PVirtualNode): TPrivObj;
+    function SelectUserNode(User: TUser): Boolean;
   public
     { Public declarations }
   end;
@@ -272,7 +280,7 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
   U: TUser;
   tmp, PasswordExpr, IsRoleExpr: String;
   SkipNameResolve,
-  HasPassword, HasAuthString, HasIsRole: Boolean;
+  HasPassword, HasAuthString: Boolean;
   PasswordLengthMatters: Boolean;
   UserTableColumns: TStringList;
 
@@ -387,13 +395,13 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
     tmp := FConnection.GetSessionVariable('skip_name_resolve');
     SkipNameResolve := LowerCase(tmp) = 'on';
 
-    FConnection.Query('FLUSH PRIVILEGES');
+    FConnection.Query(qReloadPrivileges);
 
     // Peek into user table structure, and find out where the password hash is stored
     UserTableColumns := FConnection.GetCol('SHOW COLUMNS FROM '+FConnection.QuoteIdent('mysql')+'.'+FConnection.QuoteIdent('user'));
     HasPassword := UserTableColumns.IndexOf('password') > -1;
     HasAuthString := UserTableColumns.IndexOf('authentication_string') > -1;
-    HasIsRole := UserTableColumns.IndexOf('is_role') > -1;
+    FHasIsRole := UserTableColumns.IndexOf('is_role') > -1;
     if HasPassword and (not HasAuthString) then
       PasswordExpr := 'password'
     else if (not HasPassword) and HasAuthString then
@@ -403,7 +411,7 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
     else
       Raise Exception.Create(_('No password hash column available'));
     PasswordExpr := PasswordExpr + ' AS ' + FConnection.QuoteIdent('password');
-    IsRoleExpr := IfThen(HasIsRole, 'is_role', FConnection.EscapeString('N')+' AS is_role');
+    IsRoleExpr := IfThen(FHasIsRole, 'is_role', FConnection.EscapeString('N')+' AS is_role');
 
     Users := FConnection.GetResults(
       'SELECT '+
@@ -421,7 +429,7 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
       U.Password := Users.Col('password');
       U.IsRole := UpperCase(Users.Col('is_role')) = 'Y';
       U.Problem := upNone;
-      if not U.IsRole then begin
+      if U.IsUser then begin
         if Length(U.Password) = 0 then
           U.Problem := upEmptyPassword;
         if PasswordLengthMatters and (not (Length(U.Password) in [0, 16, 41])) then
@@ -567,6 +575,7 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
 begin
   // Parse and display privileges of focused user
   UserSelected := Assigned(Node);
+  User := nil;
   FPrivObjects.Clear;
   Caption := MainForm.actUserManager.Caption;
   editUsername.Clear;
@@ -586,7 +595,7 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
 
   if UserSelected then begin
     User := Sender.GetNodeData(Node);
-    if not User.IsRole then
+    if User.IsUser then
       UserHost := FConnection.EscapeString(User.Username)+'@'+FConnection.EscapeString(User.Host)
     else
       UserHost := FConnection.EscapeString(User.Username);
@@ -745,7 +754,7 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
 
 
     CreateUser := '';
-    if not User.IsRole then try
+    if User.IsUser then try
       CreateUser := FConnection.GetVar('SHOW CREATE USER '+UserHost);
       User.ParseSettings(CreateUser, nil);
     except
@@ -793,32 +802,32 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
   treePrivs.Invalidate;
 
   // Enable input boxes
-  lblUsername.Enabled := UserSelected;
-  editUsername.Enabled := UserSelected;
-  lblFromHost.Enabled := UserSelected and (not User.IsRole);
-  editFromHost.Enabled := UserSelected and (not User.IsRole);
-  lblPassword.Enabled := UserSelected and (not User.IsRole);
-  editPassword.Enabled := UserSelected and (not User.IsRole);
-  lblRepeatPassword.Enabled := UserSelected and (not User.IsRole);
-  editRepeatPassword.Enabled := UserSelected and (not User.IsRole);
+  lblUsername.Enabled := UserSelected and User.IsUser;
+  editUsername.Enabled := UserSelected and User.IsUser;
+  lblFromHost.Enabled := UserSelected and User.IsUser;
+  editFromHost.Enabled := UserSelected and User.IsUser;
+  lblPassword.Enabled := UserSelected and User.IsUser;
+  editPassword.Enabled := UserSelected and User.IsUser;
+  lblRepeatPassword.Enabled := UserSelected and User.IsUser;
+  editRepeatPassword.Enabled := UserSelected and User.IsUser;
   tabCredentials.Enabled := UserSelected;
-  lblMaxQueries.Enabled := UserSelected and (FConnection.ServerVersionInt >= 40002);
+  lblMaxQueries.Enabled := UserSelected and User.IsUser and (FConnection.ServerVersionInt >= 40002);
 
-  tabLimitations.Enabled := UserSelected;
+  tabLimitations.Enabled := UserSelected and User.IsUser;
   spinMaxQueries.Enabled := lblMaxQueries.Enabled;
   lblMaxUpdates.Enabled := lblMaxQueries.Enabled;
   spinMaxUpdates.Enabled := lblMaxQueries.Enabled;
   lblMaxConnections.Enabled := lblMaxQueries.Enabled;
   spinMaxConnections.Enabled := lblMaxQueries.Enabled;
-  lblMaxUserConnections.Enabled := UserSelected and (FConnection.ServerVersionInt >= 50003);
+  lblMaxUserConnections.Enabled := UserSelected and User.IsUser and (FConnection.ServerVersionInt >= 50003);
   spinMaxUserConnections.Enabled := lblMaxUserConnections.Enabled;
 
-  tabSSL.Enabled := UserSelected;
-  comboSSL.Enabled := UserSelected;
+  tabSSL.Enabled := UserSelected and User.IsUser;
+  comboSSL.Enabled := UserSelected and User.IsUser;
 
   btnAddObject.Enabled := UserSelected;
   btnDeleteUser.Enabled := UserSelected;
-  btnCloneUser.Enabled := UserSelected and (not FAdded);
+  btnCloneUser.Enabled := UserSelected and (not FAdded) and User.IsUser;
 
   // Ensure the warning hint is displayed or cleared. This is not done when the dialog shows up.
   listUsers.OnHotChange(Sender, nil, Node);
@@ -835,7 +844,7 @@ procedure TUserManagerForm.listUsersGetImageIndex(Sender: TBaseVirtualTree; Node
   User := Sender.GetNodeData(Node);
   case Kind of
     ikNormal, ikSelected: begin
-      if not User.IsRole then
+      if User.IsUser then
         ImageIndex := 43
       else
         ImageIndex := 95;
@@ -1087,8 +1096,7 @@ procedure TUserManagerForm.btnAddUserClick(Sender: TObject);
 var
   P: TPrivObj;
   User: TUser;
-  OldUser, NodeUser: PUser;
-  Node: PVirtualNode;
+  OldUser: PUser;
   NewHost, NewPassword, NewUsername: String;
 begin
   // Create new or clone existing user
@@ -1116,20 +1124,63 @@ procedure TUserManagerForm.btnAddUserClick(Sender: TObject);
   FUsers.Add(User);
   FAdded := True;
   InvalidateVT(listUsers, VTREE_NOTLOADED, True);
-  // Select newly added item.
+  SelectUserNode(User);
+  Modified := True;
+  // Focus the user name entry box.
+  PageControlSettings.ActivePage := tabCredentials;
+  editUserName.TrySetFocus;
+end;
+
+
+procedure TUserManagerForm.menuItemRoleClick(Sender: TObject);
+var
+  RoleName, CreateRole: String;
+  User: TUser;
+begin
+  // Try to unfocus current user which triggers saving modifications.
+  listUsers.FocusedNode := nil;
+  if Assigned(listUsers.FocusedNode) then
+    Exit;
+
+  // Add role
+  RoleName := '';
+  if not InputQuery('Create role', 'Role name', RoleName) then
+    Exit;
+
+  try
+    CreateRole := FConnection.SqlProvider.GetSql(qCreateRole, [FConnection.EscapeString(RoleName)]);
+    FConnection.Query(CreateRole);
+    User := TUser.Create;
+    User.Username := RoleName;
+    User.IsRole := True;
+    FUsers.Add(User);
+    InvalidateVT(listUsers, VTREE_NOTLOADED, True);
+    SelectUserNode(User);
+    Modified := True;
+  except
+    on E:Exception do
+      ErrorDialog(E.Message);
+  end;
+end;
+
+
+function TUserManagerForm.SelectUserNode(User: TUser): Boolean;
+var
+  NodeUser: PUser;
+  Node: PVirtualNode;
+begin
+  // Select a user node in the listing
+  Result := False;
   Node := listUsers.GetFirst;
   while Assigned(Node) do begin
     NodeUser := listUsers.GetNodeData(Node);
     if User = NodeUser^ then begin
       SelectNode(listUsers, Node);
+      Result := True;
       break;
     end;
     Node := listUsers.GetNextSibling(Node);
   end;
-  Modified := True;
-  // Focus the user name entry box.
-  PageControlSettings.ActivePage := tabCredentials;
-  editUserName.TrySetFocus;
 end;
 
 
@@ -1216,7 +1267,7 @@ procedure TUserManagerForm.btnSaveClick(Sender: TObject);
   if FAdded then begin
     FocusedUser.Username := editUsername.Text;
     FocusedUser.Host := editFromHost.Text;
-    if IsEmpty(editPassword.Text) then
+    if IsEmpty(editPassword.Text) and FocusedUser.IsUser then
       FocusedUser.Problem := upEmptyPassword;
   end else begin
     if (FocusedUser.Problem=upNone)
@@ -1226,8 +1277,14 @@ procedure TUserManagerForm.btnSaveClick(Sender: TObject);
       FocusedUser.Problem := upEmptyPassword
   end;
 
-  OrgUserHost := FConnection.EscapeString(FocusedUser.Username)+'@'+FConnection.EscapeString(FocusedUser.Host);
-  UserHost := FConnection.EscapeString(editUsername.Text)+'@'+FConnection.EscapeString(editFromHost.Text);
+  if FocusedUser.IsUser then begin
+    OrgUserHost := FConnection.EscapeString(FocusedUser.Username)+'@'+FConnection.EscapeString(FocusedUser.Host);
+    UserHost := FConnection.EscapeString(editUsername.Text)+'@'+FConnection.EscapeString(editFromHost.Text);
+  end
+  else begin
+    OrgUserHost := FConnection.EscapeString(FocusedUser.Username);
+    UserHost := FConnection.EscapeString(editUsername.Text);
+  end;
 
   try
     // Ensure we have a unique user@host combination
@@ -1235,7 +1292,7 @@ procedure TUserManagerForm.btnSaveClick(Sender: TObject);
       if User = FocusedUser^ then
         Continue;
       if (User.Username = editUsername.Text) and (User.Host = editFromHost.Text) then
-        raise EInputError.CreateFmt('User <%s@%s> already exists.', [editUsername.Text, editFromHost.Text]);
+        raise EInputError.CreateFmt('User or role <%s@%s> already exists.', [editUsername.Text, editFromHost.Text]);
     end;
 
     // Check input: Ensure we have a unique user@host combination
@@ -1317,8 +1374,8 @@ procedure TUserManagerForm.btnSaveClick(Sender: TObject);
         FConnection.ShowWarnings;
       end;
 
-      // Global options
-      if P.DBObj.NodeType = lntNone then begin
+      // Global options for a user
+      if (P.DBObj.NodeType = lntNone) and FocusedUser.IsUser then begin
         // SSL
         case comboSSL.ItemIndex of
           1: RequireClause := 'SSL';
@@ -1353,22 +1410,30 @@ procedure TUserManagerForm.btnSaveClick(Sender: TObject);
 
     // Rename user
     if (FocusedUser.Username <> editUsername.Text) or (FocusedUser.Host <> editFromHost.Text) then begin
-      if FConnection.ServerVersionInt >= 50002 then
-        FConnection.Query('RENAME USER '+OrgUserHost+' TO '+UserHost)
-      else begin
-        Tables := Explode(',', 'user,db,tables_priv,columns_priv');
-        for Table in Tables do begin
-          FConnection.Query('UPDATE '+FConnection.QuoteIdent('mysql')+'.'+FConnection.QuoteIdent(Table)+
-            ' SET User='+FConnection.EscapeString(editUsername.Text)+', Host='+FConnection.EscapeString(editFromHost.Text)+
-            ' WHERE User='+FConnection.EscapeString(FocusedUser.Username)+' AND Host='+FConnection.EscapeString(FocusedUser.Host)
-            );
+
+      if FocusedUser.IsUser then begin
+        if FConnection.ServerVersionInt >= 50002 then
+          FConnection.Query('RENAME USER '+OrgUserHost+' TO '+UserHost)
+        else begin
+          Tables := Explode(',', 'user,db,tables_priv,columns_priv');
+          for Table in Tables do begin
+            FConnection.Query('UPDATE '+FConnection.QuoteIdent('mysql')+'.'+FConnection.QuoteIdent(Table)+
+              ' SET User='+FConnection.EscapeString(editUsername.Text)+', Host='+FConnection.EscapeString(editFromHost.Text)+
+              ' WHERE User='+FConnection.EscapeString(FocusedUser.Username)+' AND Host='+FConnection.EscapeString(FocusedUser.Host)
+              );
+          end;
+          FreeAndNil(Tables);
         end;
-        FreeAndNil(Tables);
+      end
+
+      else begin
+        // todo: Rename role
       end;
+
       FConnection.ShowWarnings;
     end;
 
-    FConnection.Query('FLUSH PRIVILEGES');
+    FConnection.Query(qReloadPrivileges);
     Modified := False;
     FAdded := False;
     FocusedUser.Username := editUsername.Text;
@@ -1414,24 +1479,40 @@ procedure TUserManagerForm.btnDeleteUserClick(Sender: TObject);
     FUsers.Remove(User^);
     listUsers.DeleteNode(listUsers.FocusedNode);
     FAdded := False;
-  end else if MessageDialog(f_('Delete user %s@%s?', [User.Username, User.Host]), mtConfirmation, [mbYes, mbCancel]) = mrYes then begin
-    UserHost := FConnection.EscapeString(User.Username)+'@'+FConnection.EscapeString(User.Host);
-    try
-      // Revoke privs explicitly, required on old servers.
-      // Newer servers only require one DROP USER query
-      if FConnection.ServerVersionInt < 50002 then begin
-        FConnection.Query('REVOKE ALL PRIVILEGES ON *.* FROM '+UserHost);
-        FConnection.Query('REVOKE GRANT OPTION ON *.* FROM '+UserHost);
+  end else begin
+    UserHost := IfThen(
+      User.IsUser,
+      FConnection.EscapeString(User.Username)+'@'+FConnection.EscapeString(User.Host),
+      FConnection.EscapeString(User.Username)
+      );
+    if MessageDialog(f_('Delete user or role %s?', [UserHost]), mtConfirmation, [mbYes, mbCancel]) = mrYes then begin
+      try
+        // Revoke privs explicitly, required on old servers.
+        // Newer servers only require one DROP USER query
+        if FConnection.ServerVersionInt < 50002 then begin
+          FConnection.Query('REVOKE ALL PRIVILEGES ON *.* FROM '+UserHost);
+          FConnection.Query('REVOKE GRANT OPTION ON *.* FROM '+UserHost);
+        end;
+
+        // Actual deletion
+        if User.IsUser then begin
+          FConnection.Query(qDropUser, [
+            FConnection.EscapeString(User.Username),
+            FConnection.EscapeString(User.Host)
+            ]);
+        end
+        else begin
+          FConnection.Query(qDropRole, [
+            FConnection.EscapeString(User.Username)
+            ]);
+        end;
+        FConnection.Query(qReloadPrivileges);
+
+        FUsers.Remove(User^);
+        listUsers.DeleteNode(listUsers.FocusedNode);
+      except on E:EDbError do
+        ErrorDialog(E.Message);
       end;
-      if FConnection.ServerVersionInt < 40101 then
-        FConnection.Query('DELETE FROM mysql.user WHERE User='+FConnection.EscapeString(User.Username)+' AND Host='+FConnection.EscapeString(User.Host))
-      else
-        FConnection.Query('DROP USER '+UserHost);
-      FConnection.Query('FLUSH PRIVILEGES');
-      FUsers.Remove(User^);
-      listUsers.DeleteNode(listUsers.FocusedNode);
-    except on E:EDbError do
-      ErrorDialog(E.Message);
     end;
   end;
 end;
@@ -1445,6 +1526,11 @@ procedure TUserManagerForm.btnDiscardClick(Sender: TObject);
 end;
 
 
+procedure TUserManagerForm.menuAddPopup(Sender: TObject);
+begin
+  menuItemRole.Enabled := FHasIsRole;
+end;
+
 procedure TUserManagerForm.menuHostClick(Sender: TObject);
 begin
   // Insert predefined host
@@ -1635,6 +1721,11 @@ procedure TUser.ParseSettings(GrantOrCreate: String; Priv: TPrivObj);
 end;
 
 
+function TUser.IsUser: Boolean;
+begin
+  Result := not IsRole;
+end;
+
 
 { TPrivObj }
 

From 68aeb968f8d3bd52f474d30ada769dbcafa6754f Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 18 Mar 2026 19:50:46 +0100
Subject: [PATCH 19/45] fix: prevent crash due to unsupported edit-database
 feature on MS SQL

---
 source/main.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/main.pas b/source/main.pas
index 51fc8154e..a0a85e97a 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -7883,7 +7883,7 @@ procedure TMainForm.popupDBPopup(Sender: TObject);
     actQueryTable.Enabled := Obj.NodeType in [lntTable, lntView];
     actRunRoutines.Enabled := Obj.NodeType in [lntProcedure, lntFunction];
     menuClearDataTabFilter.Enabled := Obj.NodeType in [lntTable, lntView];
-    menuEditObject.Enabled := IsDb or IsObject;
+    menuEditObject.Enabled := (IsDb and Obj.Connection.Parameters.IsAnyMySQL) or IsObject;
     // Enable certain items which are valid only here
     menuTreeExpandAll.Enabled := True;
     menuTreeCollapseAll.Enabled := True;

From d2c9c964711853e98c00d873ed9dfdc70c3ebab9 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 18 Mar 2026 19:53:34 +0100
Subject: [PATCH 20/45] fix: reset tree refresh marker earlier, so
 SetActiveDatabase triggers events and hides the table + data tab after
 dropping tables

Closes #2431
---
 source/main.pas | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index a0a85e97a..aae41fc26 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -10078,6 +10078,7 @@ procedure TMainForm.RefreshTree(FocusNewObject: TDBObject=nil);
       if Assigned(DBNode) then
         DBtree.ResetNode(DBNode);
     end;
+    FTreeRefreshInProgress := False;
 
     // Reselect active or new database if present. Could have been deleted or renamed.
     try
@@ -10088,9 +10089,9 @@ procedure TMainForm.RefreshTree(FocusNewObject: TDBObject=nil);
       if not Assigned(DBtree.FocusedNode) then
         SetActiveDatabase('', FocusNewObject.Connection);
     except
+      on E:Exception do
+        LogSQL('RefreshTree: '+E.Message, lcInfo);
     end;
-    if not Assigned(DBtree.FocusedNode) then
-      raise Exception.Create(_('Could not find node to focus.'));
 
   finally
     FTreeRefreshInProgress := False;

From 91b90bc6c35ecae310d197ec08c7e6f89f79ffd7 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 18 Mar 2026 20:16:43 +0100
Subject: [PATCH 21/45] fix: missing anchors and autosize in user manager form

---
 source/usermanager.lfm | 247 +++++++++++++++++++++++++----------------
 1 file changed, 150 insertions(+), 97 deletions(-)

diff --git a/source/usermanager.lfm b/source/usermanager.lfm
index 9abae1b4e..59ce405a6 100644
--- a/source/usermanager.lfm
+++ b/source/usermanager.lfm
@@ -20,21 +20,22 @@ object UserManagerForm: TUserManagerForm
   OnShow = FormShow
   object Splitter1: TSplitter
     Cursor = crSizeWE
-    Left = 234
-    Height = 316
+    Left = 229
+    Height = 328
     Top = 0
     Width = 8
     OnMoved = FormResize
   end
   object pnlLeft: TPanel
     Left = 5
-    Height = 311
+    Height = 323
     Top = 5
     Width = 224
     Align = alLeft
-    BorderSpacing.Around = 5
+    BorderSpacing.Left = 5
+    BorderSpacing.Top = 5
     BevelOuter = bvNone
-    ClientHeight = 311
+    ClientHeight = 323
     ClientWidth = 224
     Constraints.MinWidth = 20
     ParentBackground = False
@@ -57,8 +58,8 @@ object UserManagerForm: TUserManagerForm
       AnchorSideBottom.Control = pnlLeft
       AnchorSideBottom.Side = asrBottom
       Left = 0
-      Height = 243
-      Top = 68
+      Height = 257
+      Top = 66
       Width = 224
       Anchors = [akTop, akLeft, akRight, akBottom]
       Header.AutoSizeIndex = 0
@@ -99,13 +100,14 @@ object UserManagerForm: TUserManagerForm
       AnchorSideTop.Control = lblUsers
       AnchorSideTop.Side = asrBottom
       Left = 0
-      Height = 30
+      Height = 28
       Top = 15
       Width = 224
       AutoSize = True
       ButtonHeight = 28
       ButtonWidth = 58
       Caption = 'ToolBar1'
+      EdgeBorders = []
       Images = MainForm.ImageListMain
       List = True
       ShowCaptions = True
@@ -113,7 +115,7 @@ object UserManagerForm: TUserManagerForm
       Wrapable = False
       object btnAddUser: TToolButton
         Left = 1
-        Top = 2
+        Top = 0
         Caption = 'Add'
         DropdownMenu = menuAdd
         ImageIndex = 45
@@ -121,15 +123,15 @@ object UserManagerForm: TUserManagerForm
         OnClick = btnAddUserClick
       end
       object btnCloneUser: TToolButton
-        Left = 59
-        Top = 2
+        Left = 71
+        Top = 0
         Caption = 'Clone'
         ImageIndex = 3
         OnClick = btnAddUserClick
       end
       object btnDeleteUser: TToolButton
-        Left = 119
-        Top = 2
+        Left = 131
+        Top = 0
         Caption = 'Delete'
         ImageIndex = 46
         OnClick = btnDeleteUserClick
@@ -143,7 +145,7 @@ object UserManagerForm: TUserManagerForm
       AnchorSideRight.Side = asrBottom
       Left = 0
       Height = 23
-      Top = 45
+      Top = 43
       Width = 224
       Anchors = [akTop, akLeft, akRight]
       ButtonWidth = 23
@@ -159,27 +161,29 @@ object UserManagerForm: TUserManagerForm
     end
   end
   object pnlRight: TPanel
-    Left = 247
-    Height = 311
+    Left = 237
+    Height = 323
     Top = 5
-    Width = 375
+    Width = 385
     Align = alClient
-    BorderSpacing.Around = 5
+    BorderSpacing.Top = 5
+    BorderSpacing.Right = 5
     BevelOuter = bvNone
-    ClientHeight = 311
-    ClientWidth = 375
+    ClientHeight = 323
+    ClientWidth = 385
     Constraints.MinWidth = 20
     ParentBackground = False
     TabOrder = 1
     object tlbObjects: TToolBar
       Left = 0
-      Height = 30
+      Height = 28
       Top = 145
-      Width = 375
+      Width = 385
       AutoSize = True
       ButtonHeight = 28
       ButtonWidth = 79
       Caption = 'tlbObjects'
+      EdgeBorders = []
       Images = MainForm.ImageListMain
       List = True
       ParentShowHint = False
@@ -190,7 +194,7 @@ object UserManagerForm: TUserManagerForm
       object lblAllowAccessTo: TLabel
         Left = 1
         Height = 28
-        Top = 2
+        Top = 0
         Width = 121
         AutoSize = False
         Caption = 'Allow access to:'
@@ -200,7 +204,7 @@ object UserManagerForm: TUserManagerForm
       object btnAddObject: TToolButton
         Left = 122
         Hint = 'Add object ...'
-        Top = 2
+        Top = 0
         Caption = 'Add object'
         ImageIndex = 45
         OnClick = btnAddObjectClick
@@ -210,9 +214,9 @@ object UserManagerForm: TUserManagerForm
       AnchorSideTop.Control = tlbObjects
       AnchorSideTop.Side = asrBottom
       Left = 0
-      Height = 136
-      Top = 175
-      Width = 375
+      Height = 150
+      Top = 173
+      Width = 385
       Align = alClient
       Header.AutoSizeIndex = 0
       Header.Columns = <>
@@ -235,7 +239,7 @@ object UserManagerForm: TUserManagerForm
       Left = 0
       Height = 145
       Top = 0
-      Width = 375
+      Width = 385
       ActivePage = tabCredentials
       Align = alTop
       AutoSize = True
@@ -245,43 +249,49 @@ object UserManagerForm: TUserManagerForm
         AutoSize = True
         Caption = 'Credentials'
         ClientHeight = 117
-        ClientWidth = 367
+        ClientWidth = 377
         object lblUsername: TLabel
+          AnchorSideLeft.Control = tabCredentials
+          AnchorSideTop.Control = editUsername
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 7
+          Top = 9
           Width = 59
           BorderSpacing.Around = 5
           Caption = 'User &name:'
         end
         object lblFromHost: TLabel
-          AnchorSideTop.Control = editUsername
-          AnchorSideTop.Side = asrBottom
+          AnchorSideLeft.Control = tabCredentials
+          AnchorSideTop.Control = editFromHost
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 33
+          Top = 37
           Width = 57
           BorderSpacing.Around = 5
           Caption = 'From &host:'
           FocusControl = editFromHost
         end
         object lblPassword: TLabel
-          AnchorSideTop.Control = editFromHost
-          AnchorSideTop.Side = asrBottom
+          AnchorSideLeft.Control = tabCredentials
+          AnchorSideTop.Control = editPassword
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 61
+          Top = 65
           Width = 53
           BorderSpacing.Around = 5
           Caption = '&Password:'
           FocusControl = editPassword
         end
         object lblRepeatPassword: TLabel
-          AnchorSideTop.Control = editPassword
-          AnchorSideTop.Side = asrBottom
+          AnchorSideLeft.Control = tabCredentials
+          AnchorSideTop.Control = editRepeatPassword
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 89
+          Top = 93
           Width = 92
           BorderSpacing.Around = 5
           Caption = 'Repeat password:'
@@ -293,7 +303,7 @@ object UserManagerForm: TUserManagerForm
           Left = 178
           Height = 23
           Top = 89
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           EchoMode = emPassword
@@ -307,7 +317,7 @@ object UserManagerForm: TUserManagerForm
           Left = 178
           Height = 23
           Top = 61
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           ButtonWidth = 23
@@ -327,7 +337,7 @@ object UserManagerForm: TUserManagerForm
           Left = 178
           Height = 23
           Top = 33
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           ButtonWidth = 23
@@ -341,10 +351,11 @@ object UserManagerForm: TUserManagerForm
           OnChange = Modification
         end
         object editUsername: TEdit
+          AnchorSideTop.Control = tabCredentials
           Left = 178
           Height = 23
           Top = 5
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           TabOrder = 0
@@ -355,52 +366,58 @@ object UserManagerForm: TUserManagerForm
         AutoSize = True
         Caption = 'Limitations'
         ClientHeight = 117
-        ClientWidth = 367
+        ClientWidth = 377
         ImageIndex = 1
         object lblMaxQueries: TLabel
+          AnchorSideLeft.Control = tabLimitations
           AnchorSideTop.Control = spinMaxQueries
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 10
+          Top = 9
           Width = 91
           BorderSpacing.Around = 5
           Caption = 'Queries per hour:'
         end
         object lblMaxUpdates: TLabel
-          AnchorSideTop.Control = spinMaxQueries
-          AnchorSideTop.Side = asrBottom
+          AnchorSideLeft.Control = tabLimitations
+          AnchorSideTop.Control = spinMaxUpdates
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 33
+          Top = 37
           Width = 94
           BorderSpacing.Around = 5
           Caption = 'Updates per hour:'
         end
         object lblMaxConnections: TLabel
-          AnchorSideTop.Control = spinMaxUpdates
-          AnchorSideTop.Side = asrBottom
+          AnchorSideLeft.Control = tabLimitations
+          AnchorSideTop.Control = spinMaxConnections
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 61
+          Top = 65
           Width = 118
           BorderSpacing.Around = 5
           Caption = 'Connections per hour:'
         end
         object lblMaxUserConnections: TLabel
-          AnchorSideTop.Control = spinMaxConnections
-          AnchorSideTop.Side = asrBottom
+          AnchorSideLeft.Control = tabLimitations
+          AnchorSideTop.Control = spinMaxUserConnections
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 89
+          Top = 93
           Width = 143
           BorderSpacing.Around = 5
           Caption = 'Simultaneous connections:'
         end
         object spinMaxQueries: TSpinEditEx
+          AnchorSideTop.Control = tabLimitations
           Left = 178
           Height = 23
           Top = 5
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           MaxLength = 0
@@ -416,7 +433,7 @@ object UserManagerForm: TUserManagerForm
           Left = 178
           Height = 23
           Top = 33
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           MaxLength = 0
@@ -432,7 +449,7 @@ object UserManagerForm: TUserManagerForm
           Left = 178
           Height = 23
           Top = 61
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           MaxLength = 0
@@ -448,7 +465,7 @@ object UserManagerForm: TUserManagerForm
           Left = 178
           Height = 23
           Top = 89
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           MaxLength = 0
@@ -463,45 +480,51 @@ object UserManagerForm: TUserManagerForm
         AutoSize = True
         Caption = 'SSL options'
         ClientHeight = 117
-        ClientWidth = 367
+        ClientWidth = 377
         ImageIndex = 2
         object lblCipher: TLabel
-          AnchorSideTop.Control = comboSSL
-          AnchorSideTop.Side = asrBottom
+          AnchorSideLeft.Control = tabSSL
+          AnchorSideTop.Control = editCipher
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 33
+          Top = 37
           Width = 38
           BorderSpacing.Around = 5
           Caption = '&Cipher:'
           FocusControl = editCipher
         end
         object lblIssuer: TLabel
-          AnchorSideTop.Control = editCipher
-          AnchorSideTop.Side = asrBottom
+          AnchorSideLeft.Control = tabSSL
+          AnchorSideTop.Control = editIssuer
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 61
+          Top = 65
           Width = 33
           BorderSpacing.Around = 5
           Caption = '&Issuer:'
           FocusControl = editIssuer
         end
         object lblSubject: TLabel
-          AnchorSideTop.Control = editIssuer
-          AnchorSideTop.Side = asrBottom
+          AnchorSideLeft.Control = tabSSL
+          AnchorSideTop.Control = editSubject
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 89
+          Top = 93
           Width = 42
           BorderSpacing.Around = 5
           Caption = '&Subject:'
           FocusControl = editSubject
         end
         object lblSSL: TLabel
+          AnchorSideLeft.Control = tabSSL
+          AnchorSideTop.Control = comboSSL
+          AnchorSideTop.Side = asrCenter
           Left = 5
           Height = 15
-          Top = 7
+          Top = 9
           Width = 64
           BorderSpacing.Around = 5
           Caption = '&Require SSL:'
@@ -512,7 +535,7 @@ object UserManagerForm: TUserManagerForm
           Left = 178
           Height = 23
           Top = 33
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           TabOrder = 1
@@ -525,7 +548,7 @@ object UserManagerForm: TUserManagerForm
           Left = 178
           Height = 23
           Top = 61
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           TabOrder = 2
@@ -538,7 +561,7 @@ object UserManagerForm: TUserManagerForm
           Left = 178
           Height = 23
           Top = 89
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           TabOrder = 3
@@ -546,10 +569,11 @@ object UserManagerForm: TUserManagerForm
           OnChange = Modification
         end
         object comboSSL: TComboBox
+          AnchorSideTop.Control = tabSSL
           Left = 178
           Height = 23
           Top = 5
-          Width = 184
+          Width = 194
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           ItemHeight = 15
@@ -567,56 +591,85 @@ object UserManagerForm: TUserManagerForm
     end
   end
   object pnlBottom: TPanel
+    AnchorSideLeft.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
     Left = 5
-    Height = 38
-    Top = 321
+    Height = 26
+    Top = 333
     Width = 617
     Align = alBottom
+    AutoSize = True
     BorderSpacing.Around = 5
-    ClientHeight = 38
+    BevelOuter = bvNone
+    ClientHeight = 26
     ClientWidth = 617
     ParentBackground = False
     TabOrder = 3
     object btnDiscard: TSpeedButton
-      Left = 413
-      Height = 25
-      Top = 6
-      Width = 95
-      Anchors = [akTop, akRight]
+      AnchorSideRight.Control = btnCancel
+      AnchorSideBottom.Control = pnlBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 412
+      Height = 26
+      Top = 0
+      Width = 100
+      Anchors = [akRight, akBottom]
+      AutoSize = True
+      BorderSpacing.Left = 5
+      Constraints.MinWidth = 100
       Caption = 'Discard'
       Images = MainForm.ImageListMain
       ImageIndex = 40
       OnClick = btnDiscardClick
     end
     object btnSave: TSpeedButton
-      Left = 312
-      Height = 25
-      Top = 6
-      Width = 95
-      Anchors = [akTop, akRight]
+      AnchorSideRight.Control = btnDiscard
+      AnchorSideBottom.Control = pnlBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 307
+      Height = 26
+      Top = 0
+      Width = 100
+      Anchors = [akRight, akBottom]
+      AutoSize = True
+      Constraints.MinWidth = 100
       Caption = 'Save'
       Images = MainForm.ImageListMain
       ImageIndex = 10
       OnClick = btnSaveClick
     end
     object btnCancel: TSpeedButton
-      Left = 514
-      Height = 25
-      Top = 6
-      Width = 95
-      Anchors = [akTop, akRight]
+      AnchorSideRight.Control = pnlBottom
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Control = pnlBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 517
+      Height = 26
+      Top = 0
+      Width = 100
+      Anchors = [akRight, akBottom]
+      AutoSize = True
+      BorderSpacing.Left = 5
+      Constraints.MinWidth = 100
       Caption = 'Close'
       Images = MainForm.ImageListMain
       ImageIndex = 26
       OnClick = btnCancelClick
     end
     object lblWarning: TLabel
-      Left = 8
-      Height = 24
-      Top = 6
-      Width = 201
-      Anchors = [akTop, akLeft, akRight]
-      AutoSize = False
+      AnchorSideLeft.Control = pnlBottom
+      AnchorSideBottom.Control = pnlBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 0
+      Height = 15
+      Top = 11
+      Width = 58
+      Anchors = [akLeft, akBottom]
+      Caption = 'lblWarning'
+      Constraints.MaxWidth = 200
       Layout = tlCenter
       WordWrap = True
     end

From ebd60b3118b8509b2a68063f4f3396e2cb6da30a Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 20 Mar 2026 10:03:23 +0100
Subject: [PATCH 22/45] feat: when nodes are filtered, change "Check all"
 action to "Change all visible"

Refs #1983
---
 source/tabletools.pas | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/source/tabletools.pas b/source/tabletools.pas
index 0099572ee..a65d63f8c 100644
--- a/source/tabletools.pas
+++ b/source/tabletools.pas
@@ -1063,7 +1063,7 @@ procedure TfrmTableTools.editDatabaseTableFilterChange(Sender: TObject);
   Node: PVirtualNode;
   Obj: PDBObject;
   rxdb, rxtable: TRegExpr;
-  NodeMatches: Boolean;
+  NodeMatches, SomeHidden: Boolean;
   Errors: TStringList;
 begin
   // Immediately apply database filter
@@ -1077,6 +1077,7 @@ procedure TfrmTableTools.editDatabaseTableFilterChange(Sender: TObject);
   rxtable.Expression := '('+StringReplace(editTableFilter.Text, ';', '|', [rfReplaceAll])+')';
 
   Errors := TStringList.Create;
+  SomeHidden := False;
 
   TreeObjects.BeginUpdate;
   Node := TreeObjects.GetFirst;
@@ -1110,6 +1111,8 @@ procedure TfrmTableTools.editDatabaseTableFilterChange(Sender: TObject);
       end;
     end;
     TreeObjects.IsVisible[Node] := NodeMatches;
+    if not NodeMatches then
+      SomeHidden := True;
 
     Node := TreeObjects.GetNextInitialized(Node);
   end;
@@ -1120,6 +1123,10 @@ procedure TfrmTableTools.editDatabaseTableFilterChange(Sender: TObject);
 
   //editDatabaseFilter.RightButton.Visible := editDatabaseFilter.Text <> '';
   //editTableFilter.RightButton.Visible := editTableFilter.Text <> '';
+  if SomeHidden then
+    menuCheckAll.Caption := _('Check all visible')
+  else
+    menuCheckAll.Caption := _('Check all');
   timerCalcSize.Enabled := False;
   timerCalcSize.Enabled := True;
 end;
@@ -2487,7 +2494,7 @@ procedure TfrmTableTools.CheckAllClick(Sender: TObject);
   DBNode, ObjNode: PVirtualNode;
   WantedType: TListNodeType;
   DBObj: PDBObject;
-  CheckNone: Boolean;
+  CheckNone, DoCheck: Boolean;
   InvertCheck: Boolean;
   CheckedNodes: Int64;
 begin
@@ -2505,25 +2512,29 @@ procedure TfrmTableTools.CheckAllClick(Sender: TObject);
   CheckedNodes := 0;
   while Assigned(ObjNode) do begin
     DBObj := TreeObjects.GetNodeData(ObjNode);
+
     if CheckNone then
-      TreeObjects.CheckState[ObjNode] := csUncheckedNormal
-    else if InvertCheck then begin
-      if ObjNode.CheckState in CheckedStates then
-        TreeObjects.CheckState[ObjNode] := csUncheckedNormal
-      else
-        TreeObjects.CheckState[ObjNode] := csCheckedNormal;
+      DoCheck := False
+    else if not TreeObjects.IsVisible[ObjNode] then
+      DoCheck := False
+    else if InvertCheck then
+      DoCheck := not (ObjNode.CheckState in CheckedStates)
+    else
+      DoCheck := (WantedType = lntNone) or (DBObj.NodeType = WantedType) or (DBObj.GroupType = WantedType);
+
+    if DoCheck then begin
+      TreeObjects.CheckState[ObjNode] := csCheckedNormal;
+      Inc(CheckedNodes);
     end
     else begin
-      if (WantedType = lntNone) or (DBObj.NodeType = WantedType) or (DBObj.GroupType = WantedType) then
-        TreeObjects.CheckState[ObjNode] := csCheckedNormal
-      else
-        TreeObjects.CheckState[ObjNode] := csUncheckedNormal;
+      TreeObjects.CheckState[ObjNode] := csUncheckedNormal;
     end;
-    if ObjNode.CheckState = csCheckedNormal then
-      Inc(CheckedNodes);
+
     TreeObjects.RepaintNode(ObjNode);
     ObjNode := TreeObjects.GetNextSibling(ObjNode);
   end;
+
+  // Update parent node's checkbox
   if CheckedNodes = 0 then
     TreeObjects.CheckState[DBNode] := csUncheckedNormal
   else if CheckedNodes = TreeObjects.ChildCount[DBNode] then

From 6c219b958da26e9200848a2d45e9bbabd4078ce9 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 20 Mar 2026 10:05:22 +0100
Subject: [PATCH 23/45] fix: EAbort crash when copying text from SynEdit
 without a highlighter

This removes code for copying SynEdit contents in a rich text variant to clipboard, which seems highly unreliable and anyway mostly unwanted. See https://www.heidisql.com/forum.php?t=44899
---
 source/main.pas | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index aae41fc26..16467c265 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -11955,17 +11955,10 @@ procedure TMainForm.actCopyOrCutExecute(Sender: TObject);
     end else if CurrentControl is TSynMemo then begin
       SynMemo := CurrentControl as TSynMemo;
       if SynMemo.SelAvail then begin
-        // Create both text and RTF clipboard format, so rich text applications can paste highlighted SQL
-        //Clipboard.Open;
-        //Clipboard.TryAsText := SynMemo.SelText;
-        //Exporter := TSynExporterHTML.Create(Self);
-        //Exporter.Highlighter := SynMemo.Highlighter;
-        //Exporter.ExportAll(Explode(sLineBreak, SynMemo.SelText));
-        if DoCut then SynMemo.CutToClipboard
-        else SynMemo.CopyToClipboard;
-        //Exporter.CopyToClipboard;
-        //Clipboard.Close;
-        //Exporter.Free;
+        if DoCut then
+          SynMemo.CutToClipboard
+        else
+          SynMemo.CopyToClipboard;
       end;
     end else begin
       raise Exception.Create('Unhandled control in clipboard action: '+IfThen(Assigned(CurrentControl), CurrentControl.Name, 'nil'));

From f79d9a590884025e68a1fa64c6b5a38b2f5896e1 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 20 Mar 2026 10:07:01 +0100
Subject: [PATCH 24/45] feat: do not require MySQL's RELOAD privilege just for
 opening the user manager

See https://www.heidisql.com/forum.php?t=44896
---
 source/usermanager.pas | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/source/usermanager.pas b/source/usermanager.pas
index 4e229d185..712b4227d 100644
--- a/source/usermanager.pas
+++ b/source/usermanager.pas
@@ -395,7 +395,13 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
     tmp := FConnection.GetSessionVariable('skip_name_resolve');
     SkipNameResolve := LowerCase(tmp) = 'on';
 
-    FConnection.Query(qReloadPrivileges);
+    try
+      FConnection.Query(qReloadPrivileges);
+    except
+      // FLUSH PRIVILEGE may fail due to missing RELOAD privilege.
+      // Proceed anyway, it's still ok to read/see the users
+      on E:EDbError do;
+    end;
 
     // Peek into user table structure, and find out where the password hash is stored
     UserTableColumns := FConnection.GetCol('SHOW COLUMNS FROM '+FConnection.QuoteIdent('mysql')+'.'+FConnection.QuoteIdent('user'));

From 32f3e6bece30e64c34a1da247e5746c1f2ea6965 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 20 Mar 2026 10:10:46 +0100
Subject: [PATCH 25/45] fix: editing table data on mysql versions without
 generated column support

Refs #462
---
 extra/locale/heidisql.po | 6 +++---
 source/const.inc         | 3 ++-
 source/main.pas          | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extra/locale/heidisql.po b/extra/locale/heidisql.po
index 8202af7fb..1c18c7034 100644
--- a/extra/locale/heidisql.po
+++ b/extra/locale/heidisql.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2026-03-18 19:40+0100\n"
+"PO-Revision-Date: 2026-03-20 10:10+0100\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
 "Language: en\n"
@@ -4931,8 +4931,8 @@ msgstr "Could not find node to focus."
 msgid "Could not load full row data."
 msgstr "Could not load full row data."
 
-msgid "Column %s is defined as generated. You cannot edit its content."
-msgstr "Column %s is defined as generated. You cannot edit its content."
+msgid "Column %s is defined as generated per \"%s\". You cannot edit its content."
+msgstr "Column %s is defined as generated per \"%s\". You cannot edit its content."
 
 #: main.pas:8462
 msgid "Not available on %s"
diff --git a/source/const.inc b/source/const.inc
index aa72a55e3..247a739c1 100644
--- a/source/const.inc
+++ b/source/const.inc
@@ -99,7 +99,8 @@ const
   MsgUnhandledNetType: String = 'Unhandled connection type (%d)';
   MsgUnhandledControl: String = 'Unhandled control in %s';
   MsgDisconnect: String = 'Connection to %s closed at %s';
-  TextInvalidColumn: String = '?';
+  // This must be an empty string, otherwise TTableColumn's get GenerationExpression=XYZ on old servers
+  TextInvalidColumn: String = '';
   FILEFILTER_SQLITEDB = '*.sqlite3;*.sqlite;*.db;*.s3db';
   FILEEXT_SQLITEDB = 'sqlite3';
   PROPOSAL_ITEM_HEIGHT = 18;
diff --git a/source/main.pas b/source/main.pas
index 16467c265..50ec5a202 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -10773,7 +10773,7 @@ procedure TMainForm.AnyGridEditing(Sender: TBaseVirtualTree; Node:
         if Assigned(ColInfo) then begin
           Allowed := ColInfo.GenerationExpression.IsEmpty;
           if not Allowed then
-            ErrorDialog(f_('Column %s is defined as generated. You cannot edit its content.', [IntToStr(Column)]));
+            ErrorDialog(f_('Column %s is defined as generated per "%s". You cannot edit its content.', [IntToStr(Column), ColInfo.GenerationExpression]));
         end;
       end;
 

From e940863e5da2b17c2a37f9b28192f9f1622773cf Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 20 Mar 2026 13:26:36 +0100
Subject: [PATCH 26/45] fix: solution for #2431 breaks other stuff, reverting a
 part of it

Refs #2436
---
 source/main.pas | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/main.pas b/source/main.pas
index 50ec5a202..c3f1fd389 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -10078,7 +10078,6 @@ procedure TMainForm.RefreshTree(FocusNewObject: TDBObject=nil);
       if Assigned(DBNode) then
         DBtree.ResetNode(DBNode);
     end;
-    FTreeRefreshInProgress := False;
 
     // Reselect active or new database if present. Could have been deleted or renamed.
     try

From 02cf4cbe28bfc007ddda74e61d01c843103f4db8 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 20 Mar 2026 15:17:08 +0100
Subject: [PATCH 27/45] fix: allow non existent SQLite files, only complain
 when its *path* does not exist

Refs #2437
---
 extra/locale/heidisql.po | 8 +++++++-
 source/dbconnection.pas  | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/extra/locale/heidisql.po b/extra/locale/heidisql.po
index 1c18c7034..1080553df 100644
--- a/extra/locale/heidisql.po
+++ b/extra/locale/heidisql.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2026-03-20 10:10+0100\n"
+"PO-Revision-Date: 2026-03-20 15:16+0100\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
 "Language: en\n"
@@ -6809,3 +6809,9 @@ msgstr "Show reverse foreign keys"
 
 msgid "Login cancelled"
 msgstr "Login cancelled"
+
+msgid "Folder in path does not exist: %s"
+msgstr "Folder in path does not exist: %s"
+
+msgid "File does not yet exist, will be created now: %s"
+msgstr "File does not yet exist, will be created now: %s"
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index ed6c1d134..bfa19d150 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -2856,6 +2856,7 @@ procedure TSQLiteConnection.SetActive(Value: Boolean);
   ErrorHint: String;
   FileNames, EncryptionParams: TStringList;
   MainFile, DbAlias, Param, ParamName: String;
+  MainFileDir: String;
   i, SplitPos, ParamValue: Integer;
   CipherIndex, ConfigResult: Integer;
   ParamWasSet: Boolean;
@@ -2866,8 +2867,12 @@ procedure TSQLiteConnection.SetActive(Value: Boolean);
 
   if Value then begin
     // Fixes "out of memory" crash in sqlite3_open, see issue #1367
+    MainFileDir := ExtractFilePath(MainFile);
+    MainFileDir := IncludeTrailingPathDelimiter(MainFileDir);
+    if not DirectoryExists(MainFileDir) then
+      raise EDbError.Create(f_('Folder in path does not exist: %s', [MainFile]));
     if not FileExists(MainFile) then
-      raise EDbError.Create(f_('File does not exist: %s', [MainFile]));
+      Log(lcInfo, f_('File does not yet exist, will be created now: %s', [MainFile]));
 
     DoBeforeConnect;
 

From 96717cda762706462333d521769ea3c24ce2dbdd Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Tue, 24 Mar 2026 12:13:47 +0100
Subject: [PATCH 28/45] feat: support assigning roles to a user or role

Refs #1155
---
 extra/locale/heidisql.po      |  20 +++-
 source/dbstructures.mysql.pas |   2 +
 source/dbstructures.pas       |   3 +-
 source/usermanager.lfm        | 153 ++++++++++++++++-----------
 source/usermanager.pas        | 191 ++++++++++++++++++++++++++++++----
 5 files changed, 283 insertions(+), 86 deletions(-)

diff --git a/extra/locale/heidisql.po b/extra/locale/heidisql.po
index 1080553df..236ad26e8 100644
--- a/extra/locale/heidisql.po
+++ b/extra/locale/heidisql.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2026-03-20 15:16+0100\n"
+"PO-Revision-Date: 2026-03-24 12:08+0100\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
 "Language: en\n"
@@ -6815,3 +6815,21 @@ msgstr "Folder in path does not exist: %s"
 
 msgid "File does not yet exist, will be created now: %s"
 msgstr "File does not yet exist, will be created now: %s"
+
+msgid "Create role"
+msgstr "Create role"
+
+msgid "Role name"
+msgstr "Role name"
+
+msgid "Roles"
+msgstr "Roles"
+
+msgid "Assigned"
+msgstr "Assigned"
+
+msgid "Yes, with admin option"
+msgstr "Yes, with admin option"
+
+msgid "No password hash column available"
+msgstr "No password hash column available"
diff --git a/source/dbstructures.mysql.pas b/source/dbstructures.mysql.pas
index 717feada9..e312ea467 100644
--- a/source/dbstructures.mysql.pas
+++ b/source/dbstructures.mysql.pas
@@ -3399,6 +3399,8 @@ function TMySqlProvider.GetSql(AId: TQueryId): string;
     qCreateRole: Result := 'CREATE ROLE %s';
     qDropRole: Result := 'DROP ROLE %s';
     qReloadPrivileges: Result := 'FLUSH PRIVILEGES';
+    qGrantRole: Result := 'GRANT %s TO %s%s';
+    qRevokeRole: Result := 'REVOKE %s FROM %s';
     else Result := inherited;
   end;
 end;
diff --git a/source/dbstructures.pas b/source/dbstructures.pas
index 6f0129323..a4d1b7d70 100644
--- a/source/dbstructures.pas
+++ b/source/dbstructures.pas
@@ -48,7 +48,8 @@ interface
     qForeignKeyDrop, qGetTableColumns, qGetCollations, qGetCollationsExtended, qGetCharsets,
     qGetReverseForeignKeys, qExplain, qSetTimezone,
     qShowFunctionStatus, qShowProcedureStatus, qShowTriggers, qShowEvents, qShowCreateTrigger,
-    qHelpKeyword, qShowWarnings, qGetEnumTypes, qDropUser, qCreateRole, qDropRole, qReloadPrivileges);
+    qHelpKeyword, qShowWarnings, qGetEnumTypes,
+    qDropUser, qCreateRole, qDropRole, qReloadPrivileges, qGrantRole, qRevokeRole);
   TSqlProvider = class
     strict protected
       FNetType: TNetType;
diff --git a/source/usermanager.lfm b/source/usermanager.lfm
index 59ce405a6..e624d5d01 100644
--- a/source/usermanager.lfm
+++ b/source/usermanager.lfm
@@ -16,7 +16,6 @@ object UserManagerForm: TUserManagerForm
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  OnResize = FormResize
   OnShow = FormShow
   object Splitter1: TSplitter
     Cursor = crSizeWE
@@ -24,7 +23,6 @@ object UserManagerForm: TUserManagerForm
     Height = 328
     Top = 0
     Width = 8
-    OnMoved = FormResize
   end
   object pnlLeft: TPanel
     Left = 5
@@ -174,67 +172,6 @@ object UserManagerForm: TUserManagerForm
     Constraints.MinWidth = 20
     ParentBackground = False
     TabOrder = 1
-    object tlbObjects: TToolBar
-      Left = 0
-      Height = 28
-      Top = 145
-      Width = 385
-      AutoSize = True
-      ButtonHeight = 28
-      ButtonWidth = 79
-      Caption = 'tlbObjects'
-      EdgeBorders = []
-      Images = MainForm.ImageListMain
-      List = True
-      ParentShowHint = False
-      ShowCaptions = True
-      ShowHint = True
-      TabOrder = 1
-      Wrapable = False
-      object lblAllowAccessTo: TLabel
-        Left = 1
-        Height = 28
-        Top = 0
-        Width = 121
-        AutoSize = False
-        Caption = 'Allow access to:'
-        Layout = tlCenter
-        Transparent = False
-      end
-      object btnAddObject: TToolButton
-        Left = 122
-        Hint = 'Add object ...'
-        Top = 0
-        Caption = 'Add object'
-        ImageIndex = 45
-        OnClick = btnAddObjectClick
-      end
-    end
-    object treePrivs: TLazVirtualStringTree
-      AnchorSideTop.Control = tlbObjects
-      AnchorSideTop.Side = asrBottom
-      Left = 0
-      Height = 150
-      Top = 173
-      Width = 385
-      Align = alClient
-      Header.AutoSizeIndex = 0
-      Header.Columns = <>
-      Header.MainColumn = -1
-      Images = MainForm.ImageListMain
-      IncrementalSearch = isAll
-      TabOrder = 2
-      TreeOptions.AutoOptions = [toAutoDropExpand, toAutoTristateTracking, toAutoDeleteMovedNodes, toAutoChangeScale]
-      TreeOptions.MiscOptions = [toAcceptOLEDrop, toCheckSupport, toFullRepaintOnResize, toInitOnSave, toToggleOnDblClick, toWheelPanning, toEditOnClick]
-      TreeOptions.PaintOptions = [toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toThemeAware, toUseBlendedImages, toUseExplorerTheme, toHideTreeLinesIfThemed]
-      OnChecked = treePrivsChecked
-      OnExpanded = treePrivsExpanded
-      OnGetText = treePrivsGetText
-      OnPaintText = treePrivsPaintText
-      OnGetImageIndex = treePrivsGetImageIndex
-      OnInitChildren = treePrivsInitChildren
-      OnInitNode = treePrivsInitNode
-    end
     object PageControlSettings: TPageControl
       Left = 0
       Height = 145
@@ -589,6 +526,96 @@ object UserManagerForm: TUserManagerForm
         end
       end
     end
+    object PageControlAccess: TPageControl
+      Left = 0
+      Height = 178
+      Top = 145
+      Width = 385
+      ActivePage = tabPrivileges
+      Align = alClient
+      TabIndex = 0
+      TabOrder = 1
+      object tabPrivileges: TTabSheet
+        Caption = 'Privileges'
+        ClientHeight = 150
+        ClientWidth = 377
+        object treePrivs: TLazVirtualStringTree
+          Left = 0
+          Height = 122
+          Top = 28
+          Width = 377
+          Align = alClient
+          DefaultText = 'Node'
+          Header.AutoSizeIndex = 0
+          Header.Columns = <>
+          Header.MainColumn = -1
+          Images = MainForm.ImageListMain
+          IncrementalSearch = isAll
+          TabOrder = 0
+          TreeOptions.AutoOptions = [toAutoDropExpand, toAutoTristateTracking, toAutoDeleteMovedNodes, toAutoChangeScale]
+          TreeOptions.MiscOptions = [toAcceptOLEDrop, toCheckSupport, toFullRepaintOnResize, toInitOnSave, toToggleOnDblClick, toWheelPanning, toEditOnClick]
+          TreeOptions.PaintOptions = [toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toThemeAware, toUseBlendedImages, toUseExplorerTheme, toHideTreeLinesIfThemed]
+          OnChecked = treePrivsChecked
+          OnExpanded = treePrivsExpanded
+          OnGetText = treePrivsGetText
+          OnPaintText = treePrivsPaintText
+          OnGetImageIndex = treePrivsGetImageIndex
+          OnInitChildren = treePrivsInitChildren
+          OnInitNode = treePrivsInitNode
+        end
+        object tlbObjects: TToolBar
+          Left = 0
+          Height = 28
+          Top = 0
+          Width = 377
+          AutoSize = True
+          ButtonHeight = 28
+          ButtonWidth = 79
+          Caption = 'tlbObjects'
+          EdgeBorders = []
+          Images = MainForm.ImageListMain
+          List = True
+          ParentShowHint = False
+          ShowCaptions = True
+          ShowHint = True
+          TabOrder = 1
+          Wrapable = False
+          object btnAddObject: TToolButton
+            Left = 1
+            Hint = 'Add object ...'
+            Top = 0
+            Caption = 'Add object'
+            ImageIndex = 45
+            OnClick = btnAddObjectClick
+          end
+        end
+      end
+      object tabRoles: TTabSheet
+        Caption = 'Roles'
+        ClientHeight = 150
+        ClientWidth = 377
+        object ValueListEditorRoles: TValueListEditor
+          Left = 0
+          Height = 150
+          Top = 0
+          Width = 377
+          Align = alClient
+          RowCount = 2
+          TabOrder = 0
+          OnSelectCell = ValueListEditorRolesSelectCell
+          OnSetEditText = ValueListEditorRolesSetEditText
+          TitleCaptions.Strings = (
+            'Role name'
+            'Assigned'
+          )
+          OnGetPickList = ValueListEditorRolesGetPickList
+          ColWidths = (
+            64
+            309
+          )
+        end
+      end
+    end
   end
   object pnlBottom: TPanel
     AnchorSideLeft.Control = Owner
diff --git a/source/usermanager.pas b/source/usermanager.pas
index 712b4227d..b93328e1f 100644
--- a/source/usermanager.pas
+++ b/source/usermanager.pas
@@ -5,10 +5,10 @@
 interface
 
 uses
-  SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ComCtrls, StdCtrls, EditBtn, Buttons,
-  ExtCtrls, ClipBrd, Generics.Collections, Generics.Defaults, RegExpr, extra_controls,
-  dbconnection, dbstructures, dbstructures.mysql, apphelpers, laz.VirtualTrees, Menus, SpinEx,
-  StrUtils;
+  SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ComCtrls, StdCtrls,
+  EditBtn, Buttons, ExtCtrls, ClipBrd, Generics.Collections, Generics.Defaults,
+  RegExpr, extra_controls, dbconnection, dbstructures, dbstructures.mysql,
+  apphelpers, laz.VirtualTrees, Menus, ValEdit, SpinEx, StrUtils;
 
 {$I const.inc}
 
@@ -36,14 +36,24 @@   TUser = class(TObject)
     MaxQueries, MaxUpdates, MaxConnections, MaxUserConnections, SSL: Integer;
     Problem: TUserProblem;
     IsRole: Boolean;
+    Roles: TStringList;
     public
+      class var RoleNo: String;
+      class var RoleYes: String;
+      class var RoleYesAdmin: String;
       constructor Create;
+      destructor Destroy; override;
       function HostRequiresNameResolve: Boolean;
       procedure ParseSettings(GrantOrCreate: String; Priv: TPrivObj);
       function IsUser: Boolean;
+      function AssignedRolesCount: Integer;
   end;
   PUser = ^TUser;
-  TUserList = TObjectList<TUser>;
+  TUserList = class(TObjectList<TUser>)
+    public
+      function GetRoleNames: TStringList;
+      function GetDefaultRoles: TStringList;
+  end;
 
   EInputError = class(Exception);
 
@@ -57,9 +67,6 @@   TUserManagerForm = class(TExtForm)
     listUsers: TLazVirtualStringTree;
     Splitter1: TSplitter;
     pnlRight: TPanel;
-    tlbObjects: TToolBar;
-    btnAddObject: TToolButton;
-    treePrivs: TLazVirtualStringTree;
     btnDiscard: TSpeedButton;
     lblUsers: TLabel;
     ToolBar1: TToolBar;
@@ -67,7 +74,6 @@   TUserManagerForm = class(TExtForm)
     btnDeleteUser: TToolButton;
     btnCloneUser: TToolButton;
     lblWarning: TLabel;
-    lblAllowAccessTo: TLabel;
     menuHost: TPopupMenu;
     menuHost1: TMenuItem;
     menuHostLocal4: TMenuItem;
@@ -117,6 +123,13 @@   TUserManagerForm = class(TExtForm)
     menuAdd: TPopupMenu;
     menuItemUser: TMenuItem;
     menuItemRole: TMenuItem;
+    PageControlAccess: TPageControl;
+    tabPrivileges: TTabSheet;
+    tabRoles: TTabSheet;
+    treePrivs: TLazVirtualStringTree;
+    tlbObjects: TToolBar;
+    btnAddObject: TToolButton;
+    ValueListEditorRoles: TValueListEditor;
     procedure btnCancelClick(Sender: TObject);
     procedure editFromHostButtonClick(Sender: TObject);
     procedure editPasswordButtonClick(Sender: TObject);
@@ -166,11 +179,16 @@   TUserManagerForm = class(TExtForm)
     procedure listUsersHotChange(Sender: TBaseVirtualTree; OldNode, NewNode: PVirtualNode);
     procedure udMaxQueriesClick(Sender: TObject; Button: TUDBtnType);
     procedure comboSSLChange(Sender: TObject);
-    procedure FormResize(Sender: TObject);
     procedure editFilterUsersButtonClick(Sender: TObject);
     procedure editFilterUsersChange(Sender: TObject);
     procedure menuItemRoleClick(Sender: TObject);
     procedure menuAddPopup(Sender: TObject);
+    procedure ValueListEditorRolesGetPickList(Sender: TObject;
+      const KeyName: string; Values: TStrings);
+    procedure ValueListEditorRolesSetEditText(Sender: TObject; ACol,
+      ARow: Integer; const Value: string);
+    procedure ValueListEditorRolesSelectCell(Sender: TObject; aCol,
+      aRow: Integer; var CanSelect: Boolean);
   private
     { Private declarations }
     FUsers: TUserList;
@@ -266,13 +284,6 @@ procedure TUserManagerForm.editPasswordButtonClick(Sender: TObject);
 end;
 
 
-procedure TUserManagerForm.FormResize(Sender: TObject);
-begin
-  // Manually right align "Add object" button
-  lblAllowAccessTo.Width := pnlRight.Width - btnAddObject.Width;
-end;
-
-
 procedure TUserManagerForm.FormShow(Sender: TObject);
 var
   Version, i: Integer;
@@ -428,6 +439,7 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
       'FROM '+FConnection.QuoteIdent('mysql')+'.'+FConnection.QuoteIdent('user')
       );
     FUsers := TUserList.Create(True);
+    ValueListEditorRoles.Strings.Clear;
     while not Users.Eof do begin
       U := TUser.Create;
       U.Username := Users.Col('user');
@@ -446,11 +458,13 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
       FUsers.Add(U);
       Users.Next;
     end;
+
     listUsers.Clear;
     InvalidateVT(listUsers, VTREE_NOTLOADED, False);
     FPrivObjects := TPrivObjList.Create(TPrivComparer.Create, True);
     Modified := False;
     FAdded := False;
+    tabRoles.TabVisible := FHasIsRole;
     listUsers.OnFocusChanged(listUsers, listUsers.FocusedNode, listUsers.FocusedColumn);
   except
     on E:EDbError do begin
@@ -517,6 +531,36 @@ procedure TUserManagerForm.udMaxQueriesClick(Sender: TObject; Button: TUDBtnType
 end;
 
 
+procedure TUserManagerForm.ValueListEditorRolesGetPickList(Sender: TObject;
+  const KeyName: string; Values: TStrings);
+begin
+  Values.Add(TUser.RoleNo);
+  Values.Add(TUser.RoleYes);
+  Values.Add(TUser.RoleYesAdmin);
+end;
+
+procedure TUserManagerForm.ValueListEditorRolesSelectCell(Sender: TObject;
+  aCol, aRow: Integer; var CanSelect: Boolean);
+begin
+  // Disallow assigning a role to itself
+  if (aRow <= 0) or (aRow > ValueListEditorRoles.Strings.Count) then
+    Exit;
+  if SameText(ValueListEditorRoles.Strings.Names[ARow-1], editUsername.Text) then
+    CanSelect := False
+  else
+    ValueListEditorRoles.ItemProps[aRow-1].EditStyle := esPickList;
+end;
+
+procedure TUserManagerForm.ValueListEditorRolesSetEditText(Sender: TObject;
+  ACol, ARow: Integer; const Value: string);
+var
+  User: PUser;
+begin
+  User := listUsers.GetNodeData(listUsers.FocusedNode);
+  if Assigned(User) and (User.Roles.CommaText <> ValueListEditorRoles.Strings.CommaText) then
+    Modification(Sender);
+end;
+
 procedure TUserManagerForm.listUsersAfterPaint(Sender: TBaseVirtualTree; TargetCanvas: TCanvas);
 begin
   // Background painting for sorted column
@@ -558,6 +602,7 @@ procedure TUserManagerForm.listUsersFocusChanging(Sender: TBaseVirtualTree; OldN
       end;
       mrNo: begin
         Allowed := True;
+        Modified := False;
         if FAdded then
           btnDeleteUser.Click;
       end;
@@ -573,13 +618,14 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
   P, Ptmp, PCol: TPrivObj;
   User: PUser;
   UserHost, Msg, CreateUser: String;
-  Grants, AllPNames, Cols: TStringList;
+  Grants, AllPNames, Cols, RoleNames, DefaultRoles: TStringList;
   rxTemp, rxGrant: TRegExpr;
   i, j: Integer;
   UserSelected: Boolean;
   Obj: TDBObject;
 begin
   // Parse and display privileges of focused user
+  listUsers.TrySetFocus; // Steal focus from roles, prevents empty cell bug
   UserSelected := Assigned(Node);
   User := nil;
   FPrivObjects.Clear;
@@ -598,6 +644,8 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
   editCipher.Clear;
   editIssuer.Clear;
   editSubject.Clear;
+  tabPrivileges.Caption := _('Privileges');
+  tabRoles.Caption := _('Roles');
 
   if UserSelected then begin
     User := Sender.GetNodeData(Node);
@@ -758,7 +806,34 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
       end;
     end;
 
+    // Find roles assigned to user or role:
+    // GRANT role_admin TO 'root'@'127.0.0.1';
+    // GRANT 'role space' TO 'root'@'127.0.0.1';
+    // GRANT role_space to 'role_admin' WITH ADMIN OPTION;
+    DefaultRoles := FUsers.GetDefaultRoles;
+    User.Roles.Assign(DefaultRoles);
+    RoleNames := FUsers.GetRoleNames;
+    for i:=0 to RoleNames.Count-1 do begin
+      RoleNames[i] := QuoteRegExprMetaChars(RoleNames[i]);
+    end;
+    rxGrant.Expression := '^GRANT\s+''?('+Implode('|', RoleNames)+')''?\s+TO\s+'+QuoteRegExprMetaChars(UserHost)+'(\s+WITH ADMIN OPTION)?$';
+    for i:=0 to Grants.Count-1 do begin
+      // Find selected priv objects via regular expression
+      if not rxGrant.Exec(Grants[i]) then begin
+        Continue;
+      end;
+      j := User.Roles.IndexOfName(rxGrant.Match[1]);
+      if j > -1 then begin
+        if rxGrant.MatchLen[2] > 0 then
+          User.Roles.ValueFromIndex[j] := User.RoleYesAdmin
+        else
+          User.Roles.ValueFromIndex[j] := User.RoleYes;
+      end;
+    end;
+    ValueListEditorRoles.Strings.Assign(User.Roles);
+    DefaultRoles.Free;
 
+    // Parse general user options
     CreateUser := '';
     if User.IsUser then try
       CreateUser := FConnection.GetVar('SHOW CREATE USER '+UserHost);
@@ -776,6 +851,8 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
     editCipher.Text := User.Cipher;
     editIssuer.Text := User.Issuer;
     editSubject.Text := User.Subject;
+    tabPrivileges.Caption := _('Privileges') + ' (' + FPrivObjects.Count.ToString + ')';
+    tabRoles.Caption := _('Roles') + ' (' + User.AssignedRolesCount.ToString + ')';
 
 
     // Generate grant code for column privs by hand
@@ -1150,7 +1227,7 @@ procedure TUserManagerForm.menuItemRoleClick(Sender: TObject);
 
   // Add role
   RoleName := '';
-  if not InputQuery('Create role', 'Role name', RoleName) then
+  if not InputQuery(_('Create role'), _('Role name'), RoleName) then
     Exit;
 
   try
@@ -1255,8 +1332,9 @@ procedure TUserManagerForm.btnSaveClick(Sender: TObject);
   FocusedUser: PUser;
   Tables, WithClauses: TStringList;
   P: TPrivObj;
-  i: Integer;
+  i, j: Integer;
   PasswordSet, WithGrant: Boolean;
+  RoleName, RoleAssigned: String;
 
   function GetObjectType(ObjType: String): String;
   begin
@@ -1380,7 +1458,7 @@ procedure TUserManagerForm.btnSaveClick(Sender: TObject);
         FConnection.ShowWarnings;
       end;
 
-      // Global options for a user
+      // General user options
       if (P.DBObj.NodeType = lntNone) and FocusedUser.IsUser then begin
         // SSL
         case comboSSL.ItemIndex of
@@ -1414,6 +1492,22 @@ procedure TUserManagerForm.btnSaveClick(Sender: TObject);
       FConnection.ShowWarnings;
     end;
 
+    // Add or remove roles
+    for i:=0 to ValueListEditorRoles.Strings.Count-1 do begin
+      j := FocusedUser.Roles.IndexOf(ValueListEditorRoles.Strings[i]);
+      if j = -1 then begin
+        RoleName := ValueListEditorRoles.Strings.Names[i];
+        RoleAssigned := ValueListEditorRoles.Strings.ValueFromIndex[i];
+        if RoleAssigned = TUser.RoleNo then
+          FConnection.Query(qRevokeRole, [FConnection.EscapeString(RoleName), OrgUserHost])
+        else if RoleAssigned = TUser.RoleYes then
+          FConnection.Query(qGrantRole, [FConnection.EscapeString(RoleName), OrgUserHost, ''])
+        else if RoleAssigned = TUser.RoleYesAdmin then
+          FConnection.Query(qGrantRole, [FConnection.EscapeString(RoleName), OrgUserHost, ' WITH ADMIN OPTION']);
+        FConnection.ShowWarnings;
+      end;
+    end;
+
     // Rename user
     if (FocusedUser.Username <> editUsername.Text) or (FocusedUser.Host <> editFromHost.Text) then begin
 
@@ -1450,6 +1544,7 @@ procedure TUserManagerForm.btnSaveClick(Sender: TObject);
     FocusedUser.Cipher := editCipher.Text;
     FocusedUser.Issuer := editIssuer.Text;
     FocusedUser.Subject := editSubject.Text;
+    FocusedUser.Roles.Assign(ValueListEditorRoles.Strings);
     listUsers.OnFocusChanged(listUsers, listUsers.FocusedNode, listUsers.FocusedColumn);
   except
     on E:EDbError do
@@ -1655,6 +1750,13 @@ constructor TUser.Create;
   SSL := 0;
   Problem := upNone;
   IsRole := False;
+  Roles := TStringList.Create;
+end;
+
+destructor TUser.Destroy;
+begin
+  Roles.Free;
+  inherited;
 end;
 
 function TUser.HostRequiresNameResolve: Boolean;
@@ -1733,6 +1835,47 @@ function TUser.IsUser: Boolean;
 end;
 
 
+function TUser.AssignedRolesCount: Integer;
+var
+  i: Integer;
+  Val: String;
+begin
+  Result := 0;
+  for i:=0 to Roles.Count-1 do begin
+    Val := Roles.ValueFromIndex[i];
+    if (Val = RoleYes) or (Val = RoleYesAdmin) then
+      Inc(Result);
+  end;
+end;
+
+
+{ TUserList }
+
+function TUserList.GetRoleNames: TStringList;
+var
+  u: TUser;
+begin
+  Result := TStringList.Create;
+  for u in Self do begin
+    if u.IsRole then
+      Result.Add(u.Username);
+  end;
+end;
+
+function TUserList.GetDefaultRoles: TStringList;
+var
+  RoleNames: TStringList;
+  i: Integer;
+begin
+  // Default role assignments with "no" value for all roles
+  Result := TStringList.Create;
+  RoleNames := GetRoleNames;
+  for i:=0 to RoleNames.Count-1 do
+    Result.AddPair(RoleNames[i], TUser.RoleNo);
+  RoleNames.Free;
+end;
+
+
 { TPrivObj }
 
 constructor TPrivObj.Create;
@@ -1774,4 +1917,10 @@ function TPrivComparer.Compare({$IF FPC_FULLVERSION<30203}constref{$ELSE}const{$
 end;
 
 
+initialization
+
+TUser.RoleNo := _('No');
+TUser.RoleYes := _('Yes');
+TUser.RoleYesAdmin := _('Yes, with admin option');
+
 end.

From 96d2aef310fefc3f98f8a62e95c4470fc29bbcfe Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Tue, 24 Mar 2026 15:12:05 +0100
Subject: [PATCH 29/45] feat: support assigning a default role to a user

Refs #1155
---
 extra/locale/heidisql.po      |  5 ++-
 source/dbstructures.mysql.pas |  1 +
 source/dbstructures.pas       |  2 +-
 source/usermanager.lfm        | 70 ++++++++++++++++++++++++++---------
 source/usermanager.pas        | 57 +++++++++++++++++++++++++---
 5 files changed, 110 insertions(+), 25 deletions(-)

diff --git a/extra/locale/heidisql.po b/extra/locale/heidisql.po
index 236ad26e8..d9595c297 100644
--- a/extra/locale/heidisql.po
+++ b/extra/locale/heidisql.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2026-03-24 12:08+0100\n"
+"PO-Revision-Date: 2026-03-24 15:09+0100\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
 "Language: en\n"
@@ -6833,3 +6833,6 @@ msgstr "Yes, with admin option"
 
 msgid "No password hash column available"
 msgstr "No password hash column available"
+
+msgid "Default role:"
+msgstr "Default role:"
diff --git a/source/dbstructures.mysql.pas b/source/dbstructures.mysql.pas
index e312ea467..04dfced44 100644
--- a/source/dbstructures.mysql.pas
+++ b/source/dbstructures.mysql.pas
@@ -3401,6 +3401,7 @@ function TMySqlProvider.GetSql(AId: TQueryId): string;
     qReloadPrivileges: Result := 'FLUSH PRIVILEGES';
     qGrantRole: Result := 'GRANT %s TO %s%s';
     qRevokeRole: Result := 'REVOKE %s FROM %s';
+    qSetDefaultRole: Result := 'SET DEFAULT ROLE %s FOR %s';
     else Result := inherited;
   end;
 end;
diff --git a/source/dbstructures.pas b/source/dbstructures.pas
index a4d1b7d70..c579723ef 100644
--- a/source/dbstructures.pas
+++ b/source/dbstructures.pas
@@ -49,7 +49,7 @@ interface
     qGetReverseForeignKeys, qExplain, qSetTimezone,
     qShowFunctionStatus, qShowProcedureStatus, qShowTriggers, qShowEvents, qShowCreateTrigger,
     qHelpKeyword, qShowWarnings, qGetEnumTypes,
-    qDropUser, qCreateRole, qDropRole, qReloadPrivileges, qGrantRole, qRevokeRole);
+    qDropUser, qCreateRole, qDropRole, qReloadPrivileges, qGrantRole, qRevokeRole, qSetDefaultRole);
   TSqlProvider = class
     strict protected
       FNetType: TNetType;
diff --git a/source/usermanager.lfm b/source/usermanager.lfm
index e624d5d01..60f03324b 100644
--- a/source/usermanager.lfm
+++ b/source/usermanager.lfm
@@ -174,7 +174,7 @@ object UserManagerForm: TUserManagerForm
     TabOrder = 1
     object PageControlSettings: TPageControl
       Left = 0
-      Height = 145
+      Height = 173
       Top = 0
       Width = 385
       ActivePage = tabCredentials
@@ -185,7 +185,7 @@ object UserManagerForm: TUserManagerForm
       object tabCredentials: TTabSheet
         AutoSize = True
         Caption = 'Credentials'
-        ClientHeight = 117
+        ClientHeight = 145
         ClientWidth = 377
         object lblUsername: TLabel
           AnchorSideLeft.Control = tabCredentials
@@ -237,10 +237,12 @@ object UserManagerForm: TUserManagerForm
         object editRepeatPassword: TEdit
           AnchorSideTop.Control = editPassword
           AnchorSideTop.Side = asrBottom
-          Left = 178
+          AnchorSideRight.Control = tabCredentials
+          AnchorSideRight.Side = asrBottom
+          Left = 150
           Height = 23
           Top = 89
-          Width = 194
+          Width = 222
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           EchoMode = emPassword
@@ -251,10 +253,12 @@ object UserManagerForm: TUserManagerForm
         object editPassword: TEditButton
           AnchorSideTop.Control = editFromHost
           AnchorSideTop.Side = asrBottom
-          Left = 178
+          AnchorSideRight.Control = tabCredentials
+          AnchorSideRight.Side = asrBottom
+          Left = 150
           Height = 23
           Top = 61
-          Width = 194
+          Width = 222
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           ButtonWidth = 23
@@ -271,10 +275,12 @@ object UserManagerForm: TUserManagerForm
         object editFromHost: TEditButton
           AnchorSideTop.Control = editUsername
           AnchorSideTop.Side = asrBottom
-          Left = 178
+          AnchorSideRight.Control = tabCredentials
+          AnchorSideRight.Side = asrBottom
+          Left = 150
           Height = 23
           Top = 33
-          Width = 194
+          Width = 222
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           ButtonWidth = 23
@@ -289,20 +295,48 @@ object UserManagerForm: TUserManagerForm
         end
         object editUsername: TEdit
           AnchorSideTop.Control = tabCredentials
-          Left = 178
+          AnchorSideRight.Control = tabCredentials
+          AnchorSideRight.Side = asrBottom
+          Left = 150
           Height = 23
           Top = 5
-          Width = 194
+          Width = 222
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 5
           TabOrder = 0
           OnChange = Modification
         end
+        object comboDefaultRole: TComboBox
+          AnchorSideTop.Control = editRepeatPassword
+          AnchorSideTop.Side = asrBottom
+          AnchorSideRight.Control = tabCredentials
+          AnchorSideRight.Side = asrBottom
+          Left = 150
+          Height = 23
+          Top = 117
+          Width = 222
+          Anchors = [akTop, akLeft, akRight]
+          BorderSpacing.Around = 5
+          ItemHeight = 15
+          Style = csDropDownList
+          TabOrder = 4
+        end
+        object lblDefaultRole: TLabel
+          AnchorSideLeft.Control = tabCredentials
+          AnchorSideTop.Control = comboDefaultRole
+          AnchorSideTop.Side = asrCenter
+          Left = 5
+          Height = 15
+          Top = 121
+          Width = 64
+          BorderSpacing.Around = 5
+          Caption = 'Default role:'
+        end
       end
       object tabLimitations: TTabSheet
         AutoSize = True
         Caption = 'Limitations'
-        ClientHeight = 117
+        ClientHeight = 145
         ClientWidth = 377
         ImageIndex = 1
         object lblMaxQueries: TLabel
@@ -416,7 +450,7 @@ object UserManagerForm: TUserManagerForm
       object tabSSL: TTabSheet
         AutoSize = True
         Caption = 'SSL options'
-        ClientHeight = 117
+        ClientHeight = 145
         ClientWidth = 377
         ImageIndex = 2
         object lblCipher: TLabel
@@ -528,8 +562,8 @@ object UserManagerForm: TUserManagerForm
     end
     object PageControlAccess: TPageControl
       Left = 0
-      Height = 178
-      Top = 145
+      Height = 150
+      Top = 173
       Width = 385
       ActivePage = tabPrivileges
       Align = alClient
@@ -537,11 +571,11 @@ object UserManagerForm: TUserManagerForm
       TabOrder = 1
       object tabPrivileges: TTabSheet
         Caption = 'Privileges'
-        ClientHeight = 150
+        ClientHeight = 122
         ClientWidth = 377
         object treePrivs: TLazVirtualStringTree
           Left = 0
-          Height = 122
+          Height = 94
           Top = 28
           Width = 377
           Align = alClient
@@ -592,11 +626,11 @@ object UserManagerForm: TUserManagerForm
       end
       object tabRoles: TTabSheet
         Caption = 'Roles'
-        ClientHeight = 150
+        ClientHeight = 122
         ClientWidth = 377
         object ValueListEditorRoles: TValueListEditor
           Left = 0
-          Height = 150
+          Height = 122
           Top = 0
           Width = 377
           Align = alClient
diff --git a/source/usermanager.pas b/source/usermanager.pas
index b93328e1f..ea0a6b762 100644
--- a/source/usermanager.pas
+++ b/source/usermanager.pas
@@ -32,7 +32,7 @@   TPrivComparer = class(TComparer<TPrivObj>)
   TUserProblem = (upNone, upEmptyPassword, upInvalidPasswordLen, upSkipNameResolve, upUnknown);
 
   TUser = class(TObject)
-    Username, Host, Password, Cipher, Issuer, Subject: String;
+    Username, Host, Password, Cipher, Issuer, Subject, DefaultRole: String;
     MaxQueries, MaxUpdates, MaxConnections, MaxUserConnections, SSL: Integer;
     Problem: TUserProblem;
     IsRole: Boolean;
@@ -51,7 +51,8 @@   TUser = class(TObject)
   PUser = ^TUser;
   TUserList = class(TObjectList<TUser>)
     public
-      function GetRoleNames: TStringList;
+      function GetRoleNames: TStringList; overload;
+      procedure GetRoleNames(Strings: TStrings); overload;
       function GetDefaultRoles: TStringList;
   end;
 
@@ -130,6 +131,8 @@   TUserManagerForm = class(TExtForm)
     tlbObjects: TToolBar;
     btnAddObject: TToolButton;
     ValueListEditorRoles: TValueListEditor;
+    lblDefaultRole: TLabel;
+    comboDefaultRole: TComboBox;
     procedure btnCancelClick(Sender: TObject);
     procedure editFromHostButtonClick(Sender: TObject);
     procedure editPasswordButtonClick(Sender: TObject);
@@ -193,7 +196,7 @@   TUserManagerForm = class(TExtForm)
     { Private declarations }
     FUsers: TUserList;
     FModified, FAdded: Boolean;
-    FHasIsRole: Boolean;
+    FHasIsRole, FHasDefaultRole: Boolean;
     FCloneGrants: TStringList;
     FPrivObjects: TPrivObjList;
     FPrivsGlobal, FPrivsDb, FPrivsTable, FPrivsRoutine, FPrivsColumn: TStringList;
@@ -257,6 +260,8 @@ procedure TUserManagerForm.FormCreate(Sender: TObject);
     'REPLICATION SLAVE ADMIN,SET USER,SLAVE MONITOR');
   FixVT(listUsers);
   FixVT(treePrivs);
+  FHasIsRole := False;
+  FHasDefaultRole := False;
 end;
 
 procedure TUserManagerForm.FormDestroy(Sender: TObject);
@@ -289,7 +294,7 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
   Version, i: Integer;
   Users: TDBQuery;
   U: TUser;
-  tmp, PasswordExpr, IsRoleExpr: String;
+  tmp, PasswordExpr, IsRoleExpr, DefaultRoleExpr: String;
   SkipNameResolve,
   HasPassword, HasAuthString: Boolean;
   PasswordLengthMatters: Boolean;
@@ -419,6 +424,7 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
     HasPassword := UserTableColumns.IndexOf('password') > -1;
     HasAuthString := UserTableColumns.IndexOf('authentication_string') > -1;
     FHasIsRole := UserTableColumns.IndexOf('is_role') > -1;
+    FHasDefaultRole := UserTableColumns.IndexOf('default_role') > -1;
     if HasPassword and (not HasAuthString) then
       PasswordExpr := 'password'
     else if (not HasPassword) and HasAuthString then
@@ -429,13 +435,15 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
       Raise Exception.Create(_('No password hash column available'));
     PasswordExpr := PasswordExpr + ' AS ' + FConnection.QuoteIdent('password');
     IsRoleExpr := IfThen(FHasIsRole, 'is_role', FConnection.EscapeString('N')+' AS is_role');
+    DefaultRoleExpr := IfThen(FHasDefaultRole, 'default_role', FConnection.EscapeString('')+' AS default_role');
 
     Users := FConnection.GetResults(
       'SELECT '+
       FConnection.QuoteIdent('user') + ', ' +
       FConnection.QuoteIdent('host') + ', ' +
       PasswordExpr + ', ' +
-      IsRoleExpr + ' ' +
+      IsRoleExpr + ', ' +
+      DefaultRoleExpr + ' ' +
       'FROM '+FConnection.QuoteIdent('mysql')+'.'+FConnection.QuoteIdent('user')
       );
     FUsers := TUserList.Create(True);
@@ -446,6 +454,7 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
       U.Host := Users.Col('host');
       U.Password := Users.Col('password');
       U.IsRole := UpperCase(Users.Col('is_role')) = 'Y';
+      U.DefaultRole := Users.Col('default_role');
       U.Problem := upNone;
       if U.IsUser then begin
         if Length(U.Password) = 0 then
@@ -635,6 +644,10 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
   editPassword.Clear;
   editPassword.TextHint := '';
   editRepeatPassword.Clear;
+  comboDefaultRole.Items.Clear;
+  comboDefaultRole.Items.Add(_('None'));
+  FUsers.GetRoleNames(comboDefaultRole.Items);
+  comboDefaultRole.ItemIndex := 0;
   spinMaxQueries.Value := 0;
   spinMaxUpdates.Value := 0;
   spinMaxConnections.Value := 0;
@@ -655,6 +668,10 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
       UserHost := FConnection.EscapeString(User.Username);
     editUsername.Text := User.Username;
     editFromHost.Text := User.Host;
+    i := comboDefaultRole.Items.IndexOf(User.DefaultRole);
+    if i > -1 then
+      comboDefaultRole.ItemIndex := i;
+
     Caption := Caption + ' - ' + User.Username;
 
     AllPNames := TStringList.Create;
@@ -893,6 +910,8 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
   editPassword.Enabled := UserSelected and User.IsUser;
   lblRepeatPassword.Enabled := UserSelected and User.IsUser;
   editRepeatPassword.Enabled := UserSelected and User.IsUser;
+  comboDefaultRole.Enabled := UserSelected and User.IsUser and FHasDefaultRole;
+  lblDefaultRole.Enabled := comboDefaultRole.Enabled;
   tabCredentials.Enabled := UserSelected;
   lblMaxQueries.Enabled := UserSelected and User.IsUser and (FConnection.ServerVersionInt >= 40002);
 
@@ -1508,6 +1527,23 @@ procedure TUserManagerForm.btnSaveClick(Sender: TObject);
       end;
     end;
 
+    // Set default role
+    if comboDefaultRole.Enabled and (comboDefaultRole.ItemIndex > -1) then begin
+      if comboDefaultRole.ItemIndex = 0 then begin
+        FConnection.Query(qSetDefaultRole, ['NONE', OrgUserHost]);
+      end
+      else try
+        RoleName := comboDefaultRole.Text;
+        RoleAssigned := ValueListEditorRoles.Strings.Values[RoleName];
+        if (RoleAssigned = TUser.RoleYes) or (RoleAssigned = TUser.RoleYesAdmin) then
+          FConnection.Query(qSetDefaultRole, [FConnection.EscapeString(RoleName), OrgUserHost]);
+      except
+        on E:EDbError do; // Happens when this role was not granted before
+      end;
+      FConnection.ShowWarnings;
+    end;
+
+
     // Rename user
     if (FocusedUser.Username <> editUsername.Text) or (FocusedUser.Host <> editFromHost.Text) then begin
 
@@ -1540,6 +1576,7 @@ procedure TUserManagerForm.btnSaveClick(Sender: TObject);
     FocusedUser.Host := editFromHost.Text;
     if editPassword.Modified then
       FocusedUser.Password := editPassword.Text;
+    FocusedUser.DefaultRole := IfThen(comboDefaultRole.ItemIndex=0, '', comboDefaultRole.Text);
     FocusedUser.SSL := comboSSL.ItemIndex;
     FocusedUser.Cipher := editCipher.Text;
     FocusedUser.Issuer := editIssuer.Text;
@@ -1740,6 +1777,7 @@ constructor TUser.Create;
   Username := '';
   Host := '';
   Password := '';
+  DefaultRole := '';
   Cipher := '';
   Issuer := '';
   Subject := '';
@@ -1862,6 +1900,15 @@ function TUserList.GetRoleNames: TStringList;
   end;
 end;
 
+procedure TUserList.GetRoleNames(Strings: TStrings);
+var
+  RoleNames: TStringList;
+begin
+  RoleNames := GetRoleNames;
+  Strings.AddStrings(RoleNames);
+  RoleNames.Free;
+end;
+
 function TUserList.GetDefaultRoles: TStringList;
 var
   RoleNames: TStringList;

From fc728cff566c853f3474db664d0c0a6d14fc83b5 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Tue, 24 Mar 2026 19:27:47 +0100
Subject: [PATCH 30/45] feat(packaging): create .rpm package through Makefile,
 plus let GH action run that step in release mode

Refs #2143
---
 .github/workflows/lazarus.yaml |  6 ++++++
 Makefile                       | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/.github/workflows/lazarus.yaml b/.github/workflows/lazarus.yaml
index 3460aa1e6..c37018592 100644
--- a/.github/workflows/lazarus.yaml
+++ b/.github/workflows/lazarus.yaml
@@ -163,12 +163,18 @@ jobs:
             - name: Install FPM
               run: sudo gem install --no-document fpm
 
+            - name: Install rpm tooling for fpm
+              run: sudo apt-get update && sudo apt-get install -y rpm
+
             - name: Create release archives (Linux GTK)
               run: make tar-gtk2
 
             - name: Create debian package
               run: make deb-package
 
+            - name: Build rpm package
+              run: make rpm-package
+
             - name: Create release archives (Linux QT5)
               run: make tar-qt5
 
diff --git a/Makefile b/Makefile
index 9c0b75c38..9675bce03 100644
--- a/Makefile
+++ b/Makefile
@@ -120,6 +120,38 @@ deb-package:
 	  ./deb/=/
 	rm control.txt
 
+rpm-package:
+	@echo "=== Creating rpm package"
+	rm -vrf rpm
+	cp -R package-skeleton rpm
+	find rpm -iname ".gitkeep" -exec rm -v {} +
+	cp -vR extra/locale/*.mo rpm/usr/share/heidisql/locale
+	cp -v extra/ini/*.ini  rpm/usr/share/heidisql
+	cp -v res/deb-package-icon.png rpm/usr/share/pixmaps/heidisql.png
+	cp -v $(BINQT6) rpm/usr/share/heidisql/heidisql
+	chmod +x rpm/usr/share/heidisql/heidisql
+	cp -v README.md LICENSE rpm/usr/share/doc/heidisql
+	mkdir -p dist
+	rm -vf dist/*.rpm
+
+	fpm -s dir -t rpm -n heidisql -v $(VERSION) \
+	  -p dist \
+	  --verbose \
+	  --rpm-os linux \
+	  --description "HeidiSQL SQL client (Qt6)" \
+	  --url "https://www.heidisql.com" \
+	  --license "GPL-2.0-or-later" \
+	  --depends "libQt6Widgets.so.6" \
+	  --depends "libQt6Gui.so.6" \
+	  --depends "libQt6Core.so.6" \
+	  --depends "libQt6Pas.so.6" \
+	  --depends "libssl.so.3" \
+	  --depends "libmariadb.so.3" \
+	  --depends "libpq.so.5" \
+	  --depends "libsqlite3.so.0" \
+	  --depends "libsybdb.so.5" \
+	  ./rpm/=/
+
 tar-gtk2:
 	@echo "=== Creating GTK2 archive"
 	rm -vrf tar

From 48eca5798aa0f399f4808e24fa14e736a3d68fbe Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Tue, 24 Mar 2026 19:29:45 +0100
Subject: [PATCH 31/45] enhance: increase supported table size and row limit
 for quick filter menu showing distinct values

---
 source/main.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index c3f1fd389..63ac5dd68 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -8180,7 +8180,7 @@ procedure TMainForm.QFvaluesClick(Sender: TObject);
   ShowStatusMsg(_('Fetching distinct values ...'));
   DbObj := ActiveDbObj;
   Conn := DbObj.Connection;
-  MaxSize := SIZE_GB;
+  MaxSize := SIZE_GB*2;
   ColumnHasIndex := DataGridResult.ColIsKeyPart(ResultCol)
     or DataGridResult.ColIsUniqueKeyPart(ResultCol)
     or DataGridResult.ColIsPrimaryKeyPart(ResultCol);
@@ -8194,7 +8194,7 @@ procedure TMainForm.QFvaluesClick(Sender: TObject);
     if not SynMemoFilter.Text.Trim.IsEmpty then
       Query := Query + ' WHERE ' + SynMemoFilter.Text.Trim + CRLF;
     Query := Query + ' GROUP BY '+Conn.QuoteIdent(ColName)+' ORDER BY c DESC, '+Conn.QuoteIdent(ColName);
-    Data := Conn.GetResults(Conn.ApplyLimitClause('SELECT', Query, 30, 0));
+    Data := Conn.GetResults(Conn.ApplyLimitClause('SELECT', Query, 50, 0));
     for i:=0 to Data.RecordCount-1 do begin
       if QFvalues.Count > i then
         Item := QFvalues[i]

From d7910c19ac9a9ed15007a98d8826ce3d39094ee7 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 25 Mar 2026 09:17:28 +0100
Subject: [PATCH 32/45] fix(ui): remove default "add user" event from add
 button, turn it into a pure dropdown button

Refs #1155
---
 source/const.inc       |  2 ++
 source/usermanager.lfm | 14 +++++++-------
 source/usermanager.pas | 10 ++++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/source/const.inc b/source/const.inc
index 247a739c1..57d0796b1 100644
--- a/source/const.inc
+++ b/source/const.inc
@@ -49,6 +49,8 @@ const
   ICONINDEX_EVENT = 80;
   ICONINDEX_KEYWORD = 25;
   ICONINDEX_FOLDER = 174;
+  ICONINDEX_USER = 43;
+  ICONINDEX_ROLE = 95;
 
   // Size of byte units
   {Kibibyte} SIZE_KB = Int64(1024);
diff --git a/source/usermanager.lfm b/source/usermanager.lfm
index 60f03324b..fb4fa1254 100644
--- a/source/usermanager.lfm
+++ b/source/usermanager.lfm
@@ -117,18 +117,17 @@ object UserManagerForm: TUserManagerForm
         Caption = 'Add'
         DropdownMenu = menuAdd
         ImageIndex = 45
-        Style = tbsDropDown
-        OnClick = btnAddUserClick
+        Style = tbsButtonDrop
       end
       object btnCloneUser: TToolButton
-        Left = 71
+        Left = 69
         Top = 0
         Caption = 'Clone'
         ImageIndex = 3
-        OnClick = btnAddUserClick
+        OnClick = menuItemUserClick
       end
       object btnDeleteUser: TToolButton
-        Left = 131
+        Left = 129
         Top = 0
         Caption = 'Delete'
         ImageIndex = 46
@@ -645,7 +644,7 @@ object UserManagerForm: TUserManagerForm
           OnGetPickList = ValueListEditorRolesGetPickList
           ColWidths = (
             64
-            309
+            292
           )
         end
       end
@@ -808,12 +807,13 @@ object UserManagerForm: TUserManagerForm
     end
   end
   object menuAdd: TPopupMenu
+    Images = MainForm.ImageListMain
     OnPopup = menuAddPopup
     Left = 80
     Top = 280
     object menuItemUser: TMenuItem
       Caption = 'User'
-      OnClick = btnAddUserClick
+      OnClick = menuItemUserClick
     end
     object menuItemRole: TMenuItem
       Caption = 'Role'
diff --git a/source/usermanager.pas b/source/usermanager.pas
index ea0a6b762..327e6e57e 100644
--- a/source/usermanager.pas
+++ b/source/usermanager.pas
@@ -139,7 +139,7 @@   TUserManagerForm = class(TExtForm)
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
-    procedure btnAddUserClick(Sender: TObject);
+    procedure menuItemUserClick(Sender: TObject);
     procedure btnDeleteUserClick(Sender: TObject);
     procedure listUsersFocusChanged(Sender: TBaseVirtualTree; Node: PVirtualNode;
       Column: TColumnIndex);
@@ -262,6 +262,8 @@ procedure TUserManagerForm.FormCreate(Sender: TObject);
   FixVT(treePrivs);
   FHasIsRole := False;
   FHasDefaultRole := False;
+  menuItemUser.ImageIndex := ICONINDEX_USER;
+  menuItemRole.ImageIndex := ICONINDEX_ROLE;
 end;
 
 procedure TUserManagerForm.FormDestroy(Sender: TObject);
@@ -947,9 +949,9 @@ procedure TUserManagerForm.listUsersGetImageIndex(Sender: TBaseVirtualTree; Node
   case Kind of
     ikNormal, ikSelected: begin
       if User.IsUser then
-        ImageIndex := 43
+        ImageIndex := ICONINDEX_USER
       else
-        ImageIndex := 95;
+        ImageIndex := ICONINDEX_ROLE;
     end;
     ikOverlay: begin
       if User.Password = '' then
@@ -1194,7 +1196,7 @@ procedure TUserManagerForm.treePrivsPaintText(Sender: TBaseVirtualTree; const Ta
 end;
 
 
-procedure TUserManagerForm.btnAddUserClick(Sender: TObject);
+procedure TUserManagerForm.menuItemUserClick(Sender: TObject);
 var
   P: TPrivObj;
   User: TUser;

From b0ab0fc6ea53856a9ff8c68d216c3420642f0612 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 25 Mar 2026 09:44:53 +0100
Subject: [PATCH 33/45] refactor: simplify some more calls to Query() with the
 overloaded variants

---
 source/dbconnection.pas            | 8 +++-----
 source/dbstructures.interbase.pas  | 2 +-
 source/dbstructures.mssql.pas      | 1 -
 source/dbstructures.mysql.pas      | 2 +-
 source/dbstructures.pas            | 1 +
 source/dbstructures.postgresql.pas | 1 -
 source/dbstructures.sqlite.pas     | 1 -
 source/main.pas                    | 2 +-
 8 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index bfa19d150..9975162a2 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -3360,7 +3360,7 @@ procedure TDBConnection.DoAfterConnect;
     else
       Offset := '-';
     Offset := Offset + Format('%.2d:%.2d', [Abs(Hours), Abs(Minutes)]);
-    Query(FSqlProvider.GetSql(qSetTimezone, [EscapeString(Offset)]));
+    Query(qSetTimezone, [EscapeString(Offset)]);
   end;
 
   // Process startup script
@@ -4299,7 +4299,6 @@ procedure TDBConnection.PrefetchCreateCode(Objects: TDBObjectList);
 procedure TDBConnection.SetDatabase(Value: String);
 var
   s: String;
-  UseQuery: String;
 begin
   Log(lcDebug, 'SetDatabase('+Value+'), FDatabase: '+FDatabase);
   if Value <> FDatabase then begin
@@ -4319,9 +4318,8 @@ procedure TDBConnection.SetDatabase(Value: String);
           s := s + ', ' + EscapeString('public');
       end else
         s := QuoteIdent(Value);
-      UseQuery := FSqlProvider.GetSql(qUSEQuery);
-      if not UseQuery.IsEmpty then begin
-        Query(FSqlProvider.GetSql(qUSEQuery, [s]), False);
+      if FSqlProvider.Has(qUSEQuery) then begin
+        Query(qUSEQuery, [s]);
       end;
       FDatabase := DeQuoteIdent(Value);
       if Assigned(FOnDatabaseChanged) then
diff --git a/source/dbstructures.interbase.pas b/source/dbstructures.interbase.pas
index 461f1f883..6a5f2b448 100644
--- a/source/dbstructures.interbase.pas
+++ b/source/dbstructures.interbase.pas
@@ -186,7 +186,7 @@ function TInterbaseProvider.GetSql(AId: TQueryId): string;
 begin
   case AId of
     qDatabaseDrop: Result := 'DROP DATABASE %s';
-    qEmptyTable: Result := 'TRUNCATE ';
+    qEmptyTable: Result := 'TRUNCATE %s';
     qRenameTable: Result := 'RENAME TABLE %s TO %s';
     qRenameView: Result := 'RENAME TABLE %s TO %s';
     qCurrentUserHost: Result := IfThen(
diff --git a/source/dbstructures.mssql.pas b/source/dbstructures.mssql.pas
index 1851ebbf8..a94c55f7f 100644
--- a/source/dbstructures.mssql.pas
+++ b/source/dbstructures.mssql.pas
@@ -450,7 +450,6 @@ function TMsSqlProvider.GetSql(AId: TQueryId): string;
       'xtype',
       'type'
       );
-    qEmptyTable: Result := 'DELETE FROM ';
     qRenameTable: Result := 'EXEC sp_rename %s, %s';
     qRenameView: Result := 'EXEC sp_rename %s, %s';
     qCurrentUserHost: Result := 'SELECT SYSTEM_USER';
diff --git a/source/dbstructures.mysql.pas b/source/dbstructures.mysql.pas
index 04dfced44..759ac9726 100644
--- a/source/dbstructures.mysql.pas
+++ b/source/dbstructures.mysql.pas
@@ -3247,7 +3247,7 @@ function TMySqlProvider.GetSql(AId: TQueryId): string;
 begin
   case AId of
     qDatabaseDrop: Result := 'DROP DATABASE %s';
-    qEmptyTable: Result := 'TRUNCATE ';
+    qEmptyTable: Result := 'TRUNCATE %s';
     qRenameTable: Result := 'RENAME TABLE %s TO %s';
     qRenameView: Result := 'RENAME TABLE %s TO %s';
     qCurrentUserHost: Result := 'SELECT CURRENT_USER()';
diff --git a/source/dbstructures.pas b/source/dbstructures.pas
index c579723ef..2a6750813 100644
--- a/source/dbstructures.pas
+++ b/source/dbstructures.pas
@@ -205,6 +205,7 @@ function TSqlProvider.GetSql(AId: TQueryId): string;
 begin
   // Basic default SQL snippets compatible to all or most servers
   case AId of
+    qEmptyTable: Result := 'DELETE FROM %s';
     qForeignKeyEventAction: Result := 'RESTRICT,CASCADE,SET NULL,NO ACTION';
     qOrderAsc: Result := 'ASC';
     qOrderDesc: Result := 'DESC';
diff --git a/source/dbstructures.postgresql.pas b/source/dbstructures.postgresql.pas
index 84014cdf5..aa49b7241 100644
--- a/source/dbstructures.postgresql.pas
+++ b/source/dbstructures.postgresql.pas
@@ -599,7 +599,6 @@ function TPostgreSQLProvider.GetSql(AId: TQueryId): string;
 begin
   case AId of
     qDatabaseDrop: Result := 'DROP SCHEMA %s';
-    qEmptyTable: Result := 'DELETE FROM ';
     qRenameTable: Result := 'ALTER TABLE %s RENAME TO %s';
     qRenameView: Result := 'ALTER VIEW %s RENAME TO %s';
     qCurrentUserHost: Result := 'SELECT CURRENT_USER';
diff --git a/source/dbstructures.sqlite.pas b/source/dbstructures.sqlite.pas
index 13c6efc48..e5f1eb90b 100644
--- a/source/dbstructures.sqlite.pas
+++ b/source/dbstructures.sqlite.pas
@@ -401,7 +401,6 @@ function TSQLiteProvider.GetSql(AId: TQueryId): string;
 begin
   case AId of
     qDatabaseDrop: Result := 'DROP DATABASE %s';
-    qEmptyTable: Result := 'DELETE FROM ';
     qRenameTable: Result := 'ALTER TABLE %s RENAME TO %s';
     qRenameView: Result := 'ALTER TABLE %s RENAME TO %s';
     qCurrentUserHost: Result := ''; // unsupported
diff --git a/source/main.pas b/source/main.pas
index 63ac5dd68..2c79e31c3 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -4541,7 +4541,7 @@ procedure TMainForm.actEmptyTablesExecute(Sender: TObject);
           Conn.Query(QueryDisableChecks);
         try
           for TableOrView in Objects do begin
-            Conn.Query(Conn.SqlProvider.GetSql(qEmptyTable) + TableOrView.QuotedName);
+            Conn.Query(qEmptyTable, [TableOrView.QuotedName]);
             ProgressStep;
           end;
           actRefresh.Execute;

From 1895959b261238a5f6fdb17898acebaafa300ebb Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Wed, 25 Mar 2026 19:57:29 +0100
Subject: [PATCH 34/45] fix: pre-select nothing in BOOL grid cell editor on
 PostgreSQL

Refs #1290
---
 source/dbconnection.pas | 4 ++--
 source/main.pas         | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 9975162a2..58b054cc6 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -8911,8 +8911,8 @@ function TPGQuery.Col(Column: Integer; IgnoreErrors: Boolean=False): String;
       SetString(AnsiStr, FConnection.Lib.PQgetvalue(FCurrentResults, FRecNoLocal, Column), FColumnLengths[Column]);
       if Datatype(Column).Category in [dtcBinary, dtcSpatial] then
         Result := String(AnsiStr)
-      else if Datatype(Column).Index = dbdtBool then
-        if AnsiStr='t' then Result := 'true' else Result := 'false'
+      else if (Datatype(Column).Index = dbdtBool) and (Length(AnsiStr) > 0) then
+        Result := IfThen(AnsiStr='t', 'true', 'false')
       else
         Result := Connection.DecodeAPIString(AnsiStr);
     end;
diff --git a/source/main.pas b/source/main.pas
index 2c79e31c3..8865540c6 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -10371,8 +10371,10 @@ procedure TMainForm.AnyGridGetText(Sender: TBaseVirtualTree; Node: PVirtualNode;
 
   RowNumber := Sender.GetNodeData(Node);
   Results.RecNo := RowNumber^;
-  if Results.IsNull(ResultCol) and (not EditingAndFocused) then
-    CellText := TEXT_NULL
+  if Results.IsNull(ResultCol) then begin
+    // Grid editors come here through Tree.GetTextInfo(), provide empty string then
+    CellText := IfThen(EditingAndFocused, '', TEXT_NULL);
+  end
   else begin
     case Results.DataType(ResultCol).Category of
       dtcInteger, dtcReal: begin

From c6dffe1c0558f0593ea21af2c71d15d1d6ab9d5f Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 27 Mar 2026 14:39:58 +0100
Subject: [PATCH 35/45] fix: a few compiler warnings

---
 source/dbconnection.pas           | 2 +-
 source/dbstructures.interbase.pas | 3 ++-
 source/main.pas                   | 5 -----
 source/table_editor.pas           | 1 +
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 58b054cc6..dfe3748ff 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -188,7 +188,7 @@   TDBObject = class(TPersistent)
 
       NodeType, GroupType: TListNodeType;
       constructor Create(OwnerConnection: TDBConnection);
-      destructor Destroy;
+      destructor Destroy; override;
       procedure Assign(Source: TPersistent); override;
       procedure UnloadDetails;
       procedure Drop;
diff --git a/source/dbstructures.interbase.pas b/source/dbstructures.interbase.pas
index 6a5f2b448..52ba541fa 100644
--- a/source/dbstructures.interbase.pas
+++ b/source/dbstructures.interbase.pas
@@ -236,8 +236,9 @@ function TInterbaseProvider.GetSql(AId: TQueryId): string;
       '   RDB$CHARACTER_SET_ID'+
       ' FROM RDB$COLLATIONS';
     qGetCharsets: Result := 'SELECT RDB$CHARACTER_SET_NAME AS "Charset", RDB$CHARACTER_SET_NAME AS "Description" FROM RDB$CHARACTER_SETS';
+    else Result := inherited;
   end;
 end;
 
 
-end.
\ No newline at end of file
+end.
diff --git a/source/main.pas b/source/main.pas
index 8865540c6..29831998f 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -7331,9 +7331,6 @@ procedure TMainForm.SynMemoQueryShowHint(Sender: TObject; HintInfo: PHintInfo);
   Obj: TDBObject;
   i, ColumnNameChars: Integer;
   Column: TTableColumn;
-  Parameters: TRoutineParamList;
-  Params: TStringList;
-  Param: TRoutineParam;
 begin
   // Activate hint for SQL function in query editors
   Edit := Sender as TSynEdit;
@@ -7797,8 +7794,6 @@ procedure TMainForm.SynMemoQueryDragDrop(Sender, Source: TObject; X,
 procedure TMainForm.FormDropFiles(Sender: TObject;
   const FileNames: array of string);
 var
-  i: Integer;
-  Tab: TQueryTab;
   Files: TStringList;
 begin
   // One or more files from explorer or somewhere else was dropped onto the
diff --git a/source/table_editor.pas b/source/table_editor.pas
index a851c6261..c6ae96114 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -1855,6 +1855,7 @@ procedure TfrmTableEditor.listColumnsCreateEditor(Sender: TBaseVirtualTree;
   // Start cell editor
   VT := Sender as TLazVirtualStringTree;
   Col := Sender.GetNodeData(Node);
+  EditLink := nil;
   case Column of
     ColNumDatatype: begin // Datatype pulldown
       DatatypeEditor := TDatatypeEditorLink.Create(VT, True, Col^);

From c770406029fee3638fd847895cb9fbcd0b4819a4 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 27 Mar 2026 14:56:38 +0100
Subject: [PATCH 36/45] fix(ui): apply the same larger tree node height on
 Linux

Refs #2344
---
 source/apphelpers.pas | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/source/apphelpers.pas b/source/apphelpers.pas
index d82092db2..e73db364d 100644
--- a/source/apphelpers.pas
+++ b/source/apphelpers.pas
@@ -1479,12 +1479,8 @@ procedure FixVT(VT: TVirtualStringTree; IsResultGrid: Boolean=False);
   else
     MultiLineCount := 1;
   // Issue #2344: TBaseVirtualTree.UpdateVerticalRange crashes with ERangeError on ArchLinux
-  // due to FRangeY/Cardinal getting a negative value.
-  // Happening when DefaultNodeHeight is set and then with 0 nodes in data grid
-  // Once the form files are back at 96 PPI this should no longer crash.
-  {$IFNDEF LINUX}
+  // Fixed through form files back at 96 PPI
   VT.DefaultNodeHeight := SingleLineHeight * MultiLineCount;
-  {$ENDIF}
   if MultiLineCount > 1 then begin
     VT.BeginUpdate;
     Node := VT.GetFirstInitialized;

From 2fbb77927aeb5e8abd14012c0dce439f0ef69b33 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 27 Mar 2026 16:01:36 +0100
Subject: [PATCH 37/45] refactor: prefer qAutoInc in SQLProvider over dedicated
 AutoIncName method

---
 source/copytable.pas               |  2 +-
 source/dbconnection.pas            | 16 +++-------------
 source/dbstructures.pas            |  4 +++-
 source/dbstructures.postgresql.pas |  1 +
 source/grideditlinks.pas           |  4 ++--
 source/table_editor.pas            |  2 +-
 6 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/source/copytable.pas b/source/copytable.pas
index 898661c32..5ebe2c1a6 100644
--- a/source/copytable.pas
+++ b/source/copytable.pas
@@ -419,7 +419,7 @@ procedure TCopyTableForm.btnOKClick(Sender: TObject);
   for Column in SelectedColumns do begin
     AutoIncGetsKey := False;
     AutoIncRemoved := False;
-    AutoIncName := Column.AutoIncName;
+    AutoIncName := FConnection.SqlProvider.GetSql(qAutoInc);
     if Column.DefaultType = cdtAutoInc then begin
       for Key in SelectedKeys do begin
         // Don't check index type, MySQL allows auto-increment columns on nearly all indexes
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index dfe3748ff..db3545dec 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -64,7 +64,6 @@   TTableColumn = class(TPersistent)
       function CastAsText: String;
       property Status: TEditingStatus read FStatus write SetStatus;
       property Connection: TDBConnection read FConnection;
-      function AutoIncName: String;
       function FullDataType: String;
   end;
   PTableColumn = ^TTableColumn;
@@ -5738,7 +5737,7 @@ function TDBConnection.GetTableColumns(Table: TDBObject): TTableColumnList;
     else if ExecRegExpr('\bauto_increment\b', ExtraText.ToLowerInvariant) then begin
       // MySQL auto increment
       Col.DefaultType := cdtAutoInc;
-      Col.DefaultText := Col.AutoIncName;
+      Col.DefaultText := FSqlProvider.GetSql(qAutoInc);
     end
     else if DefText.ToLowerInvariant = 'null' then begin
       Col.DefaultType := cdtNull;
@@ -5829,7 +5828,7 @@ function TMySQLConnection.GetTableColumns(Table: TDBObject): TTableColumnList;
       Col.OnUpdateType := cdtNothing;
       if ExecRegExpr('^auto_increment$', ExtraText.ToLowerInvariant) then begin
         Col.DefaultType := cdtAutoInc;
-        Col.DefaultText := Col.AutoIncName;
+        Col.DefaultText := FSqlProvider.GetSql(qAutoInc);
       end else if ColQuery.IsNull('Default') then begin
         Col.DefaultType := cdtNothing;
       end else if IsTextDefault(DefText, Col.DataType) then begin
@@ -10721,7 +10720,7 @@ function TTableColumn.SQLCode(OverrideCollation: String=''; Parts: TColumnParts=
         cdtAutoInc: begin
           case FConnection.Parameters.NetTypeGroup of
             ngPgSQL:;
-            else Result := Result + AutoIncName;
+            else Result := Result + FConnection.SqlProvider.GetSql(qAutoInc);
           end;
         end;
         cdtExpression: begin
@@ -10843,15 +10842,6 @@ function TTableColumn.CastAsText: String;
 end;
 
 
-function TTableColumn.AutoIncName: String;
-begin
-  case FConnection.Parameters.NetTypeGroup of
-    ngPgSQL: Result := 'SERIAL';
-    else Result := 'AUTO_INCREMENT';
-  end;
-end;
-
-
 function TTableColumn.FullDataType: String;
 begin
   Result := DataType.Name;
diff --git a/source/dbstructures.pas b/source/dbstructures.pas
index 2a6750813..46b2c53bc 100644
--- a/source/dbstructures.pas
+++ b/source/dbstructures.pas
@@ -49,7 +49,8 @@ interface
     qGetReverseForeignKeys, qExplain, qSetTimezone,
     qShowFunctionStatus, qShowProcedureStatus, qShowTriggers, qShowEvents, qShowCreateTrigger,
     qHelpKeyword, qShowWarnings, qGetEnumTypes,
-    qDropUser, qCreateRole, qDropRole, qReloadPrivileges, qGrantRole, qRevokeRole, qSetDefaultRole);
+    qDropUser, qCreateRole, qDropRole, qReloadPrivileges, qGrantRole, qRevokeRole, qSetDefaultRole,
+    qAutoInc);
   TSqlProvider = class
     strict protected
       FNetType: TNetType;
@@ -210,6 +211,7 @@ function TSqlProvider.GetSql(AId: TQueryId): string;
     qOrderAsc: Result := 'ASC';
     qOrderDesc: Result := 'DESC';
     qGetRowCountExact: Result := 'SELECT COUNT(*) FROM :QuotedDbAndTableName';
+    qAutoInc: Result := 'AUTO_INCREMENT';
     else Result := '';
   end;
 end;
diff --git a/source/dbstructures.postgresql.pas b/source/dbstructures.postgresql.pas
index aa49b7241..e0c45003b 100644
--- a/source/dbstructures.postgresql.pas
+++ b/source/dbstructures.postgresql.pas
@@ -744,6 +744,7 @@ function TPostgreSQLProvider.GetSql(AId: TQueryId): string;
       'ORDER BY UPPER(t.typname)',
       '' // ServerVersion < 9
       );
+    qAutoInc: Result := 'SERIAL';
     else Result := inherited;
   end;
 end;
diff --git a/source/grideditlinks.pas b/source/grideditlinks.pas
index 690bc9dc1..15f24a9fa 100644
--- a/source/grideditlinks.pas
+++ b/source/grideditlinks.pas
@@ -1414,7 +1414,7 @@ constructor TColumnDefaultEditorLink.Create(Tree: TVirtualStringTree; AllowEdit:
   FRadioAutoInc.Width := FRadioAutoInc.Parent.Width - 2 * FRadioAutoInc.Left;
   FRadioAutoInc.OnClick := RadioClick;
   FRadioAutoInc.OnKeyDown := DoKeyDown;
-  FRadioAutoInc.Caption := Col.AutoIncName;
+  FRadioAutoInc.Caption := FTableColumn.Connection.SqlProvider.GetSql(qAutoInc);
 
   FBtnOk := TButton.Create(FPanel);
   FBtnOk.Parent := FPanel;
@@ -1578,7 +1578,7 @@ function TColumnDefaultEditorLink.EndEdit: Boolean; stdcall;
       cdtText: Col.DefaultText := FTextEdit.Text;
       cdtNull: Col.DefaultText := 'NULL';
       cdtExpression: Col.DefaultText := FExpressionEdit.Text;
-      cdtAutoInc: Col.DefaultText := Col.AutoIncName;
+      cdtAutoInc: Col.DefaultText := Col.Connection.SqlProvider.GetSql(qAutoInc);
     end;
 
     if FOnUpdateEdit.Text <> '' then
diff --git a/source/table_editor.pas b/source/table_editor.pas
index c6ae96114..802b53713 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -1537,7 +1537,7 @@ procedure TfrmTableEditor.listColumnsGetText(Sender: TBaseVirtualTree;
         cdtText:         CellText := Col.Connection.EscapeString(Col.DefaultText);
         cdtNull:         CellText := 'NULL';
         cdtExpression:   CellText := Col.DefaultText;
-        cdtAutoInc:      CellText := Col.AutoIncName;
+        cdtAutoInc:      CellText := Col.Connection.SqlProvider.GetSql(qAutoInc);
       end;
       case Col.OnUpdateType of
         // cdtNothing: leave clause away

From 86ea19c5cb063e5af67a9e1b330a533e9400e03e Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Sat, 28 Mar 2026 16:36:22 +0100
Subject: [PATCH 38/45] fix: support backtick quoted user roles, and some other
 TValueListEditor related bug fixes

Refs #1155
---
 source/dbconnection.pas |  1 +
 source/usermanager.pas  | 35 +++++++++++++++++++++--------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index db3545dec..03978a62b 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -577,6 +577,7 @@   TDBConnection = class(TComponent)
       property KeyCache: TKeyCache read FKeyCache;
       property ForeignKeyCache: TForeignKeyCache read FForeignKeyCache;
       property CheckConstraintCache: TCheckConstraintCache read FCheckConstraintCache;
+      property StringQuoteChar: Char read FStringQuoteChar;
       property QuoteChar: Char read FQuoteChar;
       property QuoteChars: String read FQuoteChars;
       function ServerVersionStr: String;
diff --git a/source/usermanager.pas b/source/usermanager.pas
index 327e6e57e..42624d205 100644
--- a/source/usermanager.pas
+++ b/source/usermanager.pas
@@ -53,7 +53,7 @@   TUserList = class(TObjectList<TUser>)
     public
       function GetRoleNames: TStringList; overload;
       procedure GetRoleNames(Strings: TStrings); overload;
-      function GetDefaultRoles: TStringList;
+      function GetDefaultRoles(ExcludeRole: TUser): TStringList;
   end;
 
   EInputError = class(Exception);
@@ -556,10 +556,7 @@ procedure TUserManagerForm.ValueListEditorRolesSelectCell(Sender: TObject;
   // Disallow assigning a role to itself
   if (aRow <= 0) or (aRow > ValueListEditorRoles.Strings.Count) then
     Exit;
-  if SameText(ValueListEditorRoles.Strings.Names[ARow-1], editUsername.Text) then
-    CanSelect := False
-  else
-    ValueListEditorRoles.ItemProps[aRow-1].EditStyle := esPickList;
+  ValueListEditorRoles.ItemProps[aRow-1].EditStyle := esPickList;
 end;
 
 procedure TUserManagerForm.ValueListEditorRolesSetEditText(Sender: TObject;
@@ -628,7 +625,7 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
 var
   P, Ptmp, PCol: TPrivObj;
   User: PUser;
-  UserHost, Msg, CreateUser: String;
+  UserHost, UserHostRx, Msg, CreateUser, RxQuotes: String;
   Grants, AllPNames, Cols, RoleNames, DefaultRoles: TStringList;
   rxTemp, rxGrant: TRegExpr;
   i, j: Integer;
@@ -661,13 +658,17 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
   editSubject.Clear;
   tabPrivileges.Caption := _('Privileges');
   tabRoles.Caption := _('Roles');
+  // All possible quote chars, escaped for RegExpr. Todo: use in all relevant expressions.
+  RxQuotes := '['+QuoteRegExprMetaChars(FConnection.QuoteChars + FConnection.StringQuoteChar)+']';
 
   if UserSelected then begin
     User := Sender.GetNodeData(Node);
-    if User.IsUser then
-      UserHost := FConnection.EscapeString(User.Username)+'@'+FConnection.EscapeString(User.Host)
-    else
-      UserHost := FConnection.EscapeString(User.Username);
+    UserHost := FConnection.EscapeString(User.Username);
+    UserHostRx := RxQuotes + '?' + QuoteRegExprMetaChars(User.Username) + RxQuotes + '?';
+    if User.IsUser then begin
+      UserHost := UserHost + '@' + FConnection.EscapeString(User.Host);
+      UserHostRx := UserHostRx + '@' + RxQuotes + '?' + QuoteRegExprMetaChars(User.Host) + RxQuotes + '?';
+    end;
     editUsername.Text := User.Username;
     editFromHost.Text := User.Host;
     i := comboDefaultRole.Items.IndexOf(User.DefaultRole);
@@ -829,13 +830,14 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
     // GRANT role_admin TO 'root'@'127.0.0.1';
     // GRANT 'role space' TO 'root'@'127.0.0.1';
     // GRANT role_space to 'role_admin' WITH ADMIN OPTION;
-    DefaultRoles := FUsers.GetDefaultRoles;
+    DefaultRoles := FUsers.GetDefaultRoles(User^);
     User.Roles.Assign(DefaultRoles);
     RoleNames := FUsers.GetRoleNames;
     for i:=0 to RoleNames.Count-1 do begin
       RoleNames[i] := QuoteRegExprMetaChars(RoleNames[i]);
     end;
-    rxGrant.Expression := '^GRANT\s+''?('+Implode('|', RoleNames)+')''?\s+TO\s+'+QuoteRegExprMetaChars(UserHost)+'(\s+WITH ADMIN OPTION)?$';
+    rxGrant.Expression := '^GRANT\s+'+RxQuotes+'?('+Implode('|', RoleNames)+')'+RxQuotes+'?\s+'+
+      'TO\s+'+UserHostRx+'(\s+WITH ADMIN OPTION)?$';
     for i:=0 to Grants.Count-1 do begin
       // Find selected priv objects via regular expression
       if not rxGrant.Exec(Grants[i]) then begin
@@ -849,7 +851,9 @@ procedure TUserManagerForm.listUsersFocusChanged(Sender: TBaseVirtualTree; Node:
           User.Roles.ValueFromIndex[j] := User.RoleYes;
       end;
     end;
+    ValueListEditorRoles.BeginUpdate;
     ValueListEditorRoles.Strings.Assign(User.Roles);
+    ValueListEditorRoles.EndUpdate;
     DefaultRoles.Free;
 
     // Parse general user options
@@ -1911,7 +1915,7 @@ procedure TUserList.GetRoleNames(Strings: TStrings);
   RoleNames.Free;
 end;
 
-function TUserList.GetDefaultRoles: TStringList;
+function TUserList.GetDefaultRoles(ExcludeRole: TUser): TStringList;
 var
   RoleNames: TStringList;
   i: Integer;
@@ -1919,8 +1923,11 @@ function TUserList.GetDefaultRoles: TStringList;
   // Default role assignments with "no" value for all roles
   Result := TStringList.Create;
   RoleNames := GetRoleNames;
-  for i:=0 to RoleNames.Count-1 do
+  for i:=0 to RoleNames.Count-1 do begin
+    if ExcludeRole.IsRole and SameText(RoleNames[i], ExcludeRole.Username) then
+      Continue;
     Result.AddPair(RoleNames[i], TUser.RoleNo);
+  end;
   RoleNames.Free;
 end;
 

From 3d547fd4a449ff3642aefbbd46821448ca907312 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Sat, 28 Mar 2026 16:40:42 +0100
Subject: [PATCH 39/45] refactor: revert most of what I did for #2424

This changes the meaning of an empty database setting for a PostgreSQL session:
- old: empty meant "postgres", and "!" meant empty
- new: empty means empty now

Refs #2424 and #2442
---
 source/connections.pas  | 38 +++++++-------------------------------
 source/dbconnection.pas | 16 +++-------------
 2 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/source/connections.pas b/source/connections.pas
index e7b925e8d..fbe7af18a 100644
--- a/source/connections.pas
+++ b/source/connections.pas
@@ -1309,7 +1309,7 @@ procedure Tconnform.editDatabasesRightButtonClick(Sender: TObject);
     // Try to connect and lookup database names
     Params := CurrentParams;
     Connection := Params.CreateConnection(Self);
-    Connection.Parameters.AllDatabasesStr := TPgConnection.DBNAME_EMPTY;
+    Connection.Parameters.AllDatabasesStr := '';
     Connection.LogPrefix := SelectedSessionPath;
     Connection.OnLog := Mainform.LogSQL;
     FPopupDatabases := TPopupMenu.Create(Self);
@@ -1317,26 +1317,13 @@ procedure Tconnform.editDatabasesRightButtonClick(Sender: TObject);
     Screen.Cursor := crHourglass;
     try
       Connection.Active := True;
-      if Params.IsAnyPostgreSQL then begin
-        Databases := Connection.GetCol('SELECT datname FROM pg_database WHERE datistemplate=FALSE');
-        Item := TMenuItem.Create(FPopupDatabases);
-        Item.Caption := TPgConnection.DBNAME_EMPTY + ' (' + _('No database') + ')';
-        Item.Tag := TPgConnection.DBTAG_EMPTY;
-        Item.OnClick := MenuDatabasesClick;
-        Item.AutoCheck := True;
-        Item.RadioItem := True;
-        FPopupDatabases.Items.Add(Item);
-      end
-      else begin
+      if Params.NetTypeGroup = ngPgSQL then
+        Databases := Connection.GetCol('SELECT datname FROM pg_database WHERE datistemplate=FALSE')
+      else
         Databases := Connection.AllDatabases;
-      end;
       for DB in Databases do begin
         Item := TMenuItem.Create(FPopupDatabases);
         Item.Caption := DB;
-        if Params.IsAnyPostgreSQL and (DB = TPgConnection.DBNAME_DEFAULT) then begin
-          Item.Caption := Item.Caption + ' (' + _('Default') + ')';
-          Item.Tag := TPgConnection.DBTAG_DEFAULT;
-        end;
         Item.OnClick := MenuDatabasesClick;
         Item.AutoCheck := True;
         Item.RadioItem := Params.IsAnyPostgreSQL;
@@ -1352,14 +1339,7 @@ procedure Tconnform.editDatabasesRightButtonClick(Sender: TObject);
   // Check/uncheck items, based on semicolon list
   Databases := Explode(';', editDatabases.Text);
   for Item in FPopupDatabases.Items do begin
-    case Item.Tag of
-      TPgConnection.DBTAG_EMPTY:
-        Item.Checked := Databases.Contains(TPgConnection.DBNAME_EMPTY);
-      TPgConnection.DBTAG_DEFAULT:
-        Item.Checked := Databases.Contains(TPgConnection.DBNAME_DEFAULT) or Databases.IsEmpty;
-      else
-        Item.Checked := Databases.IndexOf(Item.Caption) > -1;
-    end;
+    Item.Checked := Databases.IndexOf(Item.Caption) > -1;
   end;
   Databases.Free;
 
@@ -1376,12 +1356,8 @@ procedure Tconnform.MenuDatabasesClick(Sender: TObject);
 begin
   Databases := TStringList.Create;
   for Item in FPopupDatabases.Items do begin
-    if Item.Checked then begin
-      if Item.Tag in [TPgConnection.DBTAG_EMPTY, TPgConnection.DBTAG_DEFAULT] then // Remove hint
-        Databases.Add(ReplaceRegExpr('\s\(.+$', Item.Caption, ''))
-      else
-        Databases.Add(Item.Caption);
-    end;
+    if Item.Checked then
+      Databases.Add(Item.Caption);
   end;
   SelStart := editDatabases.SelStart;
   editDatabases.Text := Implode(';', Databases);
diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index 03978a62b..adc79a1f2 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -702,11 +702,6 @@   TSqlSrvConnection = class(TDBConnection)
   TPGRawResults = Array of PPGresult;
   TPQerrorfields = (PG_DIAG_SEVERITY, PG_DIAG_SQLSTATE, PG_DIAG_MESSAGE_PRIMARY, PG_DIAG_MESSAGE_DETAIL, PG_DIAG_MESSAGE_HINT, PG_DIAG_STATEMENT_POSITION, PG_DIAG_INTERNAL_POSITION, PG_DIAG_INTERNAL_QUERY, PG_DIAG_CONTEXT, PG_DIAG_SOURCE_FILE, PG_DIAG_SOURCE_LINE, PG_DIAG_SOURCE_FUNCTION);
   TPgConnection = class(TDBConnection)
-    const
-      DBNAME_DEFAULT = 'postgres';
-      DBNAME_EMPTY = '!';
-      DBTAG_EMPTY = 1;
-      DBTAG_DEFAULT = 2;
     private
       FHandle: PPGconn;
       FLib: TPostgreSQLLib;
@@ -2734,18 +2729,13 @@ procedure TSqlSrvConnection.SetActive(Value: Boolean);
 
 procedure TPgConnection.SetActive(Value: Boolean);
 var
-  dbname, ConnectionString, OptionValue, Error: String;
+  ConnectionString, OptionValue, Error: String;
   ConnectOptions: TStringList;
   FinalHost, ErrorHint: String;
   FinalPort, i: Integer;
 begin
   if Value then begin
     DoBeforeConnect;
-    // Simon Riggs:
-    // "You should connect as "postgres" database by default, with an option to change. Don't use template1"
-    dbname := FParameters.AllDatabasesStr;
-    if dbname = '' then
-      dbname := DBNAME_DEFAULT;
 
     // Prepare special stuff for SSH tunnel
     FinalHost := FParameters.Hostname;
@@ -2763,8 +2753,8 @@ procedure TPgConnection.SetActive(Value: Boolean);
       .AddPair('password', FParameters.Password)
       .AddPair('application_name', APPNAME)
       .AddPair('sslmode', 'disable');
-    if dbname <> DBNAME_EMPTY then
-      ConnectOptions.AddPair('dbname', dbname);
+    if not FParameters.AllDatabasesStr.IsEmpty then
+      ConnectOptions.AddPair('dbname', FParameters.AllDatabasesStr);
     if FParameters.WantSSL then begin
       // Be aware .AddPair would add duplicates
       case FParameters.SSLVerification of

From 508b1390d1e65b13d682da5bbddb649bcc70f677 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Sat, 28 Mar 2026 16:41:37 +0100
Subject: [PATCH 40/45] fix: enable save button after changing default role per
 combobox

Refs #1155
---
 source/usermanager.lfm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/usermanager.lfm b/source/usermanager.lfm
index fb4fa1254..d98d79fe2 100644
--- a/source/usermanager.lfm
+++ b/source/usermanager.lfm
@@ -319,6 +319,7 @@ object UserManagerForm: TUserManagerForm
           ItemHeight = 15
           Style = csDropDownList
           TabOrder = 4
+          OnChange = Modification
         end
         object lblDefaultRole: TLabel
           AnchorSideLeft.Control = tabCredentials

From 7bed73549202b622df7aa9f4f937c9846949dfb3 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Sat, 28 Mar 2026 17:32:21 +0100
Subject: [PATCH 41/45] fix: some crashes found in uploaded crash reports

---
 source/apphelpers.pas |   2 -
 source/main.pas       | 113 ++++++++++++++++++++++--------------------
 2 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/source/apphelpers.pas b/source/apphelpers.pas
index e73db364d..ff86ba231 100644
--- a/source/apphelpers.pas
+++ b/source/apphelpers.pas
@@ -2366,8 +2366,6 @@ function MessageDialog(const Title, Msg: string; DlgType: TMsgDlgType; Buttons:
   end;
   if Title <> Dialog.Caption then
     Dialog.Title := Title;
-  if Assigned(MainForm) and (MainForm.ActiveConnection <> nil) then
-    Dialog.Caption := MainForm.ActiveConnection.Parameters.SessionName + ': ' + Dialog.Caption;
   rx := TRegExpr.Create;
   rx.Expression := 'https?://[^\s"]+';
   if ThemeIsDark then
diff --git a/source/main.pas b/source/main.pas
index 29831998f..aee32f4ee 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -9434,65 +9434,72 @@ procedure TMainForm.DBtreeGetText(Sender: TBaseVirtualTree; Node:
   Bytes: Int64;
   AllListsCached: Boolean;
 begin
-  DBObj := Sender.GetNodeData(Node);
-  case Column of
-    0: case DBObj.NodeType of
-        lntNone: CellText := DBObj.Connection.Parameters.SessionPath;
-        lntDb: CellText := DBObj.Database;
-        lntGroup: begin
-          CellText := DBObj.Name;
-          if Sender.ChildrenInitialized[Node] then
-            CellText := CellText + ' (' + FormatNumber(Sender.ChildCount[Node]) + ')';
-        end;
-        lntTable..lntEvent: try
-          if (DBObj.Schema <> '') and (DBObj.Connection.Parameters.NetTypeGroup = ngMSSQL) then
-            CellText := DBObj.Schema + '.' + DBObj.Name
-          else
+  try
+    DBObj := Sender.GetNodeData(Node);
+    case Column of
+      0: case DBObj.NodeType of
+          lntNone: CellText := DBObj.Connection.Parameters.SessionPath;
+          lntDb: CellText := DBObj.Database;
+          lntGroup: begin
             CellText := DBObj.Name;
-        except
-          CellText := DBObj.Name;
+            if Sender.ChildrenInitialized[Node] then
+              CellText := CellText + ' (' + FormatNumber(Sender.ChildCount[Node]) + ')';
+          end;
+          lntTable..lntEvent: try
+            if (DBObj.Schema <> '') and (DBObj.Connection.Parameters.NetTypeGroup = ngMSSQL) then
+              CellText := DBObj.Schema + '.' + DBObj.Name
+            else
+              CellText := DBObj.Name;
+          except
+            CellText := DBObj.Name;
+          end;
+          lntColumn: CellText := DBObj.Column;
         end;
-        lntColumn: CellText := DBObj.Column;
-      end;
-    1: if DBObj.Connection.Active then case DBObj.NodeType of
-        // Calculate and display the sum of all table sizes in ALL dbs if all table lists are cached
-        lntNone: begin
-            AllListsCached := true;
-            for i:=0 to DBObj.Connection.AllDatabases.Count-1 do begin
-              if not DBObj.Connection.DbObjectsCached(DBObj.Connection.AllDatabases[i]) then begin
-                AllListsCached := false;
-                break;
-              end;
-            end;
-            // Will be also set to a negative value by GetTableSize and results of SHOW TABLES
-            Bytes := -1;
-            if AllListsCached then begin
-              Bytes := 0;
+      1: if DBObj.Connection.Active then case DBObj.NodeType of
+          // Calculate and display the sum of all table sizes in ALL dbs if all table lists are cached
+          lntNone: begin
+              AllListsCached := true;
               for i:=0 to DBObj.Connection.AllDatabases.Count-1 do begin
-                DBObjects := DBObj.Connection.GetDBObjects(DBObj.Connection.AllDatabases[i]);
-                Inc(Bytes, DBObjects.DataSize);
+                if not DBObj.Connection.DbObjectsCached(DBObj.Connection.AllDatabases[i]) then begin
+                  AllListsCached := false;
+                  break;
+                end;
               end;
+              // Will be also set to a negative value by GetTableSize and results of SHOW TABLES
+              Bytes := -1;
+              if AllListsCached then begin
+                Bytes := 0;
+                for i:=0 to DBObj.Connection.AllDatabases.Count-1 do begin
+                  DBObjects := DBObj.Connection.GetDBObjects(DBObj.Connection.AllDatabases[i]);
+                  Inc(Bytes, DBObjects.DataSize);
+                end;
+              end;
+              if Bytes >= 0 then CellText := FormatByteNumber(Bytes)
+              else CellText := '';
             end;
-            if Bytes >= 0 then CellText := FormatByteNumber(Bytes)
-            else CellText := '';
-          end;
-        // Calculate and display the sum of all table sizes in ONE db, if the list is already cached.
-        lntDb: begin
-            if not DBObj.Connection.DbObjectsCached(DBObj.Database) then
-              CellText := ''
-            else begin
-              DBObjects := DBObj.Connection.GetDBObjects(DBObj.Database);
-              CellText := FormatByteNumber(DBObjects.DataSize);
+          // Calculate and display the sum of all table sizes in ONE db, if the list is already cached.
+          lntDb: begin
+              if not DBObj.Connection.DbObjectsCached(DBObj.Database) then
+                CellText := ''
+              else begin
+                DBObjects := DBObj.Connection.GetDBObjects(DBObj.Database);
+                CellText := FormatByteNumber(DBObjects.DataSize);
+              end;
             end;
-          end;
-        lntTable: begin
-            if DBObj.Size >= 0 then
-              CellText := FormatByteNumber(DBObj.Size)
-            else
-              CellText := '';
-          end
-        else CellText := ''; // Applies for views/procs/... which have no size
-      end;
+          lntTable: begin
+              if DBObj.Size >= 0 then
+                CellText := FormatByteNumber(DBObj.Size)
+              else
+                CellText := '';
+            end
+          else CellText := ''; // Applies for views/procs/... which have no size
+        end;
+    end;
+  except
+    // Uploaded crash reports show multiple different situations with an AV,
+    // some of them in conjunction with a killed query.
+    on E:EAccessViolation do
+      CellText := '';
   end;
 end;
 

From 9727d532770fd55170da0e14e0bd0d342fe5f7d2 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Tue, 31 Mar 2026 17:40:39 +0200
Subject: [PATCH 42/45] refactor: sync from master

---
 source/apphelpers.pas | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/source/apphelpers.pas b/source/apphelpers.pas
index ff86ba231..53e2813ea 100644
--- a/source/apphelpers.pas
+++ b/source/apphelpers.pas
@@ -3535,7 +3535,6 @@ constructor TAppSettings.Create;
 var
   rx: TRegExpr;
   i: Integer;
-  DefaultSnippetsDirectory: String;
   PortableLockFile: String;
   NewFileHandle: THandle;
 begin
@@ -3784,10 +3783,7 @@ constructor TAppSettings.Create;
   InitSetting(asDisplayReverseForeignKeys,        'DisplayReverseForeignKeys',             0, False);
   InitSetting(asGenerateDataNumRows,              'GenerateDataNumRows',                   1000);
   InitSetting(asGenerateDataNullAmount,           'GenerateDataNullAmount',                10);
-
-  // Default folder for snippets
-  DefaultSnippetsDirectory := DirnameUserDocuments + 'Snippets' + DirectorySeparator;
-  InitSetting(asCustomSnippetsDirectory,          'CustomSnippetsDirectory',               0, False, DefaultSnippetsDirectory);
+  InitSetting(asCustomSnippetsDirectory,          'CustomSnippetsDirectory',               0, False, DirnameUserDocuments + 'Snippets' + DirectorySeparator);
   InitSetting(asPromptSaveFileOnTabClose,         'PromptSaveFileOnTabClose',              0, True);
   // Restore tabs feature crashes often on old XP systems, see https://www.heidisql.com/forum.php?t=34044
   InitSetting(asRestoreTabs,                      'RestoreTabs',                           0, True);

From b3fa4844e2c6c4ec9fd584c61855fd0b9c540554 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Tue, 31 Mar 2026 19:24:31 +0200
Subject: [PATCH 43/45] feat: support invisible indexes on MySQL 8.0+ and
 ignored indexes on MariaDB 10.6+

Refs #1388
---
 source/dbconnection.pas       |   9 ++-
 source/dbstructures.mysql.pas |  18 ++++++
 source/dbstructures.pas       |   2 +-
 source/table_editor.lfm       |  10 ++-
 source/table_editor.pas       | 115 ++++++++++++++++++++++++----------
 5 files changed, 115 insertions(+), 39 deletions(-)

diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index adc79a1f2..0f772d582 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -90,7 +90,7 @@   TTableKey = class(TPersistent)
       Name, OldName: String;
       IndexType, OldIndexType, Algorithm, Comment: String;
       Columns, SubParts, Collations: TStringList;
-      Modified, Added: Boolean;
+      Modified, Added, Visible: Boolean;
       constructor Create(AOwner: TDBConnection);
       destructor Destroy; override;
       procedure Assign(Source: TPersistent); override;
@@ -6064,6 +6064,10 @@ function TMySQLConnection.GetTableKeys(Table: TDBObject): TTableKeyList;
         if ExecRegExpr('(BTREE|HASH)', KeyQuery.Col('Index_type')) then
           NewKey.Algorithm := KeyQuery.Col('Index_type');
         NewKey.Comment := KeyQuery.Col('Index_comment', True);
+        if KeyQuery.ColumnExists('Visible') then // mysql 8
+          NewKey.Visible := SameText(KeyQuery.Col('Visible'), 'yes')
+        else if KeyQuery.ColumnExists('Ignored') then // mariadb 10.6
+          NewKey.Visible := SameText(KeyQuery.Col('Ignored'), 'NO');
       end;
       if KeyQuery.ColumnExists('Expression') and (not KeyQuery.IsNull('Expression')) then begin
         // Functional key part: enclose expression within parentheses to distinguish them from columns (issue #1777)
@@ -10884,6 +10888,7 @@ constructor TTableKey.Create(AOwner: TDBConnection);
   Columns.OnChange := Modification;
   Subparts.OnChange := Modification;
   Collations.OnChange := Modification;
+  Visible := True;
 end;
 
 destructor TTableKey.Destroy;
@@ -10906,6 +10911,7 @@ procedure TTableKey.Assign(Source: TPersistent);
     OldIndexType := s.OldIndexType;
     Algorithm := s.Algorithm;
     Comment := s.Comment;
+    Visible := s.Visible;
     Columns.Assign(s.Columns);
     SubParts.Assign(s.SubParts);
     Collations.Assign(s.Collations);
@@ -11023,6 +11029,7 @@ function TTableKey.SQLCode(TableName: String=''): String;
 
     if not Comment.IsEmpty then
       Result := Result + ' COMMENT ' + FConnection.EscapeString(Comment);
+
   end
   else begin
     // SQLite syntax:
diff --git a/source/dbstructures.mysql.pas b/source/dbstructures.mysql.pas
index 759ac9726..48c6a9fff 100644
--- a/source/dbstructures.mysql.pas
+++ b/source/dbstructures.mysql.pas
@@ -3402,6 +3402,24 @@ function TMySqlProvider.GetSql(AId: TQueryId): string;
     qGrantRole: Result := 'GRANT %s TO %s%s';
     qRevokeRole: Result := 'REVOKE %s FROM %s';
     qSetDefaultRole: Result := 'SET DEFAULT ROLE %s FOR %s';
+    qIndexVisible: Result := IfThen(
+      FServerVersion >= 100600, // mariadb
+      'NOT IGNORED',
+      IfThen(
+        FServerVersion >= 80000, // mysql
+        'VISIBLE',
+        ''
+        )
+      );
+    qIndexInvisible: Result := IfThen(
+      FServerVersion >= 100600, // mariadb
+      'IGNORED',
+      IfThen(
+        FServerVersion >= 80000, // mysql
+        'INVISIBLE',
+        ''
+        )
+      );
     else Result := inherited;
   end;
 end;
diff --git a/source/dbstructures.pas b/source/dbstructures.pas
index 46b2c53bc..b3a20d3cf 100644
--- a/source/dbstructures.pas
+++ b/source/dbstructures.pas
@@ -50,7 +50,7 @@ interface
     qShowFunctionStatus, qShowProcedureStatus, qShowTriggers, qShowEvents, qShowCreateTrigger,
     qHelpKeyword, qShowWarnings, qGetEnumTypes,
     qDropUser, qCreateRole, qDropRole, qReloadPrivileges, qGrantRole, qRevokeRole, qSetDefaultRole,
-    qAutoInc);
+    qAutoInc, qIndexVisible, qIndexInvisible);
   TSqlProvider = class
     strict protected
       FNetType: TNetType;
diff --git a/source/table_editor.lfm b/source/table_editor.lfm
index a66b0541f..eb779ea77 100644
--- a/source/table_editor.lfm
+++ b/source/table_editor.lfm
@@ -336,13 +336,13 @@ object frmTableEditor: TfrmTableEditor
         DragMode = dmAutomatic
         DragType = dtVCL
         EditDelay = 0
-        Header.AutoSizeIndex = 0
+        Header.AutoSizeIndex = -1
         Header.Columns = <        
           item
             Options = [coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coVisible, coAllowFocus]
             Position = 0
             Text = 'Name'
-            Width = 241
+            Width = 191
           end        
           item
             Options = [coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coVisible, coAllowFocus]
@@ -364,6 +364,10 @@ object frmTableEditor: TfrmTableEditor
             Position = 4
             Text = 'Direction'
             Width = 80
+          end        
+          item
+            Position = 5
+            Text = 'Visibility'
           end>
         Header.Options = [hoAutoResize, hoColumnResize, hoDrag, hoShowSortGlyphs, hoVisible, hoDisableAnimatedResize]
         Header.PopupMenu = MainForm.popupListHeader
@@ -372,7 +376,7 @@ object frmTableEditor: TfrmTableEditor
         TabOrder = 1
         TreeOptions.AutoOptions = [toAutoDropExpand, toAutoScrollOnExpand, toAutoTristateTracking, toAutoChangeScale]
         TreeOptions.MiscOptions = [toAcceptOLEDrop, toEditable, toFullRepaintOnResize, toGridExtensions, toInitOnSave, toToggleOnDblClick, toWheelPanning, toEditOnClick]
-        TreeOptions.PaintOptions = [toHotTrack, toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toThemeAware, toUseBlendedImages, toFullVertGridLines, toUseExplorerTheme, toHideTreeLinesIfThemed]
+        TreeOptions.PaintOptions = [toHotTrack, toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toThemeAware, toUseBlendedImages, toGhostedIfUnfocused, toFullVertGridLines, toUseExplorerTheme, toHideTreeLinesIfThemed]
         TreeOptions.SelectionOptions = [toExtendedFocus, toRightClickSelect]
         OnBeforePaint = treeIndexesBeforePaint
         OnClick = AnyTreeClick
diff --git a/source/table_editor.pas b/source/table_editor.pas
index 802b53713..2361b8a65 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -242,6 +242,13 @@   TfrmTableEditor = class(TFrame)
     const ColNumInvisible = 13;
     const ColNumCompressed = 14;
     const ColNumsCheckboxes = [ColNumUnsigned, ColNumAllownull, ColNumZerofill, ColNumInvisible, ColNumCompressed];
+    // Columns in index tree
+    const IndexColNumName = 0;
+    const IndexColNumType = 1;
+    const IndexColNumAlgorithm = 2;
+    const IndexColNumComment = 3;
+    const IndexColNumDirection = 4;
+    const IndexColNumVisibility = 5;
     procedure ValidateColumnControls;
     procedure ValidateIndexControls;
     procedure MoveFocusedIndexPart(NewIdx: Cardinal);
@@ -911,10 +918,27 @@ function TfrmTableEditor.ComposeAlterStatement: TSQLBatch;
       Specs.Add('ADD ' + Constraint.SQLCode);
   end;
 
-
   FinishSpecs;
 
-  // Separate queries from here on
+  // Separate ALTER TABLE .. ALTER INDEX query for visible/invisible indexes features, which gets otherwise
+  // ignored in MySQL and MariaDB when done by a drop + add combined query. See issue #1388
+  if Conn.SqlProvider.Has(qIndexInvisible) then begin
+    for i:=0 to FKeys.Count-1 do begin
+      if FKeys[i].Modified then begin
+        Specs.Add('ALTER INDEX ' + Conn.QuoteIdent(FKeys[i].Name) + ' ' +
+          IfThen(
+            FKeys[i].Visible,
+            Conn.SqlProvider.GetSql(qIndexVisible),
+            Conn.SqlProvider.GetSql(qIndexInvisible)
+            )
+          );
+      end;
+    end;
+    FinishSpecs;
+  end;
+
+
+  // *** Separate queries from here on
 
   // Drop indexes, also changed indexes, which will be readded below
   for i:=0 to FDeletedKeys.Count-1 do begin
@@ -2081,10 +2105,15 @@ procedure TfrmTableEditor.treeIndexesGetImageIndex(Sender: TBaseVirtualTree;
 begin
   // Icon image showing type of index
   VT := Sender as TLazVirtualStringTree;
-  if Column <> 0 then Exit;
-  if not (Kind in [ikNormal, ikSelected]) then Exit;
+  if Column <> IndexColNumName then
+    Exit;
+  if not (Kind in [ikNormal, ikSelected]) then
+    Exit;
   case VT.GetNodeLevel(Node) of
-    0: ImageIndex := FKeys[Node.Index].ImageIndex;
+    0: begin
+      ImageIndex := FKeys[Node.Index].ImageIndex;
+      Ghosted := not FKeys[Node.Index].Visible;
+    end;
     1: begin
       TblKey := FKeys[Node.Parent.Index];
       if TblKey.IsExpression(Node.Index) then
@@ -2107,27 +2136,33 @@ procedure TfrmTableEditor.treeIndexesGetText(Sender: TBaseVirtualTree;
     0: begin
       TblKey := FKeys[Node.Index];
       case Column of
-        0: if TblKey.IsPrimary then
+        IndexColNumName: if TblKey.IsPrimary then
              CellText := TblKey.IndexType + ' KEY' // Fixed name "PRIMARY KEY", cannot be changed
            else
              CellText := TblKey.Name;
-        1: CellText := TblKey.IndexType;
-        2: CellText := TblKey.Algorithm;
-        3: CellText := TblKey.Comment;
-        4: CellText := ''; // Column collation
+        IndexColNumType: CellText := TblKey.IndexType;
+        IndexColNumAlgorithm: CellText := TblKey.Algorithm;
+        IndexColNumComment: CellText := TblKey.Comment;
+        IndexColNumDirection: CellText := ''; // Column collation
+        IndexColNumVisibility: CellText := IfThen(
+            TblKey.Visible,
+            DBObject.Connection.SqlProvider.GetSql(qIndexVisible),
+            DBObject.Connection.SqlProvider.GetSql(qIndexInvisible)
+          );
       end;
     end;
     1: begin
       TblKey := FKeys[Node.Parent.Index];
       case Column of
-        0: CellText := TblKey.Columns[Node.Index];
-        1: CellText := TblKey.SubParts[Node.Index];
-        2: CellText := ''; // Index algorithm
-        3: CellText := ''; // Index comment
-        4: begin
+        IndexColNumName: CellText := TblKey.Columns[Node.Index];
+        IndexColNumType: CellText := TblKey.SubParts[Node.Index];
+        IndexColNumAlgorithm: CellText := ''; // Index algorithm
+        IndexColNumComment: CellText := ''; // Index comment
+        IndexColNumDirection: begin
           CellText := TblKey.Collations[Node.Index];
           CellText := IfThen(CellText.ToLower = 'a', 'ASC', 'DESC');
         end;
+        IndexColNumVisibility: CellText := '';
       end;
     end;
   end;
@@ -2346,13 +2381,17 @@ procedure TfrmTableEditor.treeIndexesEditing(Sender: TBaseVirtualTree;
   Allowed := False;
   if VT.GetNodeLevel(Node) = 0 then begin
     // Disallow renaming primary key, and direction/collation of key node level
-    if (Column = 0) and (VT.Text[Node, 1] <> TTableKey.PRIMARY) then
-      Allowed := True
-    else
-      Allowed := Column in [1,2,3];
-  end else case Column of
-    0: Allowed := True;
-    1: begin
+    case Column of
+      IndexColNumName: Allowed := (VT.Text[Node, 1] <> TTableKey.PRIMARY);
+      IndexColNumType: Allowed := True;
+      IndexColNumAlgorithm: Allowed := True;
+      IndexColNumComment: Allowed := True;
+      IndexColNumVisibility: Allowed := DBObject.Connection.SqlProvider.Has(qIndexInvisible);
+    end;
+  end
+  else case Column of
+    IndexColNumName: Allowed := True;
+    IndexColNumType: begin
       // Column length is allowed for (var)char/text types only, even mandantory for text and blobs
       IndexedColName := VT.Text[Node, 0];
       for i:=0 to FColumns.Count-1 do begin
@@ -2362,7 +2401,7 @@ procedure TfrmTableEditor.treeIndexesEditing(Sender: TBaseVirtualTree;
         end;
       end;
     end;
-    4: Allowed := True; // Collation
+    IndexColNumDirection: Allowed := True; // Collation
   end;
 end;
 
@@ -2379,18 +2418,25 @@ procedure TfrmTableEditor.treeIndexesCreateEditor(Sender: TBaseVirtualTree;
   // Start cell editor
   VT := Sender as TLazVirtualStringTree;
   Level := (Sender as TLazVirtualStringTree).GetNodeLevel(Node);
-  if (Level = 0) and (Column = 1) then begin
+  if (Level = 0) and (Column = IndexColNumType) then begin
     // Index type pulldown
     EnumEditor := TEnumEditorLink.Create(VT, True, nil);
     EnumEditor.ValueList := TStringList.Create;
     EnumEditor.ValueList.CommaText := TTableKey.PRIMARY +','+ TTableKey.KEY +','+ TTableKey.UNIQUE +','+ TTableKey.FULLTEXT +','+ TTableKey.SPATIAL;
     EditLink := EnumEditor;
-  end else if (Level = 0) and (Column = 2) then begin
+  end else if (Level = 0) and (Column = IndexColNumAlgorithm) then begin
     // Algorithm pulldown
     EnumEditor := TEnumEditorLink.Create(VT, True, nil);
     EnumEditor.ValueList := Explode(',', ',BTREE,HASH,RTREE');
     EditLink := EnumEditor;
-  end else if (Level = 1) and (Column = 0) then begin
+  end else if (Level = 0) and (Column = IndexColNumVisibility) then begin
+    // Visibility pulldown
+    EnumEditor := TEnumEditorLink.Create(VT, True, nil);
+    EnumEditor.ValueList.Add('');
+    EnumEditor.ValueList.Add(DBObject.Connection.SqlProvider.GetSql(qIndexVisible));
+    EnumEditor.ValueList.Add(DBObject.Connection.SqlProvider.GetSql(qIndexInvisible));
+    EditLink := EnumEditor;
+  end else if (Level = 1) and (Column = IndexColNumName) then begin
     // Column names pulldown
     EnumEditor := TEnumEditorLink.Create(VT, True, nil);
     ColNode := listColumns.GetFirst;
@@ -2401,7 +2447,7 @@ procedure TfrmTableEditor.treeIndexesCreateEditor(Sender: TBaseVirtualTree;
     end;
     EnumEditor.AllowCustomText := True; // Allows adding a subpart in index parts: "TextCol(20)"
     EditLink := EnumEditor;
-  end else if (Level = 1) and (Column = 4) then begin
+  end else if (Level = 1) and (Column = IndexColNumDirection) then begin
     EnumEditor := TEnumEditorLink.Create(VT, True, nil);
     EnumEditor.ValueList := Explode(',', ',ASC,DESC');
     EditLink := EnumEditor;
@@ -2423,14 +2469,15 @@ procedure TfrmTableEditor.treeIndexesNewText(Sender: TBaseVirtualTree;
     0: begin
        TblKey := FKeys[Node.Index];
        case Column of
-         0: TblKey.Name := NewText;
-         1: begin
+         IndexColNumName: TblKey.Name := NewText;
+         IndexColNumType: begin
              TblKey.IndexType := NewText;
              if NewText = TTableKey.PRIMARY then
                TblKey.Name := TTableKey.PRIMARY;
            end;
-         2: TblKey.Algorithm := NewText;
-         3: TblKey.Comment := NewText;
+         IndexColNumAlgorithm: TblKey.Algorithm := NewText;
+         IndexColNumComment: TblKey.Comment := NewText;
+         IndexColNumVisibility: TblKey.Visible := SameText(NewText, DBObject.Connection.SqlProvider.GetSql(qIndexVisible));
        end;
        // Needs to be called manually for Name and IndexType properties:
        TblKey.Modification(Sender);
@@ -2438,7 +2485,7 @@ procedure TfrmTableEditor.treeIndexesNewText(Sender: TBaseVirtualTree;
     1: begin
        TblKey := FKeys[Node.Parent.Index];
        case Column of
-         0: begin
+         IndexColNumName: begin
            // Detect input of "col(123)" and move "123" into subpart
            rx := TRegExpr.Create;
            rx.Expression := '.+\((\d+)\)';
@@ -2448,8 +2495,8 @@ procedure TfrmTableEditor.treeIndexesNewText(Sender: TBaseVirtualTree;
            end else
              TblKey.Columns[Node.Index] := NewText;
          end;
-         1: TblKey.SubParts[Node.Index] := NewText;
-         4: begin
+         IndexColNumType: TblKey.SubParts[Node.Index] := NewText;
+         IndexColNumDirection: begin
            if NewText.ToLower = 'asc' then
              TblKey.Collations[Node.Index] := 'A'
            else

From 61bc258bc1728f36e19a4f2233d54bf19d000104 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Tue, 31 Mar 2026 19:32:25 +0200
Subject: [PATCH 44/45] fix(ui): size and margin of buttons on SQL help dialog

---
 source/sqlhelp.lfm | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/source/sqlhelp.lfm b/source/sqlhelp.lfm
index 23a878db9..6cf927bcc 100644
--- a/source/sqlhelp.lfm
+++ b/source/sqlhelp.lfm
@@ -19,20 +19,20 @@ object frmSQLhelp: TfrmSQLhelp
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 5
-    Height = 304
+    Height = 314
     Top = 5
     Width = 572
     Align = alClient
     BorderSpacing.Around = 5
     BevelOuter = bvNone
-    ClientHeight = 304
+    ClientHeight = 314
     ClientWidth = 572
     ParentBackground = False
     TabOrder = 0
     object Splitter1: TSplitter
       Cursor = crSizeWE
       Left = 153
-      Height = 304
+      Height = 314
       Top = 0
       Width = 8
     end
@@ -42,12 +42,12 @@ object frmSQLhelp: TfrmSQLhelp
       AnchorSideRight.Control = Splitter1
       AnchorSideRight.Side = asrBottom
       Left = 0
-      Height = 304
+      Height = 314
       Top = 0
       Width = 153
       Align = alLeft
       BevelOuter = bvNone
-      ClientHeight = 304
+      ClientHeight = 314
       ClientWidth = 153
       ParentBackground = False
       TabOrder = 0
@@ -79,7 +79,7 @@ object frmSQLhelp: TfrmSQLhelp
         AnchorSideRight.Control = pnlLeft
         AnchorSideRight.Side = asrBottom
         Left = 2
-        Height = 275
+        Height = 285
         Top = 27
         Width = 149
         Align = alClient
@@ -106,12 +106,12 @@ object frmSQLhelp: TfrmSQLhelp
       AnchorSideRight.Control = pnlMain
       AnchorSideRight.Side = asrBottom
       Left = 161
-      Height = 304
+      Height = 314
       Top = 0
       Width = 411
       Align = alClient
       BevelOuter = bvNone
-      ClientHeight = 304
+      ClientHeight = 314
       ClientWidth = 411
       ParentBackground = False
       TabOrder = 1
@@ -254,7 +254,7 @@ object frmSQLhelp: TfrmSQLhelp
       end
       inline MemoExample: TSynEdit
         Left = 2
-        Height = 98
+        Height = 108
         Top = 204
         Width = 407
         Align = alClient
@@ -347,27 +347,27 @@ object frmSQLhelp: TfrmSQLhelp
   end
   object pnlBottom: TPanel
     Left = 5
-    Height = 36
-    Top = 314
+    Height = 26
+    Top = 324
     Width = 572
     Align = alBottom
     AutoSize = True
     BorderSpacing.Around = 5
     BevelOuter = bvNone
-    ClientHeight = 36
+    ClientHeight = 26
     ClientWidth = 572
     ParentBackground = False
     TabOrder = 1
     object btnSearchOnline: TSpeedButton
       AnchorSideTop.Control = pnlBottom
       AnchorSideRight.Control = ButtonClose
-      Left = 406
+      Left = 366
       Height = 26
-      Top = 5
+      Top = 0
       Width = 101
       Anchors = [akTop, akRight]
       AutoSize = True
-      BorderSpacing.Around = 5
+      Constraints.MinWidth = 100
       Caption = 'Search online'
       Images = MainForm.ImageListMain
       ImageIndex = 69
@@ -377,15 +377,16 @@ object frmSQLhelp: TfrmSQLhelp
       AnchorSideTop.Control = pnlBottom
       AnchorSideRight.Control = pnlBottom
       AnchorSideRight.Side = asrBottom
-      Left = 512
+      Left = 472
       Height = 25
-      Top = 5
-      Width = 55
+      Top = 0
+      Width = 100
       Anchors = [akTop, akRight]
       AutoSize = True
-      BorderSpacing.Around = 5
+      BorderSpacing.Left = 5
       Cancel = True
       Caption = 'Close'
+      Constraints.MinWidth = 100
       Default = True
       TabOrder = 0
       OnClick = ButtonCloseClick

From af68d110e2657d46c5f2420686f5d8b813fc6bf3 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Sun, 12 Apr 2026 13:35:58 +0200
Subject: [PATCH 45/45] Bump version for v12.17 release

---
 heidisql.lpi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/heidisql.lpi b/heidisql.lpi
index 7bfd3bff4..6a11785d9 100644
--- a/heidisql.lpi
+++ b/heidisql.lpi
@@ -25,7 +25,7 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="12"/>
-      <MinorVersionNr Value="16"/>
+      <MinorVersionNr Value="17"/>
       <RevisionNr Value="1"/>
       <BuildNr Value="1"/>
     </VersionInfo>