Column for shipname has been renamed

diff --git a/Commands/PA.pm b/Commands/PA.pm
index ac414ca8542c629ebf6267565e1aaed126df854e..2265d3f1da8ea343b6e8972214d6ba841cc98893 100644 (file)
--- a/Commands/PA.pm
+++ b/Commands/PA.pm
@@ -239,26 +239,26 @@ my $eff = class extends NDIRC::Command {
                my $feud = '';
 
                my $s= $c->model->selectrow_hashref(q{
-SELECT name,t1,t2,t3,"type",damage
+SELECT ship,t1,t2,t3,"type",damage
        ,metal+crystal+eonium AS cost
        ,init,"class",guns,race,eres,armor
-FROM ship_stats WHERE name ILIKE ?
+FROM ship_stats WHERE ship ILIKE ?
                        }, undef, $ship);
 
                return unless $s;
 
                if (defined $value){
                        $amount = int(($value*100/$s->{cost}));
-                       $feud = '(FEUD: '.prettyValue(int($amount/0.86)).') ';
+                       $feud = '(Dem/Tot: '.prettyValue(int($amount/0.92)).') ';
                }
                $value = prettyValue(($amount*$s->{cost}/100));
-               my $name = shipColor($s->{name},$s->{type});
+               my $name = shipColor($s->{ship},$s->{type});
                my $text = prettyValue($amount)." $feud $name ($s->{init}:$value) :";
                for my $tn ('t1','t2','t3'){
                        next unless defined ($self->target($s,$tn));
                        $text .= " <b><c03>" . $self->target($s,$tn) . "</c></b>: ";
                        my $st = $self->query(q{
-SELECT name,"class","type",armor
+SELECT ship,"class","type",armor
        ,metal+crystal+eonium AS cost
        ,init,t1,t2,t3,eres,race
        ,damage,guns
@@ -267,7 +267,7 @@ FROM ship_stats
                        while (my $t = $st->fetchrow_hashref()){
                                my $number = $self->calcEff($s,$t,$tn,$amount);
                                $value = prettyValue($number*$t->{cost}/100);
-                               my $name = shipColor($t->{name},$t->{type});
+                               my $name = shipColor($t->{ship},$t->{type});
                                $text .= " <b>$number</b> $name ($t->{init}:$value),";
                        }
                        chop $text;

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 00ebeb0d77ff4064b871a9b13d52e56489c32b18..eb7560c7a626a9d7c1813a991d947886f2de6ebc 100644 (file)
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -523,7 +523,7 @@ command getanti => {
                my $f = $dbh->prepare(q{
 SELECT username, ship, amount, CASE WHEN $1 = t1 THEN 't1' ELSE 't2' END AS t
 FROM available_ships a
-       JOIN ship_stats s ON (a.ship = s.name)
+       JOIN ship_stats s USING (ship)
 WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
        AND class = ANY($2)
        AND $1 IN (t1,t2)

diff --git a/Delling.pm b/Delling.pm
index bb6b97e8b9a635541fe311cefbacc87fe33c700b..f19bf2a366271e06525641a03ffbe6115be75874 100644 (file)
--- a/Delling.pm
+++ b/Delling.pm
@@ -207,7 +207,7 @@ FROM users u
        JOIN fleets f USING (fid)
        JOIN fleet_ships fs USING (fid)
        JOIN defense_missions dm ON f.fid = dm.fleet
-       JOIN ship_stats ss ON fs.ship = ss.name
+       JOIN ship_stats ss USING (ship)
 WHERE NOT dm.announced
 GROUP BY username,call,tick,dm.fleet,p.value
                });