feat (UserProfileDB): changed fields from BLOB to TEXT

Author: fstagni

src/DIRAC/FrameworkSystem/DB/UserProfileDB.py

@@ -51,7 +51,7 @@ class UserProfileDB(DB):
                 "VOId": "INTEGER",
                 "Profile": "VARCHAR(255) NOT NULL",
                 "VarName": "VARCHAR(255) NOT NULL",
-                "Data": "BLOB",
+                "Data": "TEXT",
                 "ReadAccess": 'VARCHAR(10) DEFAULT "USER"',
                 "PublishAccess": 'VARCHAR(10) DEFAULT "USER"',
             },
@@ -260,7 +260,8 @@ def retrieveVarById(self, userIds, ownerIds, profileName, varName):
             return result
         data = result["Value"]
         if len(data) > 0:
-            return S_OK(data[0][0].decode())
+            # TODO: The decode is only needed in DIRAC v8.0.x while moving from BLOB -> TEXT
+            return S_OK(data[0][0].decode() if isinstance(data[0][0], bytes) else data[0][0])
         return S_ERROR("No data for userIds %s profileName %s varName %s" % (userIds, profileName, varName))
 
     def retrieveAllUserVarsById(self, userIds, profileName):
@@ -278,7 +279,12 @@ def retrieveAllUserVarsById(self, userIds, profileName):
         if not result["OK"]:
             return result
         data = result["Value"]
-        return S_OK({k: v.decode() for k, v in data})
+        try:
+            # TODO: This is only needed in DIRAC v8.0.x while moving from BLOB -> TEXT
+            allUserDataDict = {k: v.decode() for k, v in data}
+        except AttributeError:
+            allUserDataDict = {k: v for k, v in data}
+        return S_OK(allUserDataDict)
 
     def retrieveUserProfilesById(self, userIds):
         """
@@ -289,12 +295,15 @@ def retrieveUserProfilesById(self, userIds):
         result = self._query(selectSQL)
         if not result["OK"]:
             return result
-        data = result["Value"]
         dataDict = {}
-        for profile, varName, data in data:
+        for profile, varName, data in result["Value"]:
             if profile not in dataDict:
                 dataDict[profile] = {}
-            dataDict[profile][varName] = data.decode()
+            try:
+                # TODO: This is only needed in DIRAC v8.0.x while moving from BLOB -> TEXT
+                dataDict[profile][varName] = data.decode()
+            except AttributeError:
+                dataDict[profile][varName] = data
         return S_OK(dataDict)
 
     def retrieveVarPermsById(self, userIds, ownerIds, profileName, varName):