fix: correct sql grouping

satisfactorymodding · Feb 19, 2022 · e581856 · e581856
1 parent c392da4
commit e581856
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/db/postgres/version.go b/db/postgres/version.go
@@ -328,25 +328,25 @@ func GetModVersionsConstraint(ctx context.Context, modID string, constraint stri
 	sign := matches[0][1]
 	switch sign {
 	case "<=":
-		query = query.Where("version_major < ?", major).
+		query = query.Where(db.Or("version_major < ?", major).
 			Or("version_major = ? AND version_minor < ?", major, minor).
-			Or("version_major = ? AND version_minor = ? AND version_patch <= ?", major, minor, patch)
+			Or("version_major = ? AND version_minor = ? AND version_patch <= ?", major, minor, patch))
 	case "<":
-		query = query.Where("version_major < ?", major).
+		query = query.Where(db.Or("version_major < ?", major).
 			Or("version_major = ? AND version_minor < ?", major, minor).
-			Or("version_major = ? AND version_minor = ? AND version_patch < ?", major, minor, patch)
+			Or("version_major = ? AND version_minor = ? AND version_patch < ?", major, minor, patch))
 	case ">":
-		query = query.Where("version_major > ?", major).
+		query = query.Where(db.Or("version_major > ?", major).
 			Or("version_major = ? AND version_minor > ?", major, minor).
-			Or("version_major = ? AND version_minor = ? AND version_patch > ?", major, minor, patch)
+			Or("version_major = ? AND version_minor = ? AND version_patch > ?", major, minor, patch))
 	case ">=":
-		query = query.Where("version_major > ?", major).
+		query = query.Where(db.Or("version_major > ?", major).
 			Or("version_major = ? AND version_minor > ?", major, minor).
-			Or("version_major = ? AND version_minor = ? AND version_patch >= ?", major, minor, patch)
+			Or("version_major = ? AND version_minor = ? AND version_patch >= ?", major, minor, patch))
 	case "^":
 		if major != 0 {
-			query = query.Where("version_major = ? AND version_minor > ?", major, minor).
-				Or("version_major = ? AND version_minor = ? AND version_patch >= ?", major, minor, patch)
+			query = query.Where(db.Or("version_major = ? AND version_minor > ?", major, minor).
+				Or("version_major = ? AND version_minor = ? AND version_patch >= ?", major, minor, patch))
 		} else if minor != 0 {
 			query = query.Where("version_major = ? AND version_minor = ? AND version_patch >= ?", major, minor, patch)
 		} else {