8 files changed, 20 insertions, 9 deletions
diff --git a/gentoobrowse-api/service/sql/maintenance/categoryDelete.sql b/gentoobrowse-api/service/sql/maintenance/categoryDelete.sql
deleted file mode 100644
index ad961c8..0000000
--- a/gentoobrowse-api/service/sql/maintenance/categoryDelete.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-DELETE FROM gentoobrowse.categories
-WHERE name = ?
diff --git a/gentoobrowse-api/service/sql/maintenance/categoryInsert.sql b/gentoobrowse-api/service/sql/maintenance/categoryInsert.sql
index fa8a1ca..27321a0 100644
--- a/gentoobrowse-api/service/sql/maintenance/categoryInsert.sql
+++ b/gentoobrowse-api/service/sql/maintenance/categoryInsert.sql
@@ -1,2 +1,3 @@
-INSERT INTO gentoobrowse.categories(summary, name)
-VALUES(gentoobrowse.textclean(?), ?)
+INSERT INTO gentoobrowse.categories(name)
+SELECT ?
+WHERE (NOT EXISTS (SELECT name FROM gentoobrowse.categories WHERE name = ?))
diff --git a/gentoobrowse-api/service/sql/maintenance/categoryUpdate.sql b/gentoobrowse-api/service/sql/maintenance/categoryMetaUpdate.sql
index 28c45b1..28c45b1 100644
--- a/gentoobrowse-api/service/sql/maintenance/categoryUpdate.sql
+++ b/gentoobrowse-api/service/sql/maintenance/categoryMetaUpdate.sql
diff --git a/gentoobrowse-api/service/sql/maintenance/categoryPrune.sql b/gentoobrowse-api/service/sql/maintenance/categoryPrune.sql
new file mode 100644
index 0000000..3b75683
--- /dev/null
+++ b/gentoobrowse-api/service/sql/maintenance/categoryPrune.sql
@@ -0,0 +1,5 @@
+DELETE FROM gentoobrowse.categories c
+WHERE NOT EXISTS (
+	SELECT FROM gentoobrowse.packages p
+	WHERE p.categoryid = c.categoryid)
+
diff --git a/gentoobrowse-api/service/sql/maintenance/ebuildDelete.sql b/gentoobrowse-api/service/sql/maintenance/ebuildDelete.sql
index 2c33008..bd46bcd 100644
--- a/gentoobrowse-api/service/sql/maintenance/ebuildDelete.sql
+++ b/gentoobrowse-api/service/sql/maintenance/ebuildDelete.sql
@@ -5,4 +5,5 @@ AND c.categoryid = p.categoryid
 AND e.repoid = r.repoid
 AND r.name = ?
 AND c.name = ?
-AND CONCAT(p.name, '-', e.version) = ?
+AND p.name = ?
+AND e.version = ?
diff --git a/gentoobrowse-api/service/sql/maintenance/packageDelete.sql b/gentoobrowse-api/service/sql/maintenance/packageDelete.sql
deleted file mode 100644
index 5a2a0f1..0000000
--- a/gentoobrowse-api/service/sql/maintenance/packageDelete.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM gentoobrowse.packages p
-USING gentoobrowse.categories c
-WHERE p.name = ?
-AND c.name = ?
diff --git a/gentoobrowse-api/service/sql/maintenance/packageInsert.sql b/gentoobrowse-api/service/sql/maintenance/packageInsert.sql
index 223cdbe..8e910f8 100644
--- a/gentoobrowse-api/service/sql/maintenance/packageInsert.sql
+++ b/gentoobrowse-api/service/sql/maintenance/packageInsert.sql
@@ -1,4 +1,7 @@
 INSERT INTO gentoobrowse.packages(categoryid, name, description)
 SELECT c.categoryid, ?, ?
 FROM gentoobrowse.categories c
+	LEFT OUTER JOIN gentoobrowse.packages p
+		ON c.categoryid = p.categoryid AND p.name = ?
 WHERE c.name = ?
+AND p.packageid IS NULL
diff --git a/gentoobrowse-api/service/sql/maintenance/packagePrune.sql b/gentoobrowse-api/service/sql/maintenance/packagePrune.sql
new file mode 100644
index 0000000..510ed75
--- /dev/null
+++ b/gentoobrowse-api/service/sql/maintenance/packagePrune.sql
@@ -0,0 +1,7 @@
+DELETE FROM gentoobrowse.packages p
+USING gentoobrowse.categories c
+WHERE p.categoryid = c.categoryid
+AND c.name = ?
+AND NOT EXISTS (
+	SELECT FROM gentoobrowse.ebuilds e
+	WHERE p.packageid = e.packageid)