From 0bd13a627ef46f16f54d0596523aebd9c9d55dc6 Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Mon, 28 Jul 2025 18:31:01 -0700 Subject: [PATCH] query_tuple, check result for None --- brozzler/ydl.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/brozzler/ydl.py b/brozzler/ydl.py index 4291eef..c151c3e 100644 --- a/brozzler/ydl.py +++ b/brozzler/ydl.py @@ -87,16 +87,14 @@ class VideoDataClient: self.pool = pool def _execute_pg_query( - self, query: str, row_factory=None, fetchone=False, fetchall=False + self, query_tuple, row_factory=None, fetchall=False ) -> Optional[Any]: + query_str, params = query_tuple try: with self.pool.connection() as conn: with conn.cursor(row_factory=row_factory) as cur: - cur.execute(query) - if fetchone: - return cur.fetchone() - if fetchall: - return cur.fetchall() + cur.execute(query_str, params) + return cur.fetchall() if fetchall else cur.fetchone() except PoolTimeout as e: logger.warn("hit PoolTimeout: %s", e) self.pool.check() @@ -162,9 +160,14 @@ class VideoDataClient: ), ) try: - results = [ - row[0] for row in self._execute_pg_query(pg_query, fetchall=True) - ] + result = self._execute_pg_query(pg_query, fetchall=True) + if result: + results = [ + row[0] + for row in self._execute_pg_query(pg_query, fetchall=True) + ] + else: + results = None except Exception as e: logger.warn("postgres query failed: %s", e) results = []