From a6488377f3c9c8bdc1fbf6148a4702329c427986 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 27 Nov 2016 21:08:04 +0100 Subject: [PATCH] Database engine close --- rowers/dataprep.py | 7 +++++-- rowers/models.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 04bef03e..d4430995 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -93,6 +93,7 @@ def delete_strokedata(id): result = conn.execute(query) except: print "Database Locked" + conn.close() def testdata(time,distance,pace,spm): t1 = np.issubdtype(time,np.number) @@ -153,7 +154,8 @@ def prepmultipledata(ids,verbose=False): with engine.connect() as conn, conn.begin(): res = conn.execute(query) res = list(itertools.chain.from_iterable(res.fetchall())) - + conn.close() + res = list(set(ids)-set(res)) for id in res: rowdata,row = getrowdata(id=id) @@ -353,5 +355,6 @@ def dataprep(rowdatadf,id=0,bands=False,barchart=False,otwpower=False): data['workoutid'] = id with engine.connect() as conn, conn.begin(): data.to_sql('strokedata',engine,if_exists='append',index=False) - + conn.close() + return data diff --git a/rowers/models.py b/rowers/models.py index d4c0c7d3..bbc415e9 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -154,7 +154,8 @@ def auto_delete_strokedata_on_delete(sender, instance, **kwargs): result = conn.execute(query) except: print "Database Locked" - + conn.close() + class StrokeData(models.Model): class Meta: db_table = 'strokedata'