sqlExecute now returns rowcount

This allows tracking of how many rows were changed, for example for
UPDATE, DELETE, INSERT.
This commit is contained in:
mailchuck 2016-03-22 17:17:45 +01:00
parent 61c9178978
commit dbac1ee9f7
Signed by untrusted user who does not match committer: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
2 changed files with 6 additions and 3 deletions

View File

@ -546,10 +546,12 @@ class sqlThread(threading.Thread):
return
else:
parameters = shared.sqlSubmitQueue.get()
rowcount = 0
# print 'item', item
# print 'parameters', parameters
try:
self.cur.execute(item, parameters)
rowcount = self.cur.rowcount
except Exception as err:
if str(err) == 'database or disk is full':
logger.fatal('(while cur.execute) Alert: Your disk or data storage volume is full. sqlThread will now exit.')
@ -564,5 +566,5 @@ class sqlThread(threading.Thread):
os._exit(0)
shared.sqlReturnQueue.put(self.cur.fetchall())
shared.sqlReturnQueue.put((self.cur.fetchall(), rowcount))
# shared.sqlSubmitQueue.task_done()

View File

@ -16,7 +16,7 @@ def sqlQuery(sqlStatement, *args):
else:
sqlSubmitQueue.put(args)
queryreturn = sqlReturnQueue.get()
queryreturn, rowcount = sqlReturnQueue.get()
sqlLock.release()
return queryreturn
@ -30,9 +30,10 @@ def sqlExecute(sqlStatement, *args):
else:
sqlSubmitQueue.put(args)
sqlReturnQueue.get()
queryreturn, rowcount = sqlReturnQueue.get()
sqlSubmitQueue.put('commit')
sqlLock.release()
return rowcount
def sqlStoredProcedure(procName):
sqlLock.acquire()