Changeset 592 for branches/stable/cgi-bin/ipdb.psql

Timestamp:

05/14/13 17:45:17 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge /trunk changes up to r516

Location:

branches/stable

Files:

• . (modified) (1 prop)
• cgi-bin/ipdb.psql (modified) (3 diffs)

branches/stable/cgi-bin/ipdb.psql

@@ -47 +47 @@
         "pool" cidr DEFAULT '255.255.255.255/32' NOT NULL,
         "ip" cidr DEFAULT '255.255.255.255/32' NOT NULL PRIMARY KEY,
-        "oldcustid" character varying(16) DEFAULT '' NOT NULL,
         "city" character varying(30) DEFAULT '' NOT NULL,
         "type" character(2) DEFAULT '' NOT NULL,
@@ -63 +62 @@
 CREATE TABLE "allocations" (
         "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL PRIMARY KEY,
-        "oldcustid" character varying(16) DEFAULT '',
         "type" character(2) DEFAULT '',
         "city" character varying(30) DEFAULT '',
@@ -77 +75 @@
 );
 
-CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes, allocations.oldcustid, allocations.circuitid FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes, poolips.oldcustid, poolips.circuitid FROM poolips;
+CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes, allocations.circuitid FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes, poolips.circuitid FROM poolips;
 
 CREATE TABLE "alloctypes" (