Changeset 726 for trunk

Timestamp:

05/20/15 15:52:19 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

(Re)?add the block ID back to the hashref returned by getBlockData(),
since there are in fact cases where we may pass the hashref around and
lose track of the original ID.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -2321 +2321 @@
   if ($type eq 'i') {
     my $binfo = $dbh->selectrow_hashref(qq(
-        SELECT ip AS block, city, vrf, parent_id, master_id, $commonfields
+        SELECT id, ip AS block, city, vrf, parent_id, master_id, $commonfields
         FROM poolips WHERE id = ?
         ), undef, ($id) );
@@ -2327 +2327 @@
   } else {
     my $binfo = $dbh->selectrow_hashref(qq(
-        SELECT a.cidr AS block, a.city, a.vrf, a.parent_id, a.master_id, swip, $commonfields,
+        SELECT a.id, a.cidr AS block, a.city, a.vrf, a.parent_id, a.master_id, swip, $commonfields,
                 f.cidr AS reserve, f.id as reserve_id
         FROM allocations a LEFT JOIN freeblocks f ON a.id=f.reserve_for