Merge remote-tracking branch 'original/Develop' into kobo_book_delete

2020-01-26 15:58:57 -05:00
parent 4547c328bc 2eec329bdf
commit 9804a98af8
19 changed files with 628 additions and 435 deletions
@@ -479,7 +479,8 @@ def migrate_Database(session):
 def clean_database(session):
    # Remove expired remote login tokens
    now = datetime.datetime.now()
-    session.query(RemoteAuthToken).filter(now > RemoteAuthToken.expiration).delete()
+    session.query(RemoteAuthToken).filter(now > RemoteAuthToken.expiration).\
+        filter(RemoteAuthToken.token_type !=1 ).delete()
    session.commit()