From d780572d71375f990347e5cededb8c68c8afaa0a Mon Sep 17 00:00:00 2001 From: Thomas Oettli Date: Thu, 5 Feb 2026 22:05:40 +0100 Subject: [PATCH] Improve database queries --- src/ddns_service/cleanup.py | 2 +- src/ddns_service/cli.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ddns_service/cleanup.py b/src/ddns_service/cleanup.py index a55e59c..3dc3d51 100644 --- a/src/ddns_service/cleanup.py +++ b/src/ddns_service/cleanup.py @@ -22,7 +22,7 @@ def cleanup_expired(app, start_time=None): now = now_utc() expired_count = 0 - for hostname in Hostname.select().join(User).where( + for hostname in Hostname.select(Hostname, User.email).join(User).where( (Hostname.expiry_ttl != 0) & ((Hostname.last_ipv4.is_null(False) & Hostname.last_ipv4_update.is_null(False)) | (Hostname.last_ipv6.is_null(False) & Hostname.last_ipv6_update.is_null(False)))): diff --git a/src/ddns_service/cli.py b/src/ddns_service/cli.py index 336433d..7cb7258 100644 --- a/src/ddns_service/cli.py +++ b/src/ddns_service/cli.py @@ -134,7 +134,7 @@ def cmd_user_email(args, app): def cmd_hostname_list(args, app): """List hostnames.""" - query = Hostname.select().join(User) + query = Hostname.select(Hostname, User.username).join(User) if args.user: try: