From 866c239cc91675d2239b4d9cc1f133166dc7087a Mon Sep 17 00:00:00 2001
From: Greg Heartsfield <scsibug@imap.cc>
Date: Thu, 2 Feb 2023 12:24:10 -0600
Subject: [PATCH] improvement: simplify SQL queries for tags

---
 src/repo/sqlite.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/repo/sqlite.rs b/src/repo/sqlite.rs
index 83c3ace..f6e5912 100644
--- a/src/repo/sqlite.rs
+++ b/src/repo/sqlite.rs
@@ -820,7 +820,7 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>, Option<Stri
                 let blob_clause = format!("value_hex IN ({})", repeat_vars(blob_vals.len()));
                 // find evidence of the target tag name/value existing for this event.
                 let tag_clause = format!(
-                    "e.id IN (SELECT e.id FROM event e LEFT JOIN tag t on e.id=t.event_id WHERE hidden!=TRUE and (name=? AND {}))",
+                    "e.id IN (SELECT t.event_id FROM tag t WHERE (name=? AND {}))",
                     blob_clause
                 );
                 // add the tag name as the first parameter
@@ -833,7 +833,7 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>, Option<Stri
                 let str_clause = format!("value IN ({})", repeat_vars(str_vals.len()));
                 // find evidence of the target tag name/value existing for this event.
                 let tag_clause = format!(
-                    "e.id IN (SELECT e.id FROM event e LEFT JOIN tag t on e.id=t.event_id WHERE hidden!=TRUE and (name=? AND {}))",
+		    "e.id IN (SELECT t.event_id FROM tag t WHERE (name=? AND {}))",
                     str_clause
                 );
                 // add the tag name as the first parameter
@@ -848,7 +848,7 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>, Option<Stri
                 let blob_clause = format!("value_hex IN ({})", repeat_vars(blob_vals.len()));
                 // find evidence of the target tag name/value existing for this event.
                 let tag_clause = format!(
-                    "e.id IN (SELECT e.id FROM event e LEFT JOIN tag t on e.id=t.event_id WHERE hidden!=TRUE and (name=? AND ({} OR {})))",
+		    "e.id IN (SELECT t.event_id FROM tag t WHERE (name=? AND ({} OR {})))",
                     str_clause, blob_clause
                 );
                 // add the tag name as the first parameter