From a527fa5e1de2fa3f0143b8bb8422d5581f9763f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Murta?= Date: Thu, 4 May 2023 22:53:22 +0100 Subject: [PATCH] [Fix] Export error on DB access Export operations were using an old Client select methods signature to pass in the opened session. Session is no longer needed to a simple select. --- pfbudget/core/manager.py | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/pfbudget/core/manager.py b/pfbudget/core/manager.py index 14c1965..a9ef5d5 100644 --- a/pfbudget/core/manager.py +++ b/pfbudget/core/manager.py @@ -245,10 +245,7 @@ class Manager: session.insert(transactions) case Operation.Export: - with self.database.session as session: - self.dump( - params[0], params[1], self.database.select(Transaction, session) - ) + self.dump(params[0], params[1], self.database.select(Transaction)) case Operation.Import: transactions = [] @@ -284,8 +281,7 @@ class Manager: self.database.insert(transactions) case Operation.ExportBanks: - with self.database.session as session: - self.dump(params[0], params[1], self.database.select(Bank, session)) + self.dump(params[0], params[1], self.database.select(Bank)) case Operation.ImportBanks: banks = [] @@ -299,12 +295,7 @@ class Manager: self.database.insert(banks) case Operation.ExportCategoryRules: - with self.database.session as session: - self.dump( - params[0], - params[1], - self.database.select(CategoryRule, session), - ) + self.dump(params[0], params[1], self.database.select(CategoryRule)) case Operation.ImportCategoryRules: rules = [CategoryRule(**row) for row in self.load(params[0], params[1])] @@ -313,10 +304,7 @@ class Manager: self.database.insert(rules) case Operation.ExportTagRules: - with self.database.session as session: - self.dump( - params[0], params[1], self.database.select(TagRule, session) - ) + self.dump(params[0], params[1], self.database.select(TagRule)) case Operation.ImportTagRules: rules = [TagRule(**row) for row in self.load(params[0], params[1])] @@ -325,10 +313,7 @@ class Manager: self.database.insert(rules) case Operation.ExportCategories: - with self.database.session as session: - self.dump( - params[0], params[1], self.database.select(Category, session) - ) + self.dump(params[0], params[1], self.database.select(Category)) case Operation.ImportCategories: # rules = [Category(**row) for row in self.load(params[0])] @@ -350,12 +335,7 @@ class Manager: self.database.insert(categories) case Operation.ExportCategoryGroups: - with self.database.session as session: - self.dump( - params[0], - params[1], - self.database.select(CategoryGroup, session), - ) + self.dump(params[0], params[1], self.database.select(CategoryGroup)) case Operation.ImportCategoryGroups: groups = [