Fix for unicode PK

thomaxxl · Aug 22, 2024 · 8889ff9 · 8889ff9
1 parent d68e82f
commit 8889ff9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/safrs/jsonapi_formatting.py b/safrs/jsonapi_formatting.py
@@ -72,8 +72,9 @@ def jsonapi_sort(object_query, safrs_object):
         if sort_attr == "id":
             if attr is None:
                 if safrs_object.id_type.primary_keys:
-                    attr = getattr(safrs_object, safrs_object.id_type.primary_keys[0])  # todo: composite keys edge case
-                    sort_attr = attr.name
+                    attr = getattr(safrs_object, safrs_object.id_type.primary_keys[0], None)  # todo: composite keys edge case
+                    if attr is not None: # might be the case if pk is unicode                    
+                        sort_attr = attr.name
                 else:
                     continue
         elif attr is None or sort_attr not in safrs_object._s_jsonapi_attrs:

diff --git a/safrs/safrs_types.py b/safrs/safrs_types.py
@@ -80,7 +80,11 @@ def get_id(cls, obj):
             values = [str(getattr(obj, pk.name)) for pk in cls.columns]
             return cls.delimiter.join(values)
 
-        return getattr(obj, cls.primary_keys[0])
+        pk = getattr(obj, cls.primary_keys[0], None)
+        if pk is None:
+           pks = [ c.name for c in cls.columns[0].table.columns if c.primary_key ]
+           return cls.delimiter.join(pks)
+        return pk
 
     @classmethod
     def get_pks(cls, jsonapi_id):