X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FAlliances.pm;h=348884acaa1893c1b18335c37d42f8d10c79f79b;hb=aa42aa5497f10f957d426f5777a746f3af49f534;hp=efec3dd6f955ca6f58d845f15ffdf7577843533e;hpb=85d8a494df2ada3f891653a950246046d23a981d;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Alliances.pm b/lib/NDWeb/Controller/Alliances.pm
index efec3dd..348884a 100644
--- a/lib/NDWeb/Controller/Alliances.pm
+++ b/lib/NDWeb/Controller/Alliances.pm
@@ -189,12 +189,12 @@ sub hostile : Local {
 	}
 
 	my $query = $dbh->prepare(q{
-		SELECT s.alliance_id AS id,s.alliance AS name,count(*) AS hostile_count
+		SELECT s.aid AS id,s.alliance AS name,count(*) AS hostile_count
 FROM calls c 
-	JOIN incomings i ON i.call = c.id
-	JOIN current_planet_stats s ON i.sender = s.id
+	JOIN incomings i USING (call)
+	JOIN current_planet_stats s USING (pid)
 WHERE c.landing_tick - i.eta > $1 and c.landing_tick - i.eta < $2
-GROUP BY s.alliance_id,s.alliance
+GROUP BY s.aid,s.alliance
 ORDER BY hostile_count DESC
 		});
 	$query->execute($begintick,$endtick);