39ae9e1 Append version to fts name. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Append version to fts name.

Vsevolod Stakhov committed 12 years ago

commit 39ae9e1edb982744ce23fbadb83a706553bdcd2e
parent 078e397

4 files changed +8 -8

modified libpkg/pkgdb.c

@@ -2528,8 +2528,8 @@ static sql_prstmt sql_prepared_statements[PRSTMT_LAST] = {

 	[FTS_APPEND] = {
 		NULL,
 		"INSERT OR ROLLBACK INTO pkg_search(id, name, origin) "
 		"VALUES (?1, ?2, ?3);",
 		"ITT"
 		"VALUES (?1, ?2 || '-' || ?3, ?4);",
 		"ITTT"
 	}
 	/* PRSTMT_LAST */
 };

@@ -2699,7 +2699,7 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete, int forced)

 	package_id = sqlite3_last_insert_rowid(s);
 	if (run_prstmt(FTS_APPEND, package_id, name, origin) != SQLITE_DONE) {
 	if (run_prstmt(FTS_APPEND, package_id, name, version, origin) != SQLITE_DONE) {
 		ERROR_SQLITE(s);
 		goto cleanup;
 	}

modified libpkg/pkgdb_repo.c

@@ -185,8 +185,8 @@ static sql_prstmt sql_prepared_statements[PRSTMT_LAST] = {

 	[FTS_APPEND] = {
 		NULL,
 		"INSERT OR ROLLBACK INTO pkg_search(id, name, origin) "
 		"VALUES (?1, ?2, ?3);",
 		"ITT"
 		"VALUES (?1, ?2 || '-' || ?3, ?4);",
 		"ITTT"
 	}
 	/* PRSTMT_LAST */
 };

@@ -523,7 +523,7 @@ try_again:

 	package_id = sqlite3_last_insert_rowid(sqlite);
 	if (run_prepared_statement (FTS_APPEND, package_id,
 			name, origin) != SQLITE_DONE) {
 			name, version, origin) != SQLITE_DONE) {
 		ERROR_SQLITE(sqlite);
 		return (EPKG_FATAL);
 	}

modified libpkg/private/db_upgrades.h

@@ -557,7 +557,7 @@ static struct db_upgrades {

 	},
 	{23,
 	"CREATE VIRTUAL TABLE pkg_search USING fts4(id, name, origin);"
 	"INSERT INTO pkg_search SELECT id, name, origin FROM packages;"
 	"INSERT INTO pkg_search SELECT id, name || '-' || version, origin FROM packages;"
 	"CREATE INDEX packages_origin ON packages(origin COLLATE NOCASE);"
 	"CREATE INDEX packages_name ON packages(name COLLATE NOCASE);"
 	},

modified libpkg/private/repodb.h

@@ -327,7 +327,7 @@ static const struct repo_changes repo_upgrades[] = {

 	{2007,
 ,
 	 "CREATE VIRTUAL TABLE %Q.pkg_search USING fts4(id, name, origin);"
 	 "INSERT INTO %Q.pkg_search SELECT id, name, origin FROM %Q.packages;"
 	 "INSERT INTO %Q.pkg_search SELECT id, name || '-' || version, origin FROM %Q.packages;"
 	 "CREATE INDEX %Q.packages_origin ON %Q.packages(origin COLLATE NOCASE);"
 	 "CREATE INDEX %Q.packages_name ON %Q.packages(name COLLATE NOCASE);"
 	},