Skip to content

[int] Parameterise SQL in DMS SEManager & UserAndGroupManager #8643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaen merged 1 commit into from
Jun 26, 2026
+7 −7
Merged

[int] Parameterise SQL in DMS SEManager & UserAndGroupManager #8643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/SEManager/SEManagerDB.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class SEManagerDB(SEManagerBase):
def _refreshSEs(self, connection=False):
req = "SELECT SEID,SEName FROM FC_StorageElements;"
req = "SELECT SEID,SEName FROM FC_StorageElements"
res = self.db._query(req)
if not res["OK"]:
return res
Expand Down Expand Up @@ -91,8 +91,8 @@ def __removeSE(self, seName, connection=False):
waitTime = time.time()
gLogger.debug(f"SEManager RemoveSE lock created. Waited {waitTime - startTime:.3f} seconds. {seName}")
seid = self.db.seNames.get(seName, "Missing")
req = f"DELETE FROM FC_StorageElements WHERE SEName='{seName}'"
res = self.db._update(req, conn=connection)
req = "DELETE FROM FC_StorageElements WHERE SEName=%s"
res = self.db._update(req, args=(seName,), conn=connection)
if not res["OK"]:
gLogger.debug(f"SEManager RemoveSE lock released. Used {time.time() - waitTime:.3f} seconds. {seName}")
self.lock.release()
Expand Down
8 changes: 4 additions & 4 deletions ...C/DataManagementSystem/DB/FileCatalogComponents/UserGroupManager/UserAndGroupManagerDB.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ def __removeUser(self, uname):
waitTime = time.time()
gLogger.debug(f"UserGroupManager RemoveUser lock created. Waited {waitTime - startTime:.3f} seconds. {uname}")
uid = self.db.users.get(uname, "Missing")
req = f"DELETE FROM FC_Users WHERE UserName='{uname}'"
res = self.db._update(req)
req = "DELETE FROM FC_Users WHERE UserName=%s"
res = self.db._update(req, args=(uname,))
if not res["OK"]:
gLogger.debug(
f"UserGroupManager RemoveUser lock released. Used {time.time() - waitTime:.3f} seconds. {uname}"
Expand Down Expand Up @@ -211,8 +211,8 @@ def __removeGroup(self, group):
waitTime = time.time()
gLogger.debug(f"UserGroupManager RemoveGroup lock created. Waited {waitTime - startTime:.3f} seconds. {group}")
gid = self.db.groups.get(group, "Missing")
req = f"DELETE FROM FC_Groups WHERE GroupName='{group}'"
res = self.db._update(req)
req = "DELETE FROM FC_Groups WHERE GroupName=%s"
res = self.db._update(req, args=(group,))
if not res["OK"]:
gLogger.debug(
f"UserGroupManager RemoveGroup lock released. Used {time.time() - waitTime:.3f} seconds. {group}"
Expand Down
Loading