From 7ed169d05100b2038d8b0a79e5b2ca408b62b985 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Thu, 16 Jun 2022 14:51:32 +0200 Subject: [PATCH] orderby and limit --- music_assistant/helpers/database.py | 4 +++- music_assistant/models/media_controller.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/music_assistant/helpers/database.py b/music_assistant/helpers/database.py index 329c6bda..d85e42bd 100755 --- a/music_assistant/helpers/database.py +++ b/music_assistant/helpers/database.py @@ -95,7 +95,8 @@ class Database: if match is not None: sql_query += " WHERE " + " AND ".join((f"{x} = :{x}" for x in match)) if order_by is not None: - sql_query += f"ORDER BY {order_by}" + sql_query += f" ORDER BY {order_by}" + sql_query += f" LIMIT {limit} OFFSET {offset}" return await _db.fetch_all(sql_query, match) async def get_rows_from_query( @@ -108,6 +109,7 @@ class Database: ) -> List[Mapping]: """Get all rows for given custom query.""" async with self.get_db(db) as _db: + query = f"{query} LIMIT {limit} OFFSET {offset}" return await _db.fetch_all(query, params) async def iterate_rows( diff --git a/music_assistant/models/media_controller.py b/music_assistant/models/media_controller.py index 0884ee03..e01affa9 100644 --- a/music_assistant/models/media_controller.py +++ b/music_assistant/models/media_controller.py @@ -70,7 +70,7 @@ class MediaControllerBase(Generic[ItemCls], metaclass=ABCMeta): return [ self.item_cls.from_db_row(db_row) for db_row in await self.mass.database.get_rows( - self.db_table, match, limit=limit, offset=offset + self.db_table, match, order_by="name", limit=limit, offset=offset ) ] -- 2.34.1