Change database structure for planets and alliances + PG 8.4 changes

[ndwebbie.git] / lib / NDWeb / Controller / Users.pm

diff --git a/lib/NDWeb/Controller/Users.pm b/lib/NDWeb/Controller/Users.pm
index 9d70fc2626585fc1389e9c9d37ac0de5d0cc7b8c..c2a521e08ea24b38bf0971b7e70d5c2f28e95d83 100644 (file)
--- a/lib/NDWeb/Controller/Users.pm
+++ b/lib/NDWeb/Controller/Users.pm
@@ -91,10 +91,11 @@ sub updateUser : Local {
                                my $column = $1;
                                my $value = $c->req->param($column);
                                if ($column eq 'planet'){
+                                       $column = 'pid';
                                        if ($value eq ''){
                                                $value = undef;
                                        }elsif($value =~ /^(\d+)\D+(\d+)\D+(\d+)$/){
-                                               ($value) = $dbh->selectrow_array(q{SELECT id FROM
+                                               ($value) = $dbh->selectrow_array(q{SELECT pid FROM
                                                        current_planet_stats WHERE x = ? and y = ? and z =?}
                                                        ,undef,$1,$2,$3);
                                        }
@@ -131,9 +132,10 @@ sub findUser : Private {
        my $dbh = $c->model;
 
        my $query = $dbh->prepare(q{
-               SELECT uid,username,hostmask,CASE WHEN u.planet IS NULL THEN '' ELSE coords(x,y,z) END AS planet,attack_points,defense_points,scan_points,humor_points,info, email, sms
-               FROM users u LEFT OUTER JOIN current_planet_stats p ON u.planet = p.id
-               WHERE uid = ?;
+SELECT uid,username,hostmask,attack_points,defense_points,scan_points,humor_points,info, email, sms
+       ,COALESCE(coords(x,y,z),'') AS planet
+FROM users u LEFT OUTER JOIN current_planet_stats p USING (pid)
+WHERE uid = ?;
                });
        $user = $dbh->selectrow_hashref($query,undef,$user);