X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=sql%2Fupgrade-v2.50.sql;h=1baba2cc1885ad55bb7d5cb15fdb7bee64de6dbd;hp=99cc11d1d529168a7dd7f80a2829824497a01622;hb=4c67de43660ea5ee7077ab8c2c6b787471901a71;hpb=9d97b1243a78e8703fefb2a1da2794a6434912c4

diff --git a/sql/upgrade-v2.50.sql b/sql/upgrade-v2.50.sql
index 99cc11d..1baba2c 100644
--- a/sql/upgrade-v2.50.sql
+++ b/sql/upgrade-v2.50.sql
@@ -1,5 +1,5 @@
 --
--- Upgrades pre-v2.50 databases to 2.50 format -- not many changes, though.
+-- Upgrades pre-v2.50 databases to 2.50 format.
 --
 SET work_mem=131072;
 
@@ -45,4 +45,21 @@ UPDATE images SET lens=COALESCE(
 ), model=TRIM((
     SELECT value FROM exif_info WHERE key='Model' AND images.id=exif_info.image
 ));
+UPDATE images SET model=NULL WHERE model='';
+UPDATE images SET lens=NULL WHERE lens='';
+
+ALTER TABLE deleted_images ADD COLUMN model varchar;
+ALTER TABLE deleted_images ADD COLUMN lens varchar;
+UPDATE deleted_images SET lens=COALESCE(
+    TRIM((
+        SELECT value FROM exif_info WHERE key='Lens' AND deleted_images.id=exif_info.image
+    )),
+    TRIM((
+        SELECT value FROM exif_info WHERE key='LensSpec' AND deleted_images.id=exif_info.image
+    ))
+), model=TRIM((
+    SELECT value FROM exif_info WHERE key='Model' AND deleted_images.id=exif_info.image
+));
+UPDATE deleted_images SET model=NULL WHERE model='';
+UPDATE deleted_images SET lens=NULL WHERE lens='';