Update to new database structure

[NDIRC.git] / Commands / Usermgm.pm

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 247fb33a18f1ed865942b3eca44e4e49e4b81ff5..e85638562653df4206abff60a1ae6a90c578f42d 100644 (file)
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -259,10 +259,10 @@ sub getships
        my $f = $dbh->prepare(q{
 SELECT username,SUM(fs.amount) AS amount
 FROM users u
-       JOIN (SELECT DISTINCT ON (planet) planet,fid FROM fleets
+       JOIN (SELECT DISTINCT ON (pid) pid,fid FROM fleets
                WHERE mission = 'Full fleet' AND name <> 'Unit'
-               ORDER BY planet,tick DESC,fid DESC
-       ) f  USING (planet)
+               ORDER BY pid,tick DESC,fid DESC
+       ) f  USING (pid)
        JOIN fleet_ships fs USING (fid)
 WHERE ship ILIKE $1 AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
 GROUP BY username ORDER BY amount DESC
@@ -304,10 +304,10 @@ SELECT fs.ship, fs.amount, username
 FROM fleet_ships fs
        JOIN (SELECT fid,username
                FROM fleets f
-                       JOIN users u USING (planet)
+                       JOIN users u USING (pid)
                WHERE mission = 'Full fleet' AND name <> 'Unit'
                        AND username ILIKE $1
-               ORDER BY planet,tick DESC,fid DESC
+               ORDER BY pid,tick DESC,fid DESC
                LIMIT 1
        ) f  USING (fid)
 ORDER BY num