sqlippool query fixes

diff --git a/raddb/mods-config/sql/ippool/mssql/queries.conf b/raddb/mods-config/sql/ippool/mssql/queries.conf
index 97af29f5758ace24e7a181300de975d55cbff24a..cefcb5c9b06d97f0b490e7fe6e09102723d4b557 100644 (file)
--- a/raddb/mods-config/sql/ippool/mssql/queries.conf
+++ b/raddb/mods-config/sql/ippool/mssql/queries.conf
@@ -163,6 +163,8 @@ pool_check = "\
 #  Use a stored procedure to find AND allocate the address. Read and customise
 #  `procedure.sql` in this directory to determine the optimal configuration.
 #
+#  Comment out alloc_existing, alloc_requested and alloc_update to use this
+#
 #alloc_begin = ""
 #alloc_find = "\
 #      EXEC fr_ippool_allocate_previous_or_new_address \
@@ -170,9 +172,8 @@ pool_check = "\
 #              @v_gateway = '${gateway}', \
 #              @v_owner = '${owner}', \
 #              @v_lease_duration = ${offer_duration}, \
-#              @v_requested_address = '%{${requested_address} || 0.0.0.0}'
+#              @v_requested_address = '%{${requested_address} || 0.0.0.0}' \
 #      "
-#alloc_update = ""
 #alloc_commit = ""
 
 

diff --git a/raddb/mods-config/sql/ippool/mysql/queries.conf b/raddb/mods-config/sql/ippool/mysql/queries.conf
index 47445df28c81954cbadc1754d2e7f97d6389d3b5..da05f3b156458cfb861a1287dd37d1fcfba97f0b 100644 (file)
--- a/raddb/mods-config/sql/ippool/mysql/queries.conf
+++ b/raddb/mods-config/sql/ippool/mysql/queries.conf
@@ -126,6 +126,8 @@ alloc_update = "\
 #  Use a stored procedure to find AND allocate the address. Read and customise
 #  `procedure.sql` in this directory to determine the optimal configuration.
 #
+#  Comment out alloc_existing, alloc_requested and alloc_update to use this
+#
 #alloc_begin = ""
 #alloc_find = "\
 #      CALL fr_ippool_allocate_previous_or_new_address( \
@@ -133,9 +135,8 @@ alloc_update = "\
 #              '${gateway}', \
 #              '${owner}', \
 #              ${offer_duration}, \
-#              '%{${requested_address} || 0.0.0.0}'
+#              '%{${requested_address} || 0.0.0.0}' \
 #      )"
-#alloc_update = ""
 #alloc_commit = ""
 
 

diff --git a/raddb/mods-config/sql/ippool/oracle/queries.conf b/raddb/mods-config/sql/ippool/oracle/queries.conf
index a127b8fe2dd334217c44668c73179c5887dc3d3a..31272bf9ca743dc23a75fdb9d6a1382a64c65cae 100644 (file)
--- a/raddb/mods-config/sql/ippool/oracle/queries.conf
+++ b/raddb/mods-config/sql/ippool/oracle/queries.conf
@@ -27,9 +27,8 @@ alloc_find = "\
                '${gateway}', \
                '${owner}', \
                '${offer_duration}', \
-               '%{${requested_address} || 0.0.0.0}'
+               '%{${requested_address} || 0.0.0.0}' \
        ) FROM dual"
-alloc_update = ""
 alloc_commit = ""
 
 

diff --git a/raddb/mods-config/sql/ippool/postgresql/queries.conf b/raddb/mods-config/sql/ippool/postgresql/queries.conf
index 48f584eeb6acd640f5e4bc1cbe30cabc296ed7a7..28dc2d93a83dfb07639622f2dc6de49605ce4712 100644 (file)
--- a/raddb/mods-config/sql/ippool/postgresql/queries.conf
+++ b/raddb/mods-config/sql/ippool/postgresql/queries.conf
@@ -155,7 +155,6 @@ pool_check = "\
 #              '${offer_duration}', \
 #              '%{${requested_address} || 0.0.0.0}' \
 #      )"
-#alloc_update = ""
 #alloc_commit = ""