opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-14 10:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

User manager form is kept in memory after closing. Later calls need to check the current server version to display the right list of priv names. So, move creation of these lists from Form.OnCreate to Form.OnShow.

Browse Source
This commit is contained in:
Ansgar Becker
2010-11-21 23:21:58 +00:00
parent a2e20b08f1
commit c0ded109b5
1 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
source/usermanager.pas
View File

@ -143,14 +143,6 @@ end;
procedure TUserManagerForm.FormCreate(Sender: TObject); procedure TUserManagerForm.FormCreate(Sender: TObject);
var
Version: Integer;
function InitPrivList(Values: String): TStringList;
begin
Result := Explode(',', Values);
Result.Sorted := True;
Result.Duplicates := dupIgnore;
end;
begin begin
// Restore GUI setup // Restore GUI setup
InheritFont(Font); InheritFont(Font);
@ -160,6 +152,34 @@ begin
SetWindowSizeGrip( Self.Handle, True ); SetWindowSizeGrip( Self.Handle, True );
FixVT(listUsers); FixVT(listUsers);
FixVT(treePrivs); FixVT(treePrivs);
PrivsRead := Explode(',', 'SELECT,SHOW VIEW,SHOW DATABASES,PROCESS,EXECUTE');
PrivsWrite := Explode(',', 'ALTER,CREATE,DROP,DELETE,UPDATE,INSERT,ALTER ROUTINE,CREATE ROUTINE,CREATE TEMPORARY TABLES,CREATE VIEW,INDEX,TRIGGER,EVENT,REFERENCES');
PrivsAdmin := Explode(',', 'RELOAD,SHUTDOWN,REPLICATION CLIENT,REPLICATION SLAVE,SUPER,LOCK TABLES,GRANT,FILE,CREATE USER');
end;
procedure TUserManagerForm.FormDestroy(Sender: TObject);
begin
// FormDestroy: Save GUI setup
OpenRegistry;
MainReg.WriteInteger( REGNAME_USERMNGR_WINWIDTH, Width );
MainReg.WriteInteger( REGNAME_USERMNGR_WINHEIGHT, Height );
MainReg.WriteInteger( REGNAME_USERMNGR_LISTWIDTH, pnlLeft.Width );
end;
procedure TUserManagerForm.FormShow(Sender: TObject);
var
Version: Integer;
function InitPrivList(Values: String): TStringList;
begin
Result := Explode(',', Values);
Result.Sorted := True;
Result.Duplicates := dupIgnore;
end;
begin
Version := Mainform.ActiveConnection.ServerVersionInt; Version := Mainform.ActiveConnection.ServerVersionInt;
PrivsGlobal := InitPrivList('FILE,PROCESS,RELOAD,SHUTDOWN'); PrivsGlobal := InitPrivList('FILE,PROCESS,RELOAD,SHUTDOWN');
PrivsDb := InitPrivList(''); PrivsDb := InitPrivList('');
@ -195,10 +215,6 @@ begin
PrivsDb.AddStrings(PrivsRoutine); PrivsDb.AddStrings(PrivsRoutine);
PrivsGlobal.AddStrings(PrivsDb); PrivsGlobal.AddStrings(PrivsDb);
PrivsRead := InitPrivList('SELECT,SHOW VIEW,SHOW DATABASES,PROCESS,EXECUTE');
PrivsWrite := InitPrivList('ALTER,CREATE,DROP,DELETE,UPDATE,INSERT,ALTER ROUTINE,CREATE ROUTINE,CREATE TEMPORARY TABLES,CREATE VIEW,INDEX,TRIGGER,EVENT,REFERENCES');
PrivsAdmin := InitPrivList('RELOAD,SHUTDOWN,REPLICATION CLIENT,REPLICATION SLAVE,SUPER,LOCK TABLES,GRANT,FILE,CREATE USER');
PrivsGlobal.Sorted := False; PrivsGlobal.Sorted := False;
PrivsGlobal.CustomSort(ComparePrivs); PrivsGlobal.CustomSort(ComparePrivs);
PrivsDb.Sorted := False; PrivsDb.Sorted := False;
@ -209,21 +225,8 @@ begin
PrivsRoutine.CustomSort(ComparePrivs); PrivsRoutine.CustomSort(ComparePrivs);
PrivsColumn.Sorted := False; PrivsColumn.Sorted := False;
PrivsColumn.CustomSort(ComparePrivs); PrivsColumn.CustomSort(ComparePrivs);
end;
procedure TUserManagerForm.FormDestroy(Sender: TObject);
begin
// FormDestroy: Save GUI setup
OpenRegistry;
MainReg.WriteInteger( REGNAME_USERMNGR_WINWIDTH, Width );
MainReg.WriteInteger( REGNAME_USERMNGR_WINHEIGHT, Height );
MainReg.WriteInteger( REGNAME_USERMNGR_LISTWIDTH, pnlLeft.Width );
end;
procedure TUserManagerForm.FormShow(Sender: TObject);
begin
// Load user@host list // Load user@host list
try try
FUsers := MainForm.ActiveConnection.GetCol( FUsers := MainForm.ActiveConnection.GetCol(
@ -255,9 +258,14 @@ end;
procedure TUserManagerForm.FormClose(Sender: TObject; var Action: TCloseAction); procedure TUserManagerForm.FormClose(Sender: TObject; var Action: TCloseAction);
begin begin
// Free user list // Free user list and list of available priv names
FreeAndNil(FUsers); FreeAndNil(FUsers);
FreeAndNil(FPrivObjects); FreeAndNil(FPrivObjects);
FreeAndNil(PrivsGlobal);
FreeAndNil(PrivsDb);
FreeAndNil(PrivsTable);
FreeAndNil(PrivsRoutine);
FreeAndNil(PrivsColumn);
end; end;