From 2ec29f26e7a52ee4011f147eeff55ad7dee20b9c Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Tue, 31 Dec 2019 07:46:36 -0800 Subject: [PATCH] Moved some SQL statements to multi-line for easier debugging --- osxphotos/photosdb.py | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/osxphotos/photosdb.py b/osxphotos/photosdb.py index ca984114..ef9e8b6e 100644 --- a/osxphotos/photosdb.py +++ b/osxphotos/photosdb.py @@ -806,29 +806,29 @@ class PhotosDB: # get details about photos logging.debug(f"Getting information about photos") c.execute( - "SELECT ZGENERICASSET.ZUUID, " - "ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT, " - "ZADDITIONALASSETATTRIBUTES.ZTITLE, " - "ZADDITIONALASSETATTRIBUTES.ZORIGINALFILENAME, " - "ZGENERICASSET.ZMODIFICATIONDATE, " - "ZGENERICASSET.ZDATECREATED, " - "ZADDITIONALASSETATTRIBUTES.ZTIMEZONEOFFSET, " - "ZADDITIONALASSETATTRIBUTES.ZINFERREDTIMEZONEOFFSET, " - "ZADDITIONALASSETATTRIBUTES.ZTIMEZONENAME, " - "ZGENERICASSET.ZHIDDEN, " - "ZGENERICASSET.ZFAVORITE, " - "ZGENERICASSET.ZDIRECTORY, " - "ZGENERICASSET.ZFILENAME, " - "ZGENERICASSET.ZLATITUDE, " - "ZGENERICASSET.ZLONGITUDE, " - "ZGENERICASSET.ZHASADJUSTMENTS, " - "ZGENERICASSET.ZCLOUDBATCHPUBLISHDATE, " - "ZGENERICASSET.ZKIND, " - "ZGENERICASSET.ZUNIFORMTYPEIDENTIFIER " - "FROM ZGENERICASSET " - "JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = ZGENERICASSET.Z_PK " - "WHERE ZGENERICASSET.ZTRASHEDSTATE = 0 " - "ORDER BY ZGENERICASSET.ZUUID " + """ SELECT ZGENERICASSET.ZUUID, + ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT, + ZADDITIONALASSETATTRIBUTES.ZTITLE, + ZADDITIONALASSETATTRIBUTES.ZORIGINALFILENAME, + ZGENERICASSET.ZMODIFICATIONDATE, + ZGENERICASSET.ZDATECREATED, + ZADDITIONALASSETATTRIBUTES.ZTIMEZONEOFFSET, + ZADDITIONALASSETATTRIBUTES.ZINFERREDTIMEZONEOFFSET, + ZADDITIONALASSETATTRIBUTES.ZTIMEZONENAME, + ZGENERICASSET.ZHIDDEN, + ZGENERICASSET.ZFAVORITE, + ZGENERICASSET.ZDIRECTORY, + ZGENERICASSET.ZFILENAME, + ZGENERICASSET.ZLATITUDE, + ZGENERICASSET.ZLONGITUDE, + ZGENERICASSET.ZHASADJUSTMENTS, + ZGENERICASSET.ZCLOUDBATCHPUBLISHDATE, + ZGENERICASSET.ZKIND, + ZGENERICASSET.ZUNIFORMTYPEIDENTIFIER + FROM ZGENERICASSET + JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = ZGENERICASSET.Z_PK + WHERE ZGENERICASSET.ZTRASHEDSTATE = 0 + ORDER BY ZGENERICASSET.ZUUID """ ) # Order of results # 0 "SELECT ZGENERICASSET.ZUUID, "