1 files changed, 12 insertions, 15 deletions

diff --git a/notes/projects/radius/sql/ippool-queries.sql b/notes/projects/radius/sql/ippool-queries.sql
index bf3225b..9a82fc6 100644
--- a/notes/projects/radius/sql/ippool-queries.sql
+++ b/notes/projects/radius/sql/ippool-queries.sql
@@ -21,7 +21,6 @@ SET ROLE radius_user;
 SELECT              ip.address       AS    address,
                     ip.modified      AS    modified,
                     ip.username      AS    username,
-                    ip.acctsession   AS    acctsession,
                     pool.name        AS    pool,
                     region.name      AS    region
    FROM             ip
@@ -37,7 +36,7 @@ SELECT              ip.address       AS    address,
       AND           ip.username      LIKE  lower( :'myUsername' )
       AND           nas.name         LIKE  lower( :'myNasName' )
       AND           pool.name        LIKE  lower( :'myPoolName' )
-      AND           netblock.active  =     TRUE
+      AND           netblock.assignable  =     TRUE
    ORDER BY         ip.modified      DESC,
                     ip.address       ASC
    LIMIT            1;
@@ -54,12 +53,12 @@ SELECT              ip.address       AS    address,
 SELECT              ip.address       AS    address,
                     ip.modified      AS    modified,
                     ip.username      AS    username,
-                    ip.acctsession   AS    acctsession,
                     pool.name        AS    pool,
                     region.name      AS    region
    FROM             ip
    INNER JOIN       netblock
       ON            netblock.network >>=   ip.address
+         AND        netblock.assignable  IS    TRUE
    INNER JOIN       region
       ON            region.id        =     netblock.regionId
    INNER JOIN       pool
@@ -69,7 +68,7 @@ SELECT              ip.address       AS    address,
    WHERE            ip.nasId         IS    NULL
       AND           nas.name         LIKE  lower( :'myNasName' )
       AND           pool.name        LIKE  lower( :'myPoolName' )
-      AND           netblock.active  =     TRUE
+      AND           netblock.assignable  =     TRUE
    ORDER BY         ip.modified      ASC,
                     ip.address       ASC
    LIMIT            1;
@@ -96,7 +95,7 @@ SELECT DISTINCT      pool.name         AS poolName,
                      ip.address        AS address,
                      TRUE              = ALL
                      (
-                       SELECT          nb2.active
+                       SELECT          nb2.assignable
                           FROM         netblock   AS  nb2
                           WHERE        ip.address <<= nb2.network
                      )                 AS active,
@@ -105,8 +104,7 @@ SELECT DISTINCT      pool.name         AS poolName,
                      )                 AS assigned,
                      ip.modified       AS modified,
                      nas.name          AS nasName,
-                     ip.username       AS username,
-                     ip.acctSession    AS acctSession
+                     ip.username       AS username
    FROM              ip
    INNER JOIN        netblock
       ON             ip.address        <<= netblock.network
@@ -127,15 +125,14 @@ SELECT DISTINCT      pool.name         AS poolName,
                        SELECT          *
                           FROM         netblock   AS  nb2
                           WHERE        ip.address <<= nb2.network
-                             AND NOT   nb2.active
+                             AND NOT   nb2.assignable
                      )                 AS active,
                      (
                        nasId           IS NOT NULL
                      )                 AS assigned,
                      ip.modified       AS modified,
                      nas.name          AS nasName,
-                     ip.username       AS username,
-                     ip.acctSession    AS acctSession
+                     ip.username       AS username
    FROM              ip
    INNER JOIN        netblock
       ON             ip.address        <<= netblock.network
@@ -153,11 +150,11 @@ SELECT DISTINCT      pool.name         AS poolName,
  */
 SELECT DISTINCT      ip.address        AS  ipAddress,
                      netblock.network  AS  network,
-                     netblock.active   AS  active
+                     netblock.assignable   AS  active
    FROM              ip
    INNER JOIN        netblock
       ON             ip.address        <<= netblock.network
-   WHERE             netblock.active   =   FALSE
+   WHERE             netblock.assignable   =   FALSE
    ORDER BY          ipAddress;
 
 
@@ -166,18 +163,18 @@ SELECT DISTINCT      ip.address        AS  ipAddress,
  */
 SELECT DISTINCT      netblock.regionId AS  regionId,
                      ip.address        AS  ipAddress,
-                     netblock.active   AS  active
+                     netblock.assignable   AS  active
    FROM              ip
    INNER JOIN        netblock
       ON             ip.address        <<= netblock.network
-   WHERE             netblock.active   =   TRUE
+   WHERE             netblock.assignable   =   TRUE
       AND            ip.address             NOT IN
                      (
                        SELECT          address AS ipAddress
                           FROM         ip
                           INNER JOIN   netblock
                              ON        ip.address          <<= netblock.network
-                                AND    netblock.active     =   FALSE
+                                AND    netblock.assignable     =   FALSE
                      )
    ORDER BY          ipAddress;