Fix: use local_concrete_fields

src/modelsubquery/functions.py

@@ -13,7 +13,7 @@ def _model_fields(model, fields):
     then return all the declared fields.
     """
     # TODO: the pk/id field should always be returned
-    declared = {f.column for f in model._meta.get_fields() if f.concrete}
+    declared = {f.column for f in model._meta.local_concrete_fields}
     if fields is None:
         return declared
 

testproject/testapp/tests.py

@@ -3,8 +3,21 @@
 import time_machine
 from django.test import TestCase
 from model_bakery import baker
+from modelsubquery.functions import _model_fields
 
-from .models import Book, Person
+from .models import Book, Person, Shelve
+
+
+class ModelFieldTest(TestCase):
+    def test_model_fields_book(self):
+        fields = _model_fields(Book, None)
+        self.assertEqual(
+            fields, {"id", "title", "author_id", "published", "rating", "has_cover"}
+        )
+
+    def test_model_fields_shelve(self):
+        fields = _model_fields(Shelve, None)
+        self.assertEqual(fields, {"id", "title"})
 
 
 @time_machine.travel("2000-01-01")