sqlite doesn't have NOW() or INTERVAL

diff --git a/raddb/mods-config/sql/ippool/sqlite/queries.conf b/raddb/mods-config/sql/ippool/sqlite/queries.conf
index 1749452..ebae018 100644 (file)
--- a/raddb/mods-config/sql/ippool/sqlite/queries.conf
+++ b/raddb/mods-config/sql/ippool/sqlite/queries.conf
@@ -20,7 +20,7 @@
   SET nasipaddress = '', pool_key = 0, \
   callingstationid = '', username = '', \
   expiry_time = NULL \
-  WHERE expiry_time <= NOW() - INTERVAL 1 SECOND \
+  WHERE expiry_time <= datetime(strftime('%%s', 'now') - 1, 'unixepoch') \
   AND nasipaddress = '%{Nas-IP-Address}'"
 
 
@@ -28,7 +28,7 @@
 ## The ORDER BY clause of this query tries to allocate the same IP-address
 ## which user had last session...
 allocate_find = "SELECT framedipaddress FROM ${ippool_table} \
- WHERE pool_name = '%{control:Pool-Name}' AND (expiry_time < NOW() OR expiry_time IS NULL) \
+ WHERE pool_name = '%{control:Pool-Name}' AND (expiry_time < datetime('now') OR expiry_time IS NULL) \
  ORDER BY (username <> '%{User-Name}'), \
  (callingstationid <> '%{Calling-Station-Id}'), \
  expiry_time \
@@ -58,7 +58,7 @@ pool_check = "SELECT id FROM ${ippool_table} \
 allocate_update = "UPDATE ${ippool_table} \
  SET nasipaddress = '%{NAS-IP-Address}', pool_key = '${pool_key}', \
  callingstationid = '%{Calling-Station-Id}', username = '%{User-Name}', \
- expiry_time = NOW() + INTERVAL ${lease_duration} SECOND \
+ expiry_time = datetime(strftime('%%s', 'now') + ${lease_duration}, 'unixepoch') \
  WHERE framedipaddress = '%I' AND expiry_time IS NULL"
 
 
@@ -66,7 +66,7 @@ allocate_update = "UPDATE ${ippool_table} \
 ## This series of queries frees an IP number when an accounting
 ## START record arrives
 start_update = "UPDATE ${ippool_table} \
- SET expiry_time = NOW() + INTERVAL ${lease_duration} SECOND \
+ SET expiry_time = datetime(strftime('%%s', 'now') + ${lease_duration}, 'unixepoch') \
  WHERE nasipaddress = '%{NAS-IP-Address}' AND  pool_key = '${pool_key}' \
  AND username = '%{User-Name}' \
  AND callingstationid = '%{Calling-Station-Id}' \
@@ -87,7 +87,7 @@ stop_clear = "UPDATE ${ippool_table} \
 ## This series of queries frees an IP number when an accounting
 ## ALIVE record arrives
 alive_update = "UPDATE ${ippool_table} \
- SET expiry_time = NOW() + INTERVAL ${lease_duration} SECOND \
+ SET expiry_time = datetime(strftime('%%s', 'now') + ${lease_duration}, 'unixepoch') \
  WHERE nasipaddress = '%{Nas-IP-Address}' AND pool_key = '${pool_key}' \
  AND username = '%{User-Name}' \
  AND callingstationid = '%{Calling-Station-Id}' \