Skip to content

Commit 970c555

Browse files
committed
fix (AccountingDB): escape column name
1 parent 6214925 commit 970c555

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/DIRAC/AccountingSystem/DB/AccountingDB.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def loadPendingRecords(self):
205205
% self.getWaitingRecordsLifeTime()
206206
)
207207
req = "SELECT "
208-
req += ",".join(sqlFields)
208+
req += ", ".join([f"`{f}`" for f in sqlFields])
209209
req += f" FROM {sqlTableName} "
210210
req += "WHERE taken = 0 or TIMESTAMPDIFF( SECOND, takenSince, UTC_TIMESTAMP() ) > %s "
211211
args = [self.getWaitingRecordsLifeTime()]
@@ -713,7 +713,7 @@ def __writeBuckets(self, typeName, buckets, keyValues, valuesList, connObj=False
713713
sqlFields.extend(self.dbCatalog[typeName]["keys"])
714714
sqlFields.extend(self.dbCatalog[typeName]["values"])
715715
sqlUpData = ["entriesInBucket=entriesInBucket+VALUES(entriesInBucket)"]
716-
sqlUpData.extend([f"{x}={x}+VALUES({x})" for x in self.dbCatalog[typeName]["values"]])
716+
sqlUpData.extend([f"`{x}`=`{x}`+VALUES(`{x}`)" for x in self.dbCatalog[typeName]["values"]])
717717
valueGroups = []
718718
sqlValues = []
719719
for bucketInfo in buckets:
@@ -734,7 +734,7 @@ def __writeBuckets(self, typeName, buckets, keyValues, valuesList, connObj=False
734734
req = "INSERT INTO "
735735
req += self._getTableName("bucket", typeName)
736736
req += " ("
737-
req += ",".join(sqlFields)
737+
req += ", ".join([f"`{f}`" for f in sqlFields])
738738
req += ") VALUES "
739739
req += ",".join(valueGroups)
740740
req += " ON DUPLICATE KEY UPDATE "

0 commit comments

Comments
 (0)