diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py index 7aa4449634205573956e8020631d51c5dc7c341c..cc0a92cadbb848c0006bd21781780552deff629b 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py +++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py @@ -1104,7 +1104,7 @@ class RADatabase: io_type_string2id[p[3]] if isinstance(p[3], str) else p[3], claim_id2sap_nr2sap_id[p[0]].get(p[4]) if - p[0] in claim_id2sap_nr2sap_id else None)) + p[0] in claim_id2sap_nr2sap_id else None)).decode('utf-8') for p in props) query = '''INSERT INTO resource_allocation.resource_claim_property @@ -1129,7 +1129,7 @@ class RADatabase: logger.info('insertSAPNumbers inserting %d sap numbers' % len(sap_numbers)) - insert_values = ','.join(self.cursor.mogrify('(%s, %s)', rcid_sapnr) for rcid_sapnr in sap_numbers) + insert_values = ','.join(self.cursor.mogrify('(%s, %s)', rcid_sapnr).decode('utf-8') for rcid_sapnr in sap_numbers) query = '''INSERT INTO resource_allocation.sap (resource_claim_id, number) @@ -1343,7 +1343,7 @@ class RADatabase: # use psycopg2 mogrify to parse and build the insert values # this way we can insert many values in one insert query, returning the id's of each inserted row. # this is much faster than psycopg2's executeMany method - insert_values = ','.join(self.cursor.mogrify("(%s, %s, %s, %s, %s, %s, %s, %s, %s)", cv).decode("UTF-8") for cv in claim_values) + insert_values = ','.join(self.cursor.mogrify("(%s, %s, %s, %s, %s, %s, %s, %s, %s)", cv).decode("utf-8") for cv in claim_values) except Exception as e: logger.error("Invalid input, rolling back: %s\n%s" % (claim_values, e)) self.rollback() @@ -1669,7 +1669,7 @@ class RADatabase: if not self.cursor: self._connect() - insert_values = ','.join(self.cursor.mogrify('(%s, %s)', (task_id, cr_id)) for cr_id in conflict_reason_ids) + insert_values = ','.join(self.cursor.mogrify('(%s, %s)', (task_id, cr_id)).decode('utf-8') for cr_id in conflict_reason_ids) query = '''INSERT INTO resource_allocation.task_conflict_reason (task_id, conflict_reason_id) @@ -1728,7 +1728,7 @@ class RADatabase: if not self.cursor: self._connect() - insert_values = ','.join(self.cursor.mogrify('(%s, %s)', (claim_id, cr_id)) for cr_id in conflict_reason_ids) + insert_values = ','.join(self.cursor.mogrify('(%s, %s)', (claim_id, cr_id)).decode('utf-8') for cr_id in conflict_reason_ids) query = '''INSERT INTO resource_allocation.resource_claim_conflict_reason (resource_claim_id, conflict_reason_id)