3938618 pkgdb query: really fix duplicated rquery — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

pkgdb query: really fix duplicated rquery

Baptiste Daroussin committed 2 years ago

commit 3938618f4b4a0b563c44c30b069ddc88e6e76547
parent 5adf7b0

2 files changed +5 -5

modified 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, "

modified 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 "