From 658e562c5eeaaabdc9daae5dcabd337cfa5249ab Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 17 Mar 2016 14:25:24 +0000
Subject: [PATCH] Task #8887: check for any fields in update
---
.../ResourceAssignmentDatabase/radb.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
index 16ac177325f..60b603cd051 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
@@ -805,16 +805,17 @@ class RADatabase:
fields.append('user_id')
values.append(user_id)
- values.append(task_id)
+ if fields and values:
+ values.append(task_id)
- query = '''UPDATE resource_allocation.resource_claim
- SET ({fields}) = ({value_placeholders})
- WHERE resource_allocation.resource_claim.task_id = {task_id_placeholder};'''.format(fields=', '.join(fields),
- value_placeholders=', '.join('%s' for x in fields),
- task_id_placeholder='%s')
+ query = '''UPDATE resource_allocation.resource_claim
+ SET ({fields}) = ({value_placeholders})
+ WHERE resource_allocation.resource_claim.task_id = {task_id_placeholder};'''.format(fields=', '.join(fields),
+ value_placeholders=', '.join('%s' for x in fields),
+ task_id_placeholder='%s')
- self._executeQuery(query, values)
- updated &= self.cursor.rowcount > 0
+ self._executeQuery(query, values)
+ updated &= self.cursor.rowcount > 0
self.validateResourceClaimsStatusForTask(task_id, commit=False)
self.validateResourceClaimsStatusForMovedClaims(claimsBeforeUpdate, commit=False)
--
GitLab