Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3: Fix sorting on one-one fields that can have None values

Browse Source 
Fixes #1878388 [Private bug](https://bugs.launchpad.net/calibre/+bug/1878388)
This commit is contained in:
Kovid Goyal 2020-05-13 16:59:33 +05:30
parent e40834080e
commit 9c05bb0ff3
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/db/fields.py
View File

@ -192,6 +192,13 @@ class OneToOneField(Field):
dk = self._default_sort_key dk = self._default_sort_key
sk = self._sort_key sk = self._sort_key
if sk is IDENTITY: if sk is IDENTITY:
if dk is not None:
def none_safe_key(book_id):
ans = bcmg(book_id, dk)
if ans is None:
ans = dk
return ans
return none_safe_key
return lambda book_id:bcmg(book_id, dk) return lambda book_id:bcmg(book_id, dk)
return lambda book_id:sk(bcmg(book_id, dk)) return lambda book_id:sk(bcmg(book_id, dk))