Changeset 120 for trunk

Timestamp:

01/07/05 11:00:06 (20 years ago)

Author:

Kris Deugau

Message:

/trunk

Fixed some SQL bugs before they become problems - make sure to
use <<= and >>= in Postgres CIDR comparisons "just in case" the
items being compared are equal

File:

• trunk/cgi-bin/IPDB.pm (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -408 +408 @@
       $msg = "Unable to deallocate $type $cidr";
       $sth = $dbh->prepare("update poolips set custid='6750400',available='y',".
-        "city=(select city from allocations ".
-        "where cidr=(select pool from poolips where ip='$cidr')),".
+        "city=(select city from allocations where cidr >>= '$cidr'),".
         "description='',notes='',circuitid='' where ip='$cidr'");
       $sth->execute;
@@ -471 +470 @@
 
         # Set up query for compacting free blocks.
-        $sth = $dbh->prepare("select * from freeblocks where cidr << ".
-                "(select cidr from routed where cidr >> '$cidr') ".
+        $sth = $dbh->prepare("select * from freeblocks where cidr <<= ".
+                "(select cidr from routed where cidr >>= '$cidr') ".
                 " and maskbits<=".$cidr->masklen." and routed='y' order by maskbits desc");