jmbwell/rsbbs
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use result.rowcount instead of RETURNING for compatibility
All checks were successful
Test / Test (push) Successful in 1m24s
Details

Browse Source
This commit is contained in:
John Burwell 2023-05-28 14:03:54 -05:00
parent ea71dec87d
commit 1bef879dac
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rsbbs/plugins/delete/plugin.py
View File

@ -49,13 +49,12 @@ class Plugin():
sqlalchemy.and_( sqlalchemy.and_(
Message.recipient == self.api.config.calling_station, Message.recipient == self.api.config.calling_station,
Message.id == number, Message.id == number,
)).returning(Message) ))
result = session.execute( result = session.execute(
statement, statement,
execution_options={"prebuffer_rows": True}) execution_options={"prebuffer_rows": True})
count = result.rowcount
session.commit() session.commit()
results = result.all()
count = len(results)
if count > 0: if count > 0:
self.api.write_output(f"Deleted message #{number}") self.api.write_output(f"Deleted message #{number}")
logging.info(f"deleted message {number}") logging.info(f"deleted message {number}")

5
rsbbs/plugins/deletem/plugin.py
View File

@ -43,13 +43,12 @@ class Plugin():
try: try:
statement = sqlalchemy.delete(Message).where( statement = sqlalchemy.delete(Message).where(
Message.recipient == self.api.config.calling_station Message.recipient == self.api.config.calling_station
).returning(Message) )
result = session.execute( result = session.execute(
statement, statement,
execution_options={"prebuffer_rows": True}) execution_options={"prebuffer_rows": True})
count = result.rowcount
session.commit() session.commit()
messages = result.all()
count = len(messages)
if count > 0: if count > 0:
self.api.write_output(f"Deleted {count} messages") self.api.write_output(f"Deleted {count} messages")
logging.info(f"deleted {count} messages") logging.info(f"deleted {count} messages")