yarrg database code: eliminate all NATURAL JOINs and turn them into JOIN USING

[ypp-sc-tools.main.git] / yarrg / web / routetrade

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 01b15d9036ca80acc2a8d0424a00250668bc223d..c62ca60b7f89a7956008cacc7c8998ae944a72c7 100644 (file)
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -586,7 +586,7 @@ my $try_solve= sub {
        my $input= pipethrough_prep();
        print $input $cplex or die $!;
        my $output= pipethrough_run_along($input, undef, 'glpsol',
-               qw(glpsol --tmlim 5 --memlim 5), @opts,
+               qw(glpsol --tmlim 5 --memlim 20), @opts,
                qw( --cpxlp /dev/stdin -o /dev/stdout));
        if ($qa->{'debug'}) {
                print "<h3>@opts</h3>\n<pre>\n";
@@ -1010,12 +1010,12 @@ END
 <%perl>
        my $sth_i= $dbh->prepare(<<END);
                SELECT archipelago, islandid, islandname, timestamp
-                       FROM uploads NATURAL JOIN islands
+                       FROM uploads JOIN islands USING (islandid)
                        WHERE islandid = ?
 END
        my $sth_a= $dbh->prepare(<<END);
                SELECT archipelago, islandid, islandname, timestamp
-                       FROM uploads NATURAL JOIN islands
+                       FROM uploads JOIN islands USING (islandid)
                        WHERE archipelago = ?
                        ORDER BY islandname
 END