From effc5281e94e0fa16f1fd08bf848f607a306d0c0 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Fri, 6 Aug 2010 18:51:03 +0200
Subject: [PATCH] Column for shipname has been renamed

---
 Commands/PA.pm      | 12 ++++++------
 Commands/Usermgm.pm |  2 +-
 Delling.pm          |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Commands/PA.pm b/Commands/PA.pm
index ac414ca..2265d3f 100644
--- 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 00ebeb0..eb7560c 100644
--- 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 bb6b97e..f19bf2a 100644
--- 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
 		});
-- 
2.39.2