From 2e85f9be891e1d762b548abbea7b5ca2b3ed7da3 Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull@gmail.com>
Date: Sat, 23 Jul 2022 16:33:24 -0700
Subject: [PATCH] Fixed report_summart view

---
 osxphotos/cli/report_writer.py | 47 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/osxphotos/cli/report_writer.py b/osxphotos/cli/report_writer.py
index 0017e1c9..e22d1cd3 100644
--- a/osxphotos/cli/report_writer.py
+++ b/osxphotos/cli/report_writer.py
@@ -237,29 +237,6 @@ class ReportWriterSQLite(ReportWriterABC):
                 datetime TEXT
             );"""
         )
-
-        c.execute(
-            """
-            CREATE VIEW IF NOT EXISTS report_summary AS
-            SELECT
-            report_id,
-            datetime(MIN(datetime)) start_time,
-            datetime(MAX(datetime)) end_time,
-            STRFTIME('%s',MAX(datetime)) - STRFTIME('%s',MIN(datetime)) AS duration_s,
-            SUM(exported) AS exported,
-            sum(new) as new,
-            SUM(updated) as updated,
-            SUM(skipped) as skipped,
-            SUM(sidecar_xmp) as sidecar_xmp,
-            SUM(touched) as touched,
-            SUM(converted_to_jpeg) as converted_to_jpeg,
-            SUM(missing) as missing,
-            SUM(CASE WHEN error = "" THEN 0 ELSE 1 END) as error,
-            SUM(cleanup_deleted_file) as cleanup_deleted_file
-            FROM report
-            GROUP BY report_id;"""
-        )
-
         self._conn.commit()
 
         # migrate report table to add report_id if needed (#731)
@@ -267,6 +244,30 @@ class ReportWriterSQLite(ReportWriterABC):
             self._conn.cursor().execute("ALTER TABLE report ADD COLUMN report_id TEXT;")
             self._conn.commit()
 
+        # create report_summary view
+        c.execute(
+            """
+            CREATE VIEW IF NOT EXISTS report_summary AS
+            SELECT
+                report_id,
+                datetime(MIN(datetime)) start_time,
+                datetime(MAX(datetime)) end_time,
+                STRFTIME('%s',MAX(datetime)) - STRFTIME('%s',MIN(datetime)) AS duration_s,
+                SUM(exported) AS exported,
+                sum(new) as new,
+                SUM(updated) as updated,
+                    SUM(skipped) as skipped,
+                SUM(sidecar_xmp) as sidecar_xmp,
+                SUM(touched) as touched,
+                SUM(converted_to_jpeg) as converted_to_jpeg,
+                SUM(missing) as missing,
+                SUM(CASE WHEN error = "" THEN 0 ELSE 1 END) as error,
+                SUM(cleanup_deleted_file) as cleanup_deleted_file
+            FROM report
+            GROUP BY report_id;"""
+        )
+        self._conn.commit()
+
     def _generate_report_id(self) -> int:
         """Get a new report ID for this report"""
         c = self._conn.cursor()