From 1bef879dacebae4a149eeafef8b1ba8431a87c31 Mon Sep 17 00:00:00 2001 From: John Burwell Date: Sun, 28 May 2023 14:03:54 -0500 Subject: [PATCH] use result.rowcount instead of RETURNING for compatibility --- rsbbs/plugins/delete/plugin.py | 5 ++--- rsbbs/plugins/deletem/plugin.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rsbbs/plugins/delete/plugin.py b/rsbbs/plugins/delete/plugin.py index f568c96..45b247c 100644 --- a/rsbbs/plugins/delete/plugin.py +++ b/rsbbs/plugins/delete/plugin.py @@ -49,13 +49,12 @@ class Plugin(): sqlalchemy.and_( Message.recipient == self.api.config.calling_station, Message.id == number, - )).returning(Message) + )) result = session.execute( statement, execution_options={"prebuffer_rows": True}) + count = result.rowcount session.commit() - results = result.all() - count = len(results) if count > 0: self.api.write_output(f"Deleted message #{number}") logging.info(f"deleted message {number}") diff --git a/rsbbs/plugins/deletem/plugin.py b/rsbbs/plugins/deletem/plugin.py index a16b97c..fad9cc6 100644 --- a/rsbbs/plugins/deletem/plugin.py +++ b/rsbbs/plugins/deletem/plugin.py @@ -43,13 +43,12 @@ class Plugin(): try: statement = sqlalchemy.delete(Message).where( Message.recipient == self.api.config.calling_station - ).returning(Message) + ) result = session.execute( statement, execution_options={"prebuffer_rows": True}) + count = result.rowcount session.commit() - messages = result.all() - count = len(messages) if count > 0: self.api.write_output(f"Deleted {count} messages") logging.info(f"deleted {count} messages")