Fix negated query tag

LetrixZ · Jun 30, 2024 · 77fb740 · 77fb740
1 parent a5e429f
commit 77fb740
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/server/Cargo.lock b/server/Cargo.lock
diff --git a/server/Cargo.toml b/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "server"
-version = "1.1.1"
+version = "1.1.2"
 edition = "2021"
 
 [dependencies]

diff --git a/server/src/db.rs b/server/src/db.rs
@@ -502,7 +502,10 @@ fn add_tag_matches(qb: &mut QueryBuilder<Postgres>, value: &str) {
     let push_taxonomy_sql = |qb: &mut QueryBuilder<Postgres>, tag_type: TagType, value: String| {
       qb.push(get_sql(&tag_type, "name"))
         .push_bind(value.clone())
-        .push(format!("\n        ) OR\n        {condition} (\n          "))
+        .push(format!(
+          "\n        ) {condition_op}\n        {condition} (\n          ",
+          condition_op = if negate { "AND" } else { "OR" }
+        ))
         .push(get_sql(&tag_type, "slug"))
         .push_bind(value)
         .push("\n        )\n      )\n".to_string());
@@ -513,7 +516,10 @@ fn add_tag_matches(qb: &mut QueryBuilder<Postgres>, value: &str) {
         qb.push(get_sql(&tag_type, "name"))
           .push_bind(value.clone())
           .push(format!(" AND namespace ILIKE '{namespace}'"))
-          .push(format!("\n        ) OR\n        {condition} (\n          "))
+          .push(format!(
+            "\n        ) {condition_op}\n        {condition} (\n          ",
+            condition_op = if negate { "AND" } else { "OR" }
+          ))
           .push(get_sql(&tag_type, "slug"))
           .push_bind(value)
           .push(format!(" AND namespace ILIKE '{namespace}'"))

diff --git a/web/package.json b/web/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "web-kit",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",