From 1bb521b6b707954c9d7d00e9ff87942b2853b0b0 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Sun, 16 Jul 2023 06:53:59 -0700 Subject: [PATCH] Updated Photos 8 to Photos 9 schema diff (Ventura to Sonoma) (markdown) --- ...hotos-9-schema-diff-(Ventura-to-Sonoma).md | 223 ++++++++---------- 1 file changed, 103 insertions(+), 120 deletions(-) diff --git a/Photos-8-to-Photos-9-schema-diff-(Ventura-to-Sonoma).md b/Photos-8-to-Photos-9-schema-diff-(Ventura-to-Sonoma).md index 230867b..9ed1ae8 100644 --- a/Photos-8-to-Photos-9-schema-diff-(Ventura-to-Sonoma).md +++ b/Photos-8-to-Photos-9-schema-diff-(Ventura-to-Sonoma).md @@ -56,10 +56,10 @@ CREATE INDEX ZASSET_ZDAYGROUPHIGHLIGHTBEINGSUMMARYASSETS_INDEX ON ZASSET (ZDAYGROUPHIGHLIGHTBEINGSUMMARYASSETS); -+CREATE INDEX ZASSET_ZDUPLICATEMETADATAMATCHINGALBUM_INDEX ON ZASSET (ZDUPLICATEMETADATAMATCHINGALBUM); -+ -+CREATE INDEX ZASSET_ZDUPLICATEPERCEPTUALMATCHINGALBUM_INDEX ON ZASSET (ZDUPLICATEPERCEPTUALMATCHINGALBUM); -+ + CREATE INDEX ZASSET_ZDUPLICATEMETADATAMATCHINGALBUM_INDEX ON ZASSET (ZDUPLICATEMETADATAMATCHINGALBUM); + + CREATE INDEX ZASSET_ZDUPLICATEPERCEPTUALMATCHINGALBUM_INDEX ON ZASSET (ZDUPLICATEPERCEPTUALMATCHINGALBUM); + CREATE INDEX ZASSET_ZEXTENDEDATTRIBUTES_INDEX ON ZASSET (ZEXTENDEDATTRIBUTES); CREATE INDEX ZASSET_ZHIGHLIGHTBEINGASSETS_INDEX ON ZASSET (ZHIGHLIGHTBEINGASSETS); @@ -547,11 +547,12 @@ -CREATE INDEX Z_AssetAnalysisState_sortToken ON ZASSETANALYSISSTATE (ZSORTTOKEN COLLATE BINARY ASC); - -CREATE INDEX Z_AssetAnalysisState_workerType ON ZASSETANALYSISSTATE (ZWORKERTYPE COLLATE BINARY ASC); -+CREATE INDEX Z_Asset_byActiveLibraryScopeParticipationAndShareState ON ZASSET ( -+ ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE COLLATE BINARY ASC, -+ ZLIBRARYSCOPESHARESTATE COLLATE BINARY ASC, -+ ZADDEDDATE COLLATE BINARY DESC -+); +- + CREATE INDEX Z_Asset_byActiveLibraryScopeParticipationAndShareState ON ZASSET ( + ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE COLLATE BINARY ASC, + ZLIBRARYSCOPESHARESTATE COLLATE BINARY ASC, + ZADDEDDATE COLLATE BINARY DESC + ); CREATE INDEX Z_Asset_byAddedDateIndex ON ZASSET (ZADDEDDATE COLLATE BINARY ASC); @@ -575,12 +576,6 @@ CREATE INDEX Z_Asset_byLastSharedDateIndex ON ZASSET (ZLASTSHAREDDATE COLLATE BINARY ASC); --CREATE INDEX Z_Asset_byLibraryScopeAndShareState ON ZASSET ( -- ZLIBRARYSCOPE COLLATE BINARY ASC, -- ZLIBRARYSCOPESHARESTATE COLLATE BINARY ASC, -- ZADDEDDATE COLLATE BINARY DESC --); -- CREATE INDEX Z_Asset_byMediaGroupUUIDIndex ON ZASSET (ZMEDIAGROUPUUID COLLATE BINARY ASC); -CREATE INDEX Z_Asset_byMonoskiType ON ZASSET (ZMONOSKITYPE COLLATE BINARY ASC); @@ -711,10 +706,8 @@ ZDUPLICATEASSETVISIBILITYSTATE COLLATE BINARY ASC ); --CREATE INDEX Z_Asset_forAllPhotosByLibraryScope ON ZASSET ( -- ZLIBRARYSCOPE COLLATE BINARY ASC, -+CREATE INDEX Z_Asset_forAllPhotosByLibraryScopeParticipationState ON ZASSET ( -+ ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE COLLATE BINARY ASC, + CREATE INDEX Z_Asset_forAllPhotosByLibraryScopeParticipationState ON ZASSET ( + ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE COLLATE BINARY ASC, ZDATECREATED COLLATE BINARY ASC, ZADDEDDATE COLLATE BINARY ASC, Z_PK COLLATE BINARY ASC, @@ -729,14 +722,14 @@ ZDUPLICATEASSETVISIBILITYSTATE COLLATE BINARY ASC ); -+CREATE INDEX Z_Asset_forAllPhotosDayGroups ON ZASSET ( -+ ZDAYGROUPHIGHLIGHTBEINGEXTENDEDASSETS COLLATE BINARY ASC, -+ ZDATECREATED COLLATE BINARY ASC, -+ ZSAVEDASSETTYPE COLLATE BINARY ASC, -+ ZVISIBILITYSTATE COLLATE BINARY ASC, -+ ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE COLLATE BINARY ASC -+); -+ + CREATE INDEX Z_Asset_forAllPhotosDayGroups ON ZASSET ( + ZDAYGROUPHIGHLIGHTBEINGEXTENDEDASSETS COLLATE BINARY ASC, + ZDATECREATED COLLATE BINARY ASC, + ZSAVEDASSETTYPE COLLATE BINARY ASC, + ZVISIBILITYSTATE COLLATE BINARY ASC, + ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE COLLATE BINARY ASC + ); + CREATE INDEX Z_Asset_forAllPhotosDays ON ZASSET ( ZHIGHLIGHTBEINGEXTENDEDASSETS COLLATE BINARY ASC, ZDATECREATED COLLATE BINARY ASC @@ -788,8 +781,9 @@ + ZHIDDEN COLLATE BINARY ASC, + ZAVALANCHEPICKTYPE COLLATE BINARY ASC, + ZCOMPLETE COLLATE BINARY ASC -+) -+WHERE + ) + WHERE +- ZHASADJUSTMENTS = 1; + ZIMPORTSESSION IS NOT NULL; + +CREATE INDEX Z_Asset_forAllPhotosPartOfDuplicatedSet ON ZASSET ( @@ -803,14 +797,12 @@ + ZHIDDEN COLLATE BINARY ASC, + ZSAVEDASSETTYPE COLLATE BINARY ASC, + ZAVALANCHEPICKTYPE COLLATE BINARY ASC - ) - WHERE -- ZHASADJUSTMENTS = 1; ++) ++WHERE + ZDUPLICATEASSETVISIBILITYSTATE <> 0; CREATE INDEX Z_Asset_forAllPhotosPrivateOnly ON ZASSET ( -- ZLIBRARYSCOPE COLLATE BINARY ASC, -+ ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE COLLATE BINARY ASC, + ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE COLLATE BINARY ASC, ZDATECREATED COLLATE BINARY ASC, ZADDEDDATE COLLATE BINARY ASC, Z_PK COLLATE BINARY ASC, @@ -825,9 +817,8 @@ ZDUPLICATEASSETVISIBILITYSTATE COLLATE BINARY ASC ) WHERE -- ZLIBRARYSCOPE IS NULL; -+ ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE = 0; -+ + ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE = 0; + +CREATE INDEX Z_Asset_forCPLThumbnailPrefetch ON ZASSET ( + ZTHUMBNAILINDEX COLLATE BINARY DESC, + ZCLOUDLOCALSTATE COLLATE BINARY ASC, @@ -839,7 +830,7 @@ + ZTHUMBNAILINDEX = -1 + AND ZCLOUDLOCALSTATE = 1 + ); - ++ CREATE INDEX Z_Asset_forFavoritesAlbum ON ZASSET ( ZFAVORITE COLLATE BINARY ASC, ZDATECREATED COLLATE BINARY ASC, @@ -985,8 +976,8 @@ ( ZLIBRARYSCOPESHARESTATE = 2 OR ZLIBRARYSCOPESHARESTATE = 16 -+ OR ZLIBRARYSCOPESHARESTATE = 65538 -+ OR ZLIBRARYSCOPESHARESTATE = 65552 + OR ZLIBRARYSCOPESHARESTATE = 65538 + OR ZLIBRARYSCOPESHARESTATE = 65552 ); -CREATE INDEX Z_Asset_forThumbnailAsset ON ZASSET ( @@ -1309,10 +1300,6 @@ CREATE INDEX Z_MigrationHistory_byMigrationDateIndex ON ZMIGRATIONHISTORY (ZMIGRATIONDATE COLLATE BINARY ASC); --CREATE INDEX Z_MigrationHistory_index ON ZMIGRATIONHISTORY (ZINDEX COLLATE BINARY ASC); -- --CREATE INDEX Z_MigrationHistory_migrationDate ON ZMIGRATIONHISTORY (ZMIGRATIONDATE COLLATE BINARY ASC); -- CREATE INDEX Z_Moment_byEndDateIndex ON ZMOMENT (ZENDDATE COLLATE BINARY ASC); CREATE INDEX Z_Moment_byRepresentativeDateIndex ON ZMOMENT (ZREPRESENTATIVEDATE COLLATE BINARY ASC); @@ -1496,21 +1483,21 @@ ZBUNDLEIDTS INTEGER, ZCONTEXTNAMETS INTEGER, ZPROCESSIDTS INTEGER, -- ZTIMESTAMP FLOAT, -- ZAUTHOR VARCHAR, -- ZBUNDLEID VARCHAR, -- ZCONTEXTNAME VARCHAR, -- ZPROCESSID VARCHAR, -- ZQUERYGEN BLOB --); -- --CREATE TABLE ATRANSACTIONSTRING ( -- Z_PK INTEGER PRIMARY KEY, -- Z_ENT INTEGER, -- Z_OPT INTEGER, -- ZNAME VARCHAR --); -- + ZTIMESTAMP FLOAT, + ZAUTHOR VARCHAR, + ZBUNDLEID VARCHAR, + ZCONTEXTNAME VARCHAR, + ZPROCESSID VARCHAR, + ZQUERYGEN BLOB + ); + + CREATE TABLE ATRANSACTIONSTRING ( + Z_PK INTEGER PRIMARY KEY, + Z_ENT INTEGER, + Z_OPT INTEGER, + ZNAME VARCHAR + ); + -CREATE TABLE IF NOT EXISTS "Z_18CLUSTERREJECTEDPERSONS" ( - Z_18CLUSTERREJECTEDFACES INTEGER, - Z_47CLUSTERREJECTEDPERSONS INTEGER, @@ -1601,25 +1588,14 @@ - Z_47INVALIDMERGECANDIDATES INTEGER, - REFLEXIVE INTEGER, - PRIMARY KEY (Z_47INVALIDMERGECANDIDATES, REFLEXIVE) -+ ZTIMESTAMP FLOAT, -+ ZAUTHOR VARCHAR, -+ ZBUNDLEID VARCHAR, -+ ZCONTEXTNAME VARCHAR, -+ ZPROCESSID VARCHAR, -+ ZQUERYGEN BLOB - ); - +-); +- -CREATE TABLE IF NOT EXISTS "Z_47MERGECANDIDATES" ( - Z_47MERGECANDIDATES INTEGER, - REFLEXIVE INTEGER, - PRIMARY KEY (Z_47MERGECANDIDATES, REFLEXIVE) -+CREATE TABLE ATRANSACTIONSTRING ( -+ Z_PK INTEGER PRIMARY KEY, -+ Z_ENT INTEGER, -+ Z_OPT INTEGER, -+ ZNAME VARCHAR - ); - +-); +- CREATE TABLE IF NOT EXISTS "Z_RT_Asset_boundedByRect_node"(nodeno INTEGER PRIMARY KEY, data); CREATE TABLE IF NOT EXISTS "Z_RT_Asset_boundedByRect_parent"(nodeno INTEGER PRIMARY KEY, parentnode); @@ -1707,14 +1683,17 @@ ZSYNDICATIONIDENTIFIER VARCHAR, ZTIMEZONENAME VARCHAR, ZTITLE VARCHAR, -+ ZLIBRARYSCOPEASSETCONTRIBUTORSTOUPDATE BLOB, + ZLIBRARYSCOPEASSETCONTRIBUTORSTOUPDATE BLOB, ZDISTANCEIDENTITY BLOB, ZFACEREGIONS BLOB, ZOBJECTSALIENCYRECTSDATA BLOB, ZORIGINALHASH BLOB, ZPLACEANNOTATIONDATA BLOB, ZREVERSELOCATIONDATA BLOB, - ZSHIFTEDLOCATIONDATA BLOB +- ZSHIFTEDLOCATIONDATA BLOB, +- ZDUPLICATEDETECTORPERCEPTUALPROCESSINGSTATE INTEGER, +- ZLASTVIEWEDDATE TIMESTAMP ++ ZSHIFTEDLOCATIONDATA BLOB ); CREATE TABLE ZALBUMLIST ( @@ -1730,7 +1709,7 @@ Z_PK INTEGER PRIMARY KEY, Z_ENT INTEGER, Z_OPT INTEGER, -+ ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE INTEGER, + ZACTIVELIBRARYSCOPEPARTICIPATIONSTATE INTEGER, ZAVALANCHEPICKTYPE INTEGER, ZBUNDLESCOPE INTEGER, ZCAMERAPROCESSINGADJUSTMENTSTATE INTEGER, @@ -1787,8 +1766,8 @@ ZDAYGROUPHIGHLIGHTBEINGKEYASSETPRIVATE INTEGER, ZDAYGROUPHIGHLIGHTBEINGKEYASSETSHARED INTEGER, ZDAYGROUPHIGHLIGHTBEINGSUMMARYASSETS INTEGER, -+ ZDUPLICATEMETADATAMATCHINGALBUM INTEGER, -+ ZDUPLICATEPERCEPTUALMATCHINGALBUM INTEGER, + ZDUPLICATEMETADATAMATCHINGALBUM INTEGER, + ZDUPLICATEPERCEPTUALMATCHINGALBUM INTEGER, ZEXTENDEDATTRIBUTES INTEGER, ZHIGHLIGHTBEINGASSETS INTEGER, ZHIGHLIGHTBEINGEXTENDEDASSETS INTEGER, @@ -1841,10 +1820,9 @@ ZUNIFORMTYPEIDENTIFIER VARCHAR, ZUUID VARCHAR, ZIMAGEREQUESTHINTS BLOB, -- ZLOCATIONDATA BLOB -+ ZLOCATIONDATA BLOB, + ZLOCATIONDATA BLOB, + ZICONICSCORE FLOAT, -+ ZTRASHEDREASON INTEGER + ZTRASHEDREASON INTEGER ); CREATE TABLE ZASSETANALYSISSTATE ( @@ -2282,10 +2260,10 @@ - ZFOCALLENGTHIN35MM INTEGER, - ZDIGITALZOOMRATIO FLOAT, - ZSLUSHPRESET INTEGER, +- ZTIMEZONEOFFSET INTEGER, ZTIMEZONENAME VARCHAR, - ZDATECREATED TIMESTAMP, -- ZTIMEZONEOFFSET INTEGER -+ ZORIENTATION INTEGER + ZORIENTATION INTEGER ); CREATE TABLE ZFACECROP ( @@ -2395,10 +2373,11 @@ ZUSERQUERYDATA BLOB, ZPROJECTDATA BLOB, - ZCUSTOMQUERYPARAMETERS BLOB, +- ZPRIVACYSTATE INTEGER, - ZDUPLICATETYPE INTEGER, -- ZSEARCHINDEXREBUILDSTATE1 INTEGER, - ZSEARCHINDEXREBUILDSTATE INTEGER, -- ZPRIVACYSTATE INTEGER +- ZSEARCHINDEXREBUILDSTATE1 INTEGER, +- ZPROCESSINGVERSION INTEGER + ZCUSTOMQUERYPARAMETERS BLOB ); @@ -2576,8 +2555,8 @@ ZBLACKLISTEDFEATURE BLOB, ZMOVIEDATA BLOB, - ZPHOTOSGRAPHDATA BLOB, -- ZSHARINGCOMPOSITION INTEGER, -- ZSEARCHINDEXREBUILDSTATE INTEGER +- ZSEARCHINDEXREBUILDSTATE INTEGER, +- ZSHARINGCOMPOSITION INTEGER + ZPHOTOSGRAPHDATA BLOB ); @@ -2595,7 +2574,9 @@ + ZFRAMEWORKUUID VARCHAR, ZOSVERSION VARCHAR, ZSTOREUUID VARCHAR, - ZGLOBALKEYVALUES BLOB +- ZGLOBALKEYVALUES BLOB, +- ZFRAMEWORKUUID VARCHAR ++ ZGLOBALKEYVALUES BLOB ); CREATE TABLE ZMOMENT ( @@ -2792,10 +2773,8 @@ Z_OPT INTEGER, ZADDITIONALASSETATTRIBUTES INTEGER, ZDATA BLOB, -- ZDUPLICATEMATCHINGDATA BLOB, -- ZDUPLICATEMATCHINGALTERNATEDATA BLOB -+ ZDUPLICATEMATCHINGALTERNATEDATA BLOB, -+ ZDUPLICATEMATCHINGDATA BLOB + ZDUPLICATEMATCHINGALTERNATEDATA BLOB, + ZDUPLICATEMATCHINGDATA BLOB ); CREATE TABLE ZSHARE ( @@ -2842,7 +2821,11 @@ ZSHAREURL VARCHAR, ZRULESDATA BLOB, ZPREVIEWDATA BLOB, - ZTHUMBNAILIMAGEDATA BLOB +- ZTHUMBNAILIMAGEDATA BLOB, +- ZEXITSOURCE INTEGER, +- ZCOUNTOFASSETSADDEDBYCAMERASMARTSHARING INTEGER, +- ZEXITTYPE INTEGER ++ ZTHUMBNAILIMAGEDATA BLOB ); CREATE TABLE ZSHAREPARTICIPANT ( @@ -2850,7 +2833,7 @@ Z_ENT INTEGER, Z_OPT INTEGER, ZACCEPTANCESTATUS INTEGER, -+ ZEXITSTATE INTEGER, + ZEXITSTATE INTEGER, ZISCURRENTUSER INTEGER, ZPERMISSION INTEGER, ZROLE INTEGER, @@ -3510,21 +3493,24 @@ ZFACECOUNT = IFNULL(ZFACECOUNT, 0) + 1 WHERE - NEW.ZPERSON = Z_PK; -- --SELECT -- NSCoreDataTriggerUpdateAffectedObjectValue('ZPERSON', Z_ENT, Z_PK, 'ZFACECOUNT', ZFACECOUNT) --FROM -- ZPERSON --WHERE ++ NEW.ZPERSONFORFACE = Z_PK; + + SELECT + NSCoreDataTriggerUpdateAffectedObjectValue('ZPERSON', Z_ENT, Z_PK, 'ZFACECOUNT', ZFACECOUNT) + FROM + ZPERSON + WHERE - Z_PK = NEW.ZPERSON; -- --END; -- ++ Z_PK = NEW.ZPERSONFORFACE; + + END; + -CREATE TRIGGER ZT_ZPERSON_ZFACECOUNT_ZDETECTEDFACE_ZPERSON_INSERT_INCREMENT --AFTER ++CREATE TRIGGER ZT_ZPERSON_ZFACECOUNT_ZDETECTEDFACE_ZPERSONFORFACE_UPDATE_DECREMENT + AFTER -INSERT - ON ZPERSON FOR EACH ROW BEGIN --UPDATE + UPDATE - ZPERSON -SET - ZFACECOUNT = ( @@ -3542,22 +3528,19 @@ - ) -WHERE - Z_PK = NEW.Z_PK; -+ NEW.ZPERSONFORFACE = Z_PK; - - SELECT - NSCoreDataTriggerUpdateAffectedObjectValue('ZPERSON', Z_ENT, Z_PK, 'ZFACECOUNT', ZFACECOUNT) - FROM - ZPERSON - WHERE +- +-SELECT +- NSCoreDataTriggerUpdateAffectedObjectValue('ZPERSON', Z_ENT, Z_PK, 'ZFACECOUNT', ZFACECOUNT) +-FROM +- ZPERSON +-WHERE - Z_PK = NEW.Z_PK; -+ Z_PK = NEW.ZPERSONFORFACE; - - END; - +- +-END; +- -CREATE TRIGGER ZT_ZPERSON_ZFACECOUNT_ZDETECTEDFACE_ZPERSON_UPDATE_DECREMENT -+CREATE TRIGGER ZT_ZPERSON_ZFACECOUNT_ZDETECTEDFACE_ZPERSONFORFACE_UPDATE_DECREMENT - AFTER - UPDATE +-AFTER +-UPDATE - OF ZPERSON ON ZDETECTEDFACE + OF ZPERSONFORFACE ON ZDETECTEDFACE WHEN (