From 23be539b8e810d6e62bb6c2837be02a0ba413d27 Mon Sep 17 00:00:00 2001 From: Bartek Ciszkowski Date: Tue, 3 Dec 2024 21:52:25 -0400 Subject: [PATCH] Rename ZGENERICASSET to ZASSET This table was named ZGENERICASSET in Catalina (and some predeccessors), and then renamed to ZASSET, I believe, at Big Sur. On Sonoma, the table is ZASSET --- dogsheep_photos/cli.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dogsheep_photos/cli.py b/dogsheep_photos/cli.py index 9147cd9..7a479de 100644 --- a/dogsheep_photos/cli.py +++ b/dogsheep_photos/cli.py @@ -206,11 +206,11 @@ def apple_photos(db_path, library, image_url_prefix, image_url_suffix): db.conn.execute( """ create table apple_photos_scores as select - ZGENERICASSET.ZUUID, - ZGENERICASSET.ZOVERALLAESTHETICSCORE, - ZGENERICASSET.ZCURATIONSCORE, - ZGENERICASSET.ZPROMOTIONSCORE, - ZGENERICASSET.ZHIGHLIGHTVISIBILITYSCORE, + ZASSET.ZUUID, + ZASSET.ZOVERALLAESTHETICSCORE, + ZASSET.ZCURATIONSCORE, + ZASSET.ZPROMOTIONSCORE, + ZASSET.ZHIGHLIGHTVISIBILITYSCORE, ZCOMPUTEDASSETATTRIBUTES.ZBEHAVIORALSCORE, ZCOMPUTEDASSETATTRIBUTES.ZFAILURESCORE, ZCOMPUTEDASSETATTRIBUTES.ZHARMONIOUSCOLORSCORE, @@ -235,9 +235,9 @@ def apple_photos(db_path, library, image_url_prefix, image_url_suffix): ZCOMPUTEDASSETATTRIBUTES.ZWELLFRAMEDSUBJECTSCORE, ZCOMPUTEDASSETATTRIBUTES.ZWELLTIMEDSHOTSCORE from - attached.ZGENERICASSET + attached.ZASSET join attached.ZCOMPUTEDASSETATTRIBUTES on - attached.ZGENERICASSET.Z_PK = attached.ZCOMPUTEDASSETATTRIBUTES.ZASSET; + attached.ZASSET.Z_PK = attached.ZCOMPUTEDASSETATTRIBUTES.ZASSET; """ ) db["apple_photos_scores"].create_index(["ZUUID"])