From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 19 Nov 2019 19:58:47 +0000 (-0500)
Subject: use fr_allocate instead of sp_allocate
X-Git-Tag: release_3_0_21~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3747c21abfeefe97db77cd3f6dfbdec7f200ad7c;p=thirdparty%2Ffreeradius-server.git

use fr_allocate instead of sp_allocate

so anyone rooting thru the list of stored procedures knows that
it's a FR function
---

diff --git a/raddb/mods-config/sql/ippool/mysql/procedure.sql b/raddb/mods-config/sql/ippool/mysql/procedure.sql
index 291b11c4841..8708c0fee34 100644
--- a/raddb/mods-config/sql/ippool/mysql/procedure.sql
+++ b/raddb/mods-config/sql/ippool/mysql/procedure.sql
@@ -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),
diff --git a/raddb/mods-config/sql/ippool/mysql/queries.conf b/raddb/mods-config/sql/ippool/mysql/queries.conf
index 2dfc6574ddc..cb9ea5f01b9 100644
--- a/raddb/mods-config/sql/ippool/mysql/queries.conf
+++ b/raddb/mods-config/sql/ippool/mysql/queries.conf
@@ -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}', \
diff --git a/raddb/mods-config/sql/ippool/postgresql/procedure.sql b/raddb/mods-config/sql/ippool/postgresql/procedure.sql
index 1e60746068f..b1d580caecd 100644
--- a/raddb/mods-config/sql/ippool/postgresql/procedure.sql
+++ b/raddb/mods-config/sql/ippool/postgresql/procedure.sql
@@ -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),
diff --git a/raddb/mods-config/sql/ippool/postgresql/queries.conf b/raddb/mods-config/sql/ippool/postgresql/queries.conf
index 03854cecc70..0a216ac664b 100644
--- a/raddb/mods-config/sql/ippool/postgresql/queries.conf
+++ b/raddb/mods-config/sql/ippool/postgresql/queries.conf
@@ -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}', \