1090 fix(m2m): Return empty list if there are no m2m entries (#1089)

* fix(m2m): Return empty list if there are no m2m entries * add a test --------- Co-authored-by: Daniel Townsend <[email protected]>
piccolo-orm · Oct 1, 2024 · 5173a39 · 5173a39
1 parent 36ccc28
commit 5173a39
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/piccolo/columns/m2m.py b/piccolo/columns/m2m.py
@@ -384,8 +384,12 @@ async def run(self):
             .output(as_list=True)
         )
 
-        results = await secondary_table.objects().where(
-            secondary_table._meta.primary_key.is_in(ids)
+        results = (
+            await secondary_table.objects().where(
+                secondary_table._meta.primary_key.is_in(ids)
+            )
+            if len(ids) > 0
+            else []
         )
 
         return results

diff --git a/tests/columns/m2m/base.py b/tests/columns/m2m/base.py
@@ -434,6 +434,22 @@ def test_get_m2m(self):
 
         self.assertEqual([i.name for i in genres], ["Rock", "Folk"])
 
+    def test_get_m2m_no_rows(self):
+        """
+        If there are no matching objects, then an empty list should be
+        returned.
+
+        https://github.com/piccolo-orm/piccolo/issues/1090
+
+        """
+        band = Band.objects().get(Band.name == "Pythonistas").run_sync()
+        assert band is not None
+
+        Genre.delete(force=True).run_sync()
+
+        genres = band.get_m2m(Band.genres).run_sync()
+        self.assertEqual(genres, [])
+
     def test_remove_m2m(self):
         """
         Make sure we can remove related items via the joining table.