a1a4043 Fix SQL — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix SQL

Matthew Seaman committed 12 years ago

commit a1a40436205cb0ad0a3cc0611aa321d69d3a386e
parent a964492

3 files changed +5 -3

modified libpkg/pkgdb.c

@@ -2148,7 +2148,7 @@ pkgdb_load_options(struct pkgdb *db, struct pkg *pkg)

 		reponame = "main";
 	}
 	for (i = 0; i < sizeof(optionsql)/sizeof(struct optionsql); i++) {
 	for (i = 0; i < (int) (sizeof(optionsql)/sizeof(struct optionsql)); i++) {
 		opt_sql       = optionsql[i].sql;
 		pkg_addtagval = optionsql[i].pkg_addtagval;
 		nargs         = optionsql[i].nargs;

modified libpkg/private/repodb.h

@@ -170,7 +170,7 @@ static const char initsql[] = ""

 		"option_desc_id INTEGER PRIMARY KEY,"
 		"option_desc TEXT NOT NULL UNIQUE"
 	");"
 	"CREATE TABLE %Q.pkg_option ("
 	"CREATE TABLE pkg_option ("
 		"package_id INTEGER NOT NULL REFERENCES packages(id) "
 			"ON DELETE CASCADE ON UPDATE CASCADE,"
 		"option_id INTEGER NOT NULL REFERENCES option(option_id) "

@@ -195,6 +195,7 @@ static const char initsql[] = ""

 			"ON DELETE RESTRICT ON UPDATE CASCADE,"
 		"default_value TEXT NOT NULL,"
 		"PRIMARY KEY(package_id, option_id)"
 	");"
 	"CREATE TABLE shlibs ("
 	    "id INTEGER PRIMARY KEY,"
 	    "name TEXT NOT NULL UNIQUE "

@@ -341,6 +342,7 @@ static const struct repo_changes repo_upgrades[] = {

 			"ON DELETE RESTRICT ON UPDATE CASCADE,"
 		"default_value TEXT NOT NULL,"
 		"PRIMARY KEY(package_id, option_id)"
 	 ");"
 	 "INSERT INTO %Q.option (option) "
 		"SELECT DISTINCT option FROM %Q.options;"
 	 "INSERT INTO %Q.pkg_option(package_id, option_id, value) "

modified pkg/utils.c

@@ -168,7 +168,7 @@ info_flags(uint64_t opt, bool remote)

 		flags |= PKG_LOAD_CATEGORIES;
 	if (opt & INFO_LICENSES)
 		flags |= PKG_LOAD_LICENSES;
 	if (opt & INFO_OPTIONS|INFO_OPTION_DEFAULTS|INFO_OPTION_DESCRIPTIONS)
 	if (opt & (INFO_OPTIONS|INFO_OPTION_DEFAULTS|INFO_OPTION_DESCRIPTIONS))
 		flags |= PKG_LOAD_OPTIONS;
 	if (opt & INFO_SHLIBS_REQUIRED)
 		flags |= PKG_LOAD_SHLIBS_REQUIRED;