Minor fixes

diff --git a/database/scans.sql b/database/scans.sql
index bd7d3f3b621fe7311a1b57f67d7bf0b878fd5108..f68b4b619ac22d3a32a7c3a6746185587b270d79 100644 (file)
--- a/database/scans.sql
+++ b/database/scans.sql
@@ -1,3 +1,4 @@
+DELETE FROM fleets;
 ALTER TABLE fleets ADD COLUMN sender INTEGER NOT NULL REFERENCES planets(id) ON UPDATE CASCADE ON DELETE CASCADE;
 
 ALTER TABLE fleets DROP COLUMN fleet;
@@ -36,6 +37,8 @@ ALTER TABLE scans ADD COLUMN groupscan BOOLEAN NOT NULL DEFAULT False;
 
 ALTER TABLE scans ADD COLUMN parsed BOOLEAN NOT NULL DEFAULT False;
 
+ALTER TABLE scans DROP CONSTRAINT scans_pkey;
+
 ALTER TABLE scans ADD COLUMN id SERIAL PRIMARY KEY;
 
 ALTER TABLE scans ADD UNIQUE (scan_id, tick, groupscan);
@@ -125,7 +128,7 @@ FROM scans s
                WHERE rid = 18) AS d USING (id)
        JOIN (SELECT scan AS id,amount AS seccents FROM planet_data
                WHERE rid = 24) AS sc USING (id)
-ORDER BY planet,tick DESC, id DESC
+ORDER BY planet,tick DESC, id DESC;
 
 
 CREATE INDEX planet_data_id_index ON planet_data (id);