From: Nick Porter <nick@portercomputing.co.uk>
Date: Wed, 14 Feb 2024 14:28:55 +0000 (+0000)
Subject: SQLite doesn't have GREATEST - use MAX instead
X-Git-Tag: release_3_2_4~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44d34127d9a13d09bf30b968116889ebac525e3d;p=thirdparty%2Ffreeradius-server.git

SQLite doesn't have GREATEST - use MAX instead
---

diff --git a/raddb/mods-config/sql/counter/sqlite/dailycounter.conf b/raddb/mods-config/sql/counter/sqlite/dailycounter.conf
index 9a2ec385e24..b95afdf6278 100644
--- a/raddb/mods-config/sql/counter/sqlite/dailycounter.conf
+++ b/raddb/mods-config/sql/counter/sqlite/dailycounter.conf
@@ -5,7 +5,7 @@
 #  below
 #
 query = "\
-	SELECT SUM(acctsessiontime - GREATEST((%%b - strftime('%%s', acctstarttime)), 0)) \
+	SELECT SUM(acctsessiontime - MAX((%%b - strftime('%%s', acctstarttime)), 0)) \
 	FROM radacct \
 	WHERE username = '%{${key}}' \
 	AND (strftime('%%s', acctstarttime) + acctsessiontime) > %%b"
diff --git a/raddb/mods-config/sql/counter/sqlite/expire_on_login.conf b/raddb/mods-config/sql/counter/sqlite/expire_on_login.conf
index f4e95a58881..6c1c0860f99 100644
--- a/raddb/mods-config/sql/counter/sqlite/expire_on_login.conf
+++ b/raddb/mods-config/sql/counter/sqlite/expire_on_login.conf
@@ -1,5 +1,5 @@
 query = "\
-	SELECT GREATEST(strftime('%%s', NOW()) - strftime('%%s', acctstarttime), 0) AS expires \
+	SELECT MAX(strftime('%%s', NOW()) - strftime('%%s', acctstarttime), 0) AS expires \
 	FROM radacct \
 	WHERE username = '%{${key}}' \
 	ORDER BY acctstarttime \
diff --git a/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf b/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf
index 5262097e329..3f5d427a264 100644
--- a/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf
+++ b/raddb/mods-config/sql/counter/sqlite/monthlycounter.conf
@@ -5,7 +5,7 @@
 #  below
 #
 query = "\
-	SELECT SUM(acctsessiontime - GREATEST((%%b - strftime('%%s', acctstarttime)), 0)) \
+	SELECT SUM(acctsessiontime - MAX((%%b - strftime('%%s', acctstarttime)), 0)) \
 	FROM radacct \
 	WHERE username = '%{${key}}' AND \
 	(strftime('%%s', acctstarttime) + acctsessiontime) > %%b"
diff --git a/raddb/mods-config/sql/counter/sqlite/weeklycounter.conf b/raddb/mods-config/sql/counter/sqlite/weeklycounter.conf
index 06ce3b6089f..90a85666432 100644
--- a/raddb/mods-config/sql/counter/sqlite/weeklycounter.conf
+++ b/raddb/mods-config/sql/counter/sqlite/weeklycounter.conf
@@ -5,7 +5,7 @@
 #  below
 #
 query = "\
-	SELECT SUM(acctsessiontime - GREATEST((%%b - strftime('%%s', acctstarttime)), 0)) \
+	SELECT SUM(acctsessiontime - MAX((%%b - strftime('%%s', acctstarttime)), 0)) \
 	FROM radacct \
 	WHERE username = '%{${key}}' \
 	AND (strftime('%%s', acctstarttime) + acctsessiontime) > %%b"