Merge pull request #8684 from ryuwd/fix/bad-escaping

fix: handle NoneType correctly inside __escapeString and _escapeValues

Author: aldbr

src/DIRAC/Core/Utilities/MySQL.py

@@ -611,7 +611,8 @@ def __escapeString(self, myString, connection=None):
             if not retDict["OK"]:
                 return retDict
             connection = retDict["Value"]
-
+        if myString is None:
+            return S_OK("NULL")
         if isinstance(myString, bytes):
             myString = myString.decode()
         try:
@@ -721,7 +722,9 @@ def _escapeValues(self, inValues=None):
             return S_OK(inEscapeValues)
 
         for value in inValues:
-            if isinstance(value, str):
+            if value is None:
+                inEscapeValues.append("NULL")
+            elif isinstance(value, str):
                 retDict = self.__escapeString(value, connection=connection)
                 if not retDict["OK"]:
                     return retDict