]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
use fr_allocate instead of sp_allocate
authorAlan T. DeKok <aland@freeradius.org>
Tue, 19 Nov 2019 19:58:47 +0000 (14:58 -0500)
committerAlan T. DeKok <aland@freeradius.org>
Tue, 19 Nov 2019 19:58:47 +0000 (14:58 -0500)
so anyone rooting thru the list of stored procedures knows that
it's a FR function

raddb/mods-config/sql/ippool/mysql/procedure.sql
raddb/mods-config/sql/ippool/mysql/queries.conf
raddb/mods-config/sql/ippool/postgresql/procedure.sql
raddb/mods-config/sql/ippool/postgresql/queries.conf

index 291b11c484152f4b5d9a21b8b56b579a104cb98a..8708c0fee347cbdd63998c7af2d009aed73be25c 100644 (file)
@@ -17,7 +17,7 @@
 --
 -- allocate_begin = ""
 -- allocate_find = "\
---     CALL sp_allocate_previous_or_new_framedipaddress( \
+--     CALL fr_allocate_previous_or_new_framedipaddress( \
 --             '%{control:${pool_name}}', \
 --             '%{User-Name}', \
 --             '%{Calling-Station-Id}', \
@@ -33,8 +33,8 @@ CREATE INDEX poolname_username_callingstationid ON radippool(pool_name,username,
 
 DELIMITER $$
 
-DROP PROCEDURE IF EXISTS sp_allocate_previous_or_new_framedipaddress;
-CREATE PROCEDURE sp_allocate_previous_or_new_framedipaddress (
+DROP PROCEDURE IF EXISTS fr_allocate_previous_or_new_framedipaddress;
+CREATE PROCEDURE fr_allocate_previous_or_new_framedipaddress (
         IN v_pool_name VARCHAR(64),
         IN v_username VARCHAR(64),
         IN v_callingstationid VARCHAR(64),
index 2dfc6574ddc6c6c2854d1dda90273955574879c6..cb9ea5f01b96fd65a30eebf16b89523b0ef70cb8 100644 (file)
@@ -122,7 +122,7 @@ allocate_update = "\
 #
 #allocate_begin = ""
 #allocate_find = "\
-#      CALL sp_allocate_previous_or_new_framedipaddress( \
+#      CALL fr_allocate_previous_or_new_framedipaddress( \
 #              '%{control:${pool_name}}', \
 #              '%{User-Name}', \
 #              '%{Calling-Station-Id}', \
index 1e60746068f8997f164a609d979df50d75bcf602..b1d580caecd0ce34ecfeb676605ecf8e06be1291 100644 (file)
@@ -17,7 +17,7 @@
 --
 -- allocate_begin = ""
 -- allocate_find = "\
---     SELECT sp_allocate_previous_or_new_framedipaddress( \
+--     SELECT fr_allocate_previous_or_new_framedipaddress( \
 --             '%{control:${pool_name}}', \
 --             '%{User-Name}', \
 --             '%{Calling-Station-Id}', \
@@ -31,7 +31,7 @@
 
 CREATE INDEX radippool_poolname_username_callingstationid ON radippool(pool_name,username,callingstationid);
 
-CREATE OR REPLACE FUNCTION sp_allocate_previous_or_new_framedipaddress (
+CREATE OR REPLACE FUNCTION fr_allocate_previous_or_new_framedipaddress (
        v_pool_name VARCHAR(64),
        v_username VARCHAR(64),
        v_callingstationid VARCHAR(64),
index 03854cecc70e7a8a905ccbcaf3cc3a6db8b46308..0a216ac664b4e55ca537dc5284f6e271c21c949f 100644 (file)
@@ -121,7 +121,7 @@ allocate_clear = "\
 #allocate_begin = ""
 #allocate_find = "\
 #      /*NO LOAD BALANCE*/ \
-#      SELECT sp_allocate_previous_or_new_framedipaddress( \
+#      SELECT fr_allocate_previous_or_new_framedipaddress( \
 #              '%{control:${pool_name}}', \
 #              '%{SQL-User-Name}', \
 #              '%{Calling-Station-Id}', \