9b68ebc Insert sufficient spaces to make the SQL parse. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Insert sufficient spaces to make the SQL parse.

Matthew Seaman committed 13 years ago

commit 9b68ebc31ac1af2f06939560a1991a476accf0ae
parent 90ab56a

2 files changed +24 -25

modified libpkg/pkgdb.c

@@ -699,26 +699,26 @@ pkgdb_init(sqlite3 *sdb)

 	"CREATE VIEW pkg_shlibs AS SELECT * FROM pkg_shlibs_required;"
 	"CREATE TRIGGER pkg_shlibs_update "
 		"INSTEAD OF UPDATE ON pkg_shlibs"
 	"FOR EACH ROW BEGIN"
 		"INSTEAD OF UPDATE ON pkg_shlibs "
 	"FOR EACH ROW BEGIN "
 		"UPDATE pkg_shlibs_required "
 		"SET package_id = new.package_id,"
 		"  shlib_id = new.shlib_id"
 		"SET package_id = new.package_id, "
 		"  shlib_id = new.shlib_id "
 		"WHERE shlib_id = old.shlib_id "
 		"AND package_id = old.package_id;"
 		"AND package_id = old.package_id; "
 	"END;"
 	"CREATE TRIGGER pkg_shlibs_insert "
 		"INSTEAD OF INSERT ON pkg_shlibs"
 	"FOR EACH ROW BEGIN"
 		"INSERT INTO pkg_shlibs_required (shlib_id, package_id)"
 		"VALUES (new.shlib_id, new.package_id);"
 		"INSTEAD OF INSERT ON pkg_shlibs "
 	"FOR EACH ROW BEGIN "
 		"INSERT INTO pkg_shlibs_required (shlib_id, package_id) "
 		"VALUES (new.shlib_id, new.package_id); "
 	"END;"
 	"CREATE TRIGGER pkg_shlibs_delete "
 		"INSTEAD OF DELETE ON pkg_shlibs"
 	"FOR EACH ROW BEGIN"
 		"INSTEAD OF DELETE ON pkg_shlibs "
 	"FOR EACH ROW BEGIN "
 		"DELETE FROM pkg_shlibs_required "
                 "WHERE shlib_id = old.shlib_id "
 		"AND package_id = old.package_id";
 		"AND package_id = old.package_id; "
 	"END;"

modified libpkg/private/db_upgrades.h

@@ -332,27 +332,26 @@ static struct db_upgrades {

 	{18,
 	"CREATE VIEW pkg_shlibs AS SELECT * FROM pkg_shlibs_required;"
 	"CREATE TRIGGER pkg_shlibs_update "
 		"INSTEAD OF UPDATE ON pkg_shlibs"
 	"FOR EACH ROW BEGIN"
 		"INSTEAD OF UPDATE ON pkg_shlibs "
 	"FOR EACH ROW BEGIN "
 		"UPDATE pkg_shlibs_required "
 		"SET package_id = new.package_id,"
 		"  shlib_id = new.shlib_id"
 		"SET package_id = new.package_id, "
 		"shlib_id = new.shlib_id "
 		"WHERE shlib_id = old.shlib_id "
 		"AND package_id = old.package_id;"
 		"AND package_id = old.package_id; "
 	"END;"
 	"CREATE TRIGGER pkg_shlibs_insert "
 		"INSTEAD OF INSERT ON pkg_shlibs"
 	"FOR EACH ROW BEGIN"
 		"INSERT INTO pkg_shlibs_required "
 		"SET shlib_id = new.shlib_id,"
 		"package_id = new.package_id;"
 		"INSTEAD OF INSERT ON pkg_shlibs "
 	"FOR EACH ROW BEGIN "
 		"INSERT INTO pkg_shlibs_required (shlib_id, package_id) "
 		"VALUES (new.shlib_id, new.package_id); "
 	"END;"
 	"CREATE TRIGGER pkg_shlibs_delete "
 		"INSTEAD OF DELETE ON pkg_shlibs"
 	"FOR EACH ROW BEGIN"
 		"INSTEAD OF DELETE ON pkg_shlibs "
 	"FOR EACH ROW BEGIN "
 		"DELETE FROM pkg_shlibs_required "
                 "WHERE shlib_id = old.shlib_id "
 		"AND package_id = old.package_id";
 		"AND package_id = old.package_id; "
 	"END;"
 	},