diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
index 9f34afe1a2e041479d9c51d7f345fbc71463cdfe..afe7c0e68bb9f801a186959867b26f4d48f5bdad 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
@@ -37,10 +37,9 @@ from lofar.common.postgres import FETCH_NONE,FETCH_ONE,FETCH_ALL
logger = logging.getLogger(__name__)
-
class RADatabase(PostgresDatabaseConnection):
def __init__(self, dbcreds=None, log_queries=False):
- super(RADatabase, self).__init__(dbcreds=dbcreds, log_queries=False)
+ super(RADatabase, self).__init__(dbcreds=dbcreds, log_queries=log_queries)
def getTaskStatuses(self):
query = '''SELECT * from resource_allocation.task_status;'''
@@ -266,7 +265,7 @@ class RADatabase(PostgresDatabaseConnection):
self.executeQuery(query, [task_id])
if commit:
self.commit()
- return self.cursor.rowcount > 0
+ return self._cursor.rowcount > 0
def updateTaskStatusForOtdbId(self, otdb_id, task_status, commit=True):
'''converts task_status and task_type to id's in case one and/or the other are strings'''
@@ -282,7 +281,7 @@ class RADatabase(PostgresDatabaseConnection):
if commit:
self.commit()
- return self.cursor.rowcount > 0
+ return self._cursor.rowcount > 0
def updateTask(self, task_id, mom_id=None, otdb_id=None, task_status=None, task_type=None, specification_id=None, commit=True):
task_status, task_type = self._convertTaskTypeAndStatusToIds(task_status, task_type)
@@ -322,7 +321,7 @@ class RADatabase(PostgresDatabaseConnection):
if commit:
self.commit()
- return self.cursor.rowcount > 0
+ return self._cursor.rowcount > 0
def getTaskPredecessorIds(self):
query = '''SELECT * from resource_allocation.task_predecessor tp;'''
@@ -430,7 +429,7 @@ class RADatabase(PostgresDatabaseConnection):
self.executeQuery(query, [specification_id])
if commit:
self.commit()
- return self.cursor.rowcount > 0
+ return self._cursor.rowcount > 0
def updateSpecification(self, specification_id, starttime=None, endtime=None, content=None, commit=True):
fields = []
@@ -460,7 +459,7 @@ class RADatabase(PostgresDatabaseConnection):
if commit:
self.commit()
- return self.cursor.rowcount > 0
+ return self._cursor.rowcount > 0
def getResourceTypes(self):
query = '''SELECT rt.*, rtu.units as unit
@@ -773,7 +772,7 @@ class RADatabase(PostgresDatabaseConnection):
# finally we have all the info we need,
# so we can build the bulk property insert query
- insert_values = ','.join(self.cursor.mogrify('(%s, %s, %s, %s, %s)',
+ insert_values = ','.join(self._cursor.mogrify('(%s, %s, %s, %s, %s)',
(p[0],
type_string2id[p[1]] if
isinstance(p[1], basestring) else p[1],
@@ -806,7 +805,7 @@ class RADatabase(PostgresDatabaseConnection):
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) for rcid_sapnr in sap_numbers)
query = '''INSERT INTO resource_allocation.sap
(resource_claim_id, number)
@@ -983,7 +982,7 @@ class RADatabase(PostgresDatabaseConnection):
# 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) for cv in claim_values)
+ insert_values = ','.join(self._cursor.mogrify('(%s, %s, %s, %s, %s, %s, %s, %s, %s)', cv) for cv in claim_values)
except Exception as e:
logger.error("Invalid input, rolling back: %s\n%s" % (claim_values, e))
self.rollback()
@@ -1032,7 +1031,7 @@ class RADatabase(PostgresDatabaseConnection):
self.executeQuery(query, [resource_claim_id])
if commit:
self.commit()
- return self.cursor.rowcount > 0
+ return self._cursor.rowcount > 0
def updateResourceClaim(self, resource_claim_id, resource_id=None, task_id=None, starttime=None, endtime=None, status=None, session_id=None, claim_size=None, username=None, user_id=None, validate=True, commit=True):
return self.updateResourceClaims([resource_claim_id], resource_id, task_id, starttime, endtime, status, session_id, claim_size, username, user_id, validate, commit)
@@ -1106,7 +1105,7 @@ class RADatabase(PostgresDatabaseConnection):
if commit:
self.commit()
- return self.cursor.rowcount > 0
+ return self._cursor.rowcount > 0
def updateTaskAndResourceClaims(self, task_id, starttime=None, endtime=None, task_status=None, claim_status=None, session_id=None, username=None, user_id=None, commit=True):
@@ -1313,10 +1312,10 @@ class RADatabase(PostgresDatabaseConnection):
return conflict_reasons
def insertTaskConflicts(self, task_id, conflict_reason_ids, commit=True):
- if not self.cursor:
+ 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)) for cr_id in conflict_reason_ids)
query = '''INSERT INTO resource_allocation.task_conflict_reason
(task_id, conflict_reason_id)
@@ -1372,10 +1371,10 @@ class RADatabase(PostgresDatabaseConnection):
return conflict_reasons
def insertResourceClaimConflicts(self, claim_id, conflict_reason_ids, commit=True):
- if not self.cursor:
+ 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)) for cr_id in conflict_reason_ids)
query = '''INSERT INTO resource_allocation.resource_claim_conflict_reason
(resource_claim_id, conflict_reason_id)