diff --git a/osxphotos/photosdb/_photosdb_process_comments.py b/osxphotos/photosdb/_photosdb_process_comments.py index 88a085bd..4c02fcdd 100644 --- a/osxphotos/photosdb/_photosdb_process_comments.py +++ b/osxphotos/photosdb/_photosdb_process_comments.py @@ -75,19 +75,19 @@ def _process_comments_5(photosdb): ZINVITEELASTNAME AS LASTNAME, ZINVITEEFULLNAME AS FULLNAME FROM ZCLOUDSHAREDALBUMINVITATIONRECORD - WHERE HASHEDPERSONID IS NOT NULL - AND HASHEDPERSONID != "" - AND NOT (FIRSTNAME IS NULL AND LASTNAME IS NULL) - UNION - SELECT DISTINCT - ZCLOUDOWNERHASHEDPERSONID AS HASHEDPERSONID, - ZCLOUDOWNERFIRSTNAME AS FIRSTNAME, - ZCLOUDOWNERLASTNAME AS LASTNAME, - ZCLOUDOWNERFULLNAME AS FULLNAME - FROM ZGENERICALBUM - WHERE HASHEDPERSONID IS NOT NULL - AND HASHEDPERSONID != "" - AND NOT (FIRSTNAME IS NULL AND LASTNAME IS NULL) + WHERE HASHEDPERSONID IS NOT NULL + AND HASHEDPERSONID != "" + AND NOT (FIRSTNAME IS NULL AND LASTNAME IS NULL) + UNION + SELECT DISTINCT + ZCLOUDOWNERHASHEDPERSONID AS HASHEDPERSONID, + ZCLOUDOWNERFIRSTNAME AS FIRSTNAME, + ZCLOUDOWNERLASTNAME AS LASTNAME, + ZCLOUDOWNERFULLNAME AS FULLNAME + FROM ZGENERICALBUM + WHERE HASHEDPERSONID IS NOT NULL + AND HASHEDPERSONID != "" + AND NOT (FIRSTNAME IS NULL AND LASTNAME IS NULL) """ )