From 413ac724ad2cacfa9afad482c999a47a895febd0 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 22 Aug 2023 14:02:22 +0200 Subject: [PATCH] pkgdb query: really fix duplicated rquery Fixes: #2164 --- libpkg/pkgdb_query.c | 6 +++--- libpkg/repo/binary/query.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libpkg/pkgdb_query.c b/libpkg/pkgdb_query.c index 43b99a47b..7576c0b43 100644 --- a/libpkg/pkgdb_query.c +++ b/libpkg/pkgdb_query.c @@ -152,7 +152,7 @@ pkgdb_query_cond(struct pkgdb *db, const char *cond, const char *pattern, match_ " LEFT JOIN annotation tag ON pkg_annotation.tag_id = tag.annotation_id " " LEFT JOIN annotation value ON pkg_annotation.value_id = value.annotation_id " " WHERE tag.annotation = 'flavor') " - "SELECT DISTINCT p.id, origin, p.name, p.name as uniqueid, " + "SELECT DISTINCT(p.id), origin, p.name, p.name as uniqueid, " " version, comment, desc, " " message, arch, maintainer, www, " " prefix, flatsize, licenselogic, automatic, " @@ -165,7 +165,7 @@ pkgdb_query_cond(struct pkgdb *db, const char *cond, const char *pattern, match_ comp, pattern == NULL ? "WHERE" : "AND", cond + 7); } else if (match == MATCH_INTERNAL) { sqlite3_snprintf(sizeof(sql), sql, - "SELECT DISTINCT p.id, origin, p.name, p.name as uniqueid, " + "SELECT DISTINCT(p.id), origin, p.name, p.name as uniqueid, " "version, comment, desc, " "message, arch, maintainer, www, " "prefix, flatsize, licenselogic, automatic, " @@ -180,7 +180,7 @@ pkgdb_query_cond(struct pkgdb *db, const char *cond, const char *pattern, match_ " LEFT JOIN annotation tag ON pkg_annotation.tag_id = tag.annotation_id " " LEFT JOIN annotation value ON pkg_annotation.value_id = value.annotation_id " " WHERE tag.annotation = 'flavor') " - "SELECT DISTINCT p.id, origin, p.name, p.name as uniqueid, " + "SELECT DISTINCT(p.id), origin, p.name, p.name as uniqueid, " "version, comment, desc, " "message, arch, maintainer, www, " "prefix, flatsize, licenselogic, automatic, " diff --git a/libpkg/repo/binary/query.c b/libpkg/repo/binary/query.c index bc1266a17..f07c06f87 100644 --- a/libpkg/repo/binary/query.c +++ b/libpkg/repo/binary/query.c @@ -105,7 +105,7 @@ pkg_repo_binary_query(struct pkg_repo *repo, const char *cond, const char *patte char *sql = NULL; const char *comp = NULL; char basesql_quick[] = "" - "SELECT p.id, origin, p.name, p.name as uniqueid, version, comment, " + "SELECT DISTINCT(p.id), origin, p.name, p.name as uniqueid, version, comment, " "prefix, desc, arch, maintainer, www, " "licenselogic, flatsize, pkgsize, " "cksum, manifestdigest, path AS repopath, '%s' AS dbname " @@ -120,7 +120,7 @@ pkg_repo_binary_query(struct pkg_repo *repo, const char *cond, const char *patte " LEFT JOIN annotation value ON pkg_annotation.value_id = value.annotation_id " " WHERE tag.annotation = 'flavor') " - "SELECT p.id, origin, p.name, p.name as uniqueid, version, comment, " + "SELECT DISTINCT(p.id), origin, p.name, p.name as uniqueid, version, comment, " "prefix, desc, arch, maintainer, www, " "licenselogic, flatsize, pkgsize, " "cksum, manifestdigest, path AS repopath, '%s' AS dbname "