opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support multiple objects selected in user manager > add object.

Browse Source
This commit is contained in:
Ansgar Becker
2016-08-29 18:37:00 +00:00
parent c20915c3c1
commit ade0bd3f44
2 changed files with 77 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
source/selectdbobject.pas
View File

@ -34,13 +34,13 @@ type
private
{ Private declarations }
FConnection: TDBConnection;
function GetSelectedObject: TDBObject;
function GetSelectedObjects: TDBObjectList;
public
{ Public declarations }
property SelectedObject: TDBObject read GetSelectedObject;
property SelectedObjects: TDBObjectList read GetSelectedObjects;
end;
function SelectDBO: TDBObject;
function SelectDBObjects: TDBObjectList;
implementation
@ -48,14 +48,14 @@ uses main, helpers;
{$R *.dfm}
function SelectDBO: TDBObject;
function SelectDBObjects: TDBObjectList;
var
Dialog: TfrmSelectDBObject;
begin
Dialog := TfrmSelectDBObject.Create(Mainform);
Result := nil;
if Dialog.ShowModal = mrOK then
Result := Dialog.SelectedObject;
Result := Dialog.SelectedObjects;
Dialog.Free;
end;
@ -67,6 +67,7 @@ begin
Height := AppSettings.ReadInt(asSelectDBOWindowHeight);
InheritFont(Font);
TreeDBO.TreeOptions := MainForm.DBtree.TreeOptions;
TreeDBO.TreeOptions.SelectionOptions := TreeDBO.TreeOptions.SelectionOptions + [toMultiSelect];
FixVT(TreeDBO);
FConnection := MainForm.ActiveConnection;
end;
@ -101,29 +102,37 @@ begin
end;
function TfrmSelectDBObject.GetSelectedObject: TDBObject;
function TfrmSelectDBObject.GetSelectedObjects: TDBObjectList;
var
Obj: TDBObject;
DBObj: PDBObject;
Node: PVirtualNode;
begin
// Return currently selected object, either from tree node or from edit boxes
Result := nil;
Result := TDBObjectList.Create;
if editDb.Modified then begin
Result := TDBObject.Create(FConnection);
Result.Database := editDb.Text;
Result.NodeType := lntDb;
end else if Assigned(TreeDBO.FocusedNode) then begin
DBObj := TreeDBO.GetNodeData(TreeDBO.FocusedNode);
Result := TDBObject.Create(DBObj.Connection);
Result.Assign(DBObj^);
// Database privileges can be wildcarded. Tables/columns not so.
if Result.NodeType = lntDb then
Result.Database := esc(Result.Database, True, False);
if Result.NodeType = lntNone then begin
Result.NodeType := lntDb;
Result.Database := '%';
Obj := TDBObject.Create(FConnection);
Obj.Database := editDb.Text;
Obj.NodeType := lntDb;
Result.Add(Obj);
end else if TreeDBO.SelectedCount > 0 then begin
Node := GetNextNode(TreeDBO, nil, True);
while Assigned(Node) do begin
DBObj := TreeDBO.GetNodeData(Node);
Obj := TDBObject.Create(DBObj.Connection);
Obj.Assign(DBObj^);
// Database privileges can be wildcarded. Tables/columns not so.
if Obj.NodeType = lntDb then
Obj.Database := esc(Obj.Database, True, False);
if Obj.NodeType = lntNone then begin
Obj.NodeType := lntDb;
Obj.Database := '%';
end;
Result.Add(Obj);
Node := GetNextNode(TreeDBO, Node, True);
end;
end;
// Let the result be nil to indicate we have no selected node
// Let the result be empty to indicate we have no selected node
end;
procedure TfrmSelectDBObject.TreeDBOFocusChanged(Sender: TBaseVirtualTree;

86
source/usermanager.pas
View File

@ -1073,51 +1073,59 @@ end;
procedure TUserManagerForm.btnAddObjectClick(Sender: TObject);
var
DBObj: TDBObject;
DBObjects: TDBObjectList;
DBObject: TDBObject;
Priv: TPrivObj;
Node, Child: PVirtualNode;
ObjectExists: Boolean;
begin
// Add new privilege object
DBObj := SelectDBO;
if not Assigned(DBObj) then
// Add new privilege object(s)
DBObjects := SelectDBObjects;
if (not Assigned(DBObjects)) or (DBObjects.Count = 0) then
Exit;
// Check for unsupported object type, selectable in tree
if not (DBObj.NodeType in [lntDb, lntTable, lntView, lntFunction, lntProcedure, lntColumn]) then begin
ErrorDialog(f_('Objects of type %s cannot be part of privileges.', [_(DBObj.ObjType)]));
Exit;
end;
// Check if this would be a duplicate object
for Priv in FPrivObjects do begin
if Priv.DBObj.IsSameAs(DBObj) then begin
ErrorDialog(_('Selected object is already accessible.'));
Exit;
end;
end;
for DBObject in DBObjects do begin
Priv := TPrivObj.Create;
Priv.DBObj := DBObj;
case Priv.DBObj.NodeType of
lntNone: Priv.AllPrivileges := PrivsGlobal;
lntDb: Priv.AllPrivileges := PrivsDb;
lntTable, lntView: Priv.AllPrivileges := PrivsTable;
lntFunction, lntProcedure: Priv.AllPrivileges := PrivsRoutine;
lntColumn: Priv.AllPrivileges := PrivsColumn;
// Check for unsupported object type, selectable in tree
if not (DBObject.NodeType in [lntDb, lntTable, lntView, lntFunction, lntProcedure, lntColumn]) then begin
ErrorDialog(f_('Objects of type %s cannot be part of privileges.', [_(DBObject.ObjType)]));
Continue;
end;
// Check if this would be a duplicate object
ObjectExists := False;
for Priv in FPrivObjects do begin
if Priv.DBObj.IsSameAs(DBObject) then
ObjectExists := True;
end;
if ObjectExists then begin
ErrorDialog(_('Selected object is already accessible.'));
Continue;
end;
Priv := TPrivObj.Create;
Priv.DBObj := DBObject;
case Priv.DBObj.NodeType of
lntNone: Priv.AllPrivileges := PrivsGlobal;
lntDb: Priv.AllPrivileges := PrivsDb;
lntTable, lntView: Priv.AllPrivileges := PrivsTable;
lntFunction, lntProcedure: Priv.AllPrivileges := PrivsRoutine;
lntColumn: Priv.AllPrivileges := PrivsColumn;
end;
// Assign minimum privileges
case Priv.DBObj.NodeType of
lntFunction, lntProcedure: Priv.AddedPrivs.Add('EXECUTE');
else Priv.AddedPrivs.Add('SELECT');
end;
Priv.Added := True;
FPrivObjects.Add(Priv);
Node := treePrivs.AddChild(nil);
Child := treePrivs.GetFirstChild(Node);
while Assigned(Child) do
Child := treePrivs.GetNextSibling(Child);
treePrivs.Expanded[Node] := True;
treePrivs.SetFocus;
SelectNode(treePrivs, Node);
Modified := True;
end;
// Assign minimum privileges
case Priv.DBObj.NodeType of
lntFunction, lntProcedure: Priv.AddedPrivs.Add('EXECUTE');
else Priv.AddedPrivs.Add('SELECT');
end;
Priv.Added := True;
FPrivObjects.Add(Priv);
Node := treePrivs.AddChild(nil);
Child := treePrivs.GetFirstChild(Node);
while Assigned(Child) do
Child := treePrivs.GetNextSibling(Child);
treePrivs.Expanded[Node] := True;
treePrivs.SetFocus;
SelectNode(treePrivs, Node);
Modified := True;
end;