Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 86f4c70
Fixed init sql statements.
jlaffaye committed 14 years ago
commit 86f4c707cdf077c7561f3054fdd23d394f1dd301
parent d3bf8a7
1 file changed +22 -20
modified libpkg/pkgdb.c
@@ -292,6 +292,7 @@ static int
pkgdb_init(sqlite3 *sdb)

{

	const char sql[] = ""
+ 
	"BEGIN;"

	"CREATE TABLE packages ("

		"id INTEGER PRIMARY KEY,"

		"origin TEXT UNIQUE NOT NULL,"
@@ -351,61 +352,62 @@ pkgdb_init(sqlite3 *sdb)
		"PRIMARY KEY (package_id,name)"

	");"

	"CREATE TABLE directories ("
- 
		"id INTEGER PRIMARY KEY, "
+ 
		"id INTEGER PRIMARY KEY,"

		"path TEXT NOT NULL UNIQUE"

	");"

	"CREATE TABLE pkg_directories ("

		"package_id INTEGER REFERENCES packages(id) ON DELETE CASCADE"
- 
			" ON UPDATE CASCADE, "
+ 
			" ON UPDATE CASCADE,"

		"directory_id INTEGER REFERENCES directories(id) ON DELETE RESTRICT"
- 
			" ON UPDATE RESTRICT, "
+ 
			" ON UPDATE RESTRICT,"

		"PRIMARY KEY (package_id, directory_id)"

	");"

	"CREATE TABLE categories ("
- 
		"id INTEGER PRIMARY KEY, "
+ 
		"id INTEGER PRIMARY KEY,"

		"name TEXT NOT NULL UNIQUE"

	");"

	"CREATE TABLE pkg_categories ("

		"package_id INTEGER REFERENCES packages(id) ON DELETE CASCADE"
- 
			" ON UPDATE CASCADE, "
+ 
			" ON UPDATE CASCADE,"

		"category_id INTEGER REFERENCES categories(id) ON DELETE RESTRICT"
- 
			" ON UPDATE RESTRICT, "
+ 
			" ON UPDATE RESTRICT,"

		"PRIMARY KEY (package_id, category_id)"

	");"

	"CREATE TABLE licenses ("
- 
		"id INTEGER PRIMARY KEY, "
- 
		"name TEXT NOT NULL UNIQUE "
+ 
		"id INTEGER PRIMARY KEY,"
+ 
		"name TEXT NOT NULL UNIQUE"

	");"

	"CREATE TABLE pkg_licenses ("

		"package_id INTEGER REFERENCES packages(id) ON DELETE CASCADE"
- 
			" ON UPDATE CASCADE, "
+ 
			" ON UPDATE CASCADE,"

		"license_id INTEGER REFERENCES licenses(id) ON DELETE RESTRICT"
- 
			" ON UPDATE RESTRICT, "
+ 
			" ON UPDATE RESTRICT,"

		"PRIMARY KEY (package_id, license_id)"

	");"

	"CREATE TABLE users ("
- 
		"id INTEGER PRIMATY KEY, "
- 
		"name TEXT NOT NULL UNIQUE "
+ 
		"id INTEGER PRIMARY KEY,"
+ 
		"name TEXT NOT NULL UNIQUE"

	");"

	"CREATE TABLE pkg_users ("
- 
		"package_id INTEGER REFERECES packages(id) ON DELETE CASCADE"
- 
			" ON UPDATE CASCADE, "
+ 
		"package_id INTEGER REFERENCES packages(id) ON DELETE CASCADE"
+ 
			" ON UPDATE CASCADE,"

		"user_id INTEGER REFERENCES users(id) ON DELETE RESTRICT"
- 
			" ON UPDATE RESTRICT, "
+ 
			" ON UPDATE RESTRICT,"

		"UNIQUE(package_id, user_id)"

	");"

	"CREATE TABLE groups ("
- 
		"id INTEGER PRIMATY KEY, "
- 
		"name TEXT NOT NULL UNIQUE "
+ 
		"id INTEGER PRIMARY KEY,"
+ 
		"name TEXT NOT NULL UNIQUE"

	");"

	"CREATE TABLE pkg_groups ("
- 
		"package_id INTEGER REFERECES packages(id) ON DELETE CASCADE"
- 
			" ON UPDATE CASCADE, "
+ 
		"package_id INTEGER REFERENCES packages(id) ON DELETE CASCADE"
+ 
			" ON UPDATE CASCADE,"

		"group_id INTEGER REFERENCES groups(id) ON DELETE RESTRICT"
- 
			" ON UPDATE RESTRICT, "
+ 
			" ON UPDATE RESTRICT,"

		"UNIQUE(package_id, group_id)"

	");"

	"PRAGMA user_version = 5;"
+ 
	"COMMIT;"

	;



	return (sql_exec(sdb, sql));