Merge branch 'beta_2.0' into build/versioning

JM-Lemmi · Feb 15, 2024 · b84d4c1 · b84d4c1
2 parents efd1507 + 2d096b1
commit b84d4c1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,7 @@
+# 2.0.0-beta.7.4
+
+- Fix critical bug in Databse query for Rule Filters
+
 # 2.0.0-beta.7.3
 
 - Implement PUT /api/profiles/<profile> (editProfile) for DB

diff --git a/cmd/ical-relay/database.go b/cmd/ical-relay/database.go
@@ -216,7 +216,7 @@ JOIN profile_sources ps ON id = ps.source WHERE ps.profile = $1`,
 		rule.Action = actionParameters
 
 		var dbFilters []dbFilter
-		err = db.Select(&dbFilters, "SELECT type, parameters FROM filter WHERE id = $1", dbRule.Id)
+		err = db.Select(&dbFilters, "SELECT type, parameters FROM filter WHERE rule = $1", dbRule.Id)
 		if err != nil {
 			log.Fatal(err)
 		}

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -20,6 +20,8 @@ services:
       POSTGRES_USER: dbuser
       POSTGRES_PASSWORD: password
       POSTGRES_DB: ical_relay
+    ports:
+      - 127.0.0.1:5432:5432
     volumes:
       - ./postgres-data:/var/lib/postgresql/data
     healthcheck: