X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=database%2Fdefprio.sql;h=501172094dc977557fc5b1f7f39c3f6bdd901d6c;hb=e3118938d99d7571895b847fd20f86f8ef12623d;hp=56186ec551505bfc8ea126f8468cda43deb5754f;hpb=3abf9b4dd5eb4bdac30f58ad4b7b2e5676d6fc8b;p=ndwebbie.git

diff --git a/database/defprio.sql b/database/defprio.sql
index 56186ec..5011720 100644
--- a/database/defprio.sql
+++ b/database/defprio.sql
@@ -4,10 +4,10 @@ SELECT u.*, (0.2 * (u.attack_points / GREATEST(a.attack, 1::numeric))
 		+ 0.2 * (p.size::numeric / a.size) + 0.05 * (p.score::numeric / a.score)
 		+ 0.15 * (p.value::numeric / a.value))::numeric(3,2) AS defprio
 FROM users u
-   JOIN current_planet_stats p ON u.planet = p.id
-   , (
+	LEFT JOIN current_planet_stats p USING (pid)
+	, (
 		SELECT avg(u.attack_points) AS attack, avg(u.defense_points) AS defense, avg(p.size) AS size, avg(p.score) AS score, avg(p.value) AS value
 		FROM users u
-			JOIN current_planet_stats p ON p.id = u.planet
-		WHERE u.uid IN ( SELECT groupmembers.uid FROM groupmembers WHERE groupmembers.gid = 2)
+			JOIN current_planet_stats p USING (pid)
+		WHERE u.uid IN ( SELECT groupmembers.uid FROM groupmembers WHERE groupmembers.gid = 'M')
 	) a;