Rename the shipname attribute

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

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index 26e915764e961fc57b25c44da5c0a2a81a826a80..781f4c179db942308a2d7ee57573ad354d9ae9f5 100644 (file)
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -667,7 +667,7 @@ sub calcredir : Private {
        );
 
        my $ships = $dbh->prepare(q{
-SELECT id, amount FROM fleet_ships fs JOIN ship_stats s ON s.name = fs.ship
+SELECT id, amount FROM fleet_ships fs JOIN ship_stats s USING (ship)
 WHERE fid = $1
                });
 
@@ -734,7 +734,7 @@ INSERT INTO raid_targets(raid,pid,comment) (
        SELECT $1,pid,array_to_string(array_agg(
                        fleet || ': eta=' || eta || ', amount=' || amount || ', type=' || shiptype
                                || ' landing=' || landing_tick || 'back=' || landing_tick + eta
-               ),'\n')
+               ),E'\n')
        FROM calls c
                JOIN incomings i USING (call)
                JOIN current_planet_stats p USING (pid)