mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-29 04:57:52 +00:00
Code Issues Releases Wiki Activity

[#2166] Addressed further review comments

Browse Source 
src/share/database/scripts/pgsql/dhcpdb_drop.pgsql
src/share/database/scripts/pgsql/dhcpdb_create.pgsql
src/share/database/scripts/pgsql/upgrade_6.2_to_7.0.sh.in
    Changed server_tag parameter size to 64 to match tag column size
This commit is contained in:
Thomas Markwalder 2021-11-09 13:48:48 -05:00 committed by Tomek Mrugalski
parent b2a04a9413
commit 4b18d98fac
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/share/database/scripts/pgsql/dhcpdb_create.pgsql
View File

@ -1876,7 +1876,7 @@ LANGUAGE plpgsql;
-- being null. -- being null.
-- ----------------------------------------------------- -- -----------------------------------------------------
CREATE OR REPLACE FUNCTION createAuditRevisionDHCP4(audit_ts TIMESTAMP WITH TIME ZONE, CREATE OR REPLACE FUNCTION createAuditRevisionDHCP4(audit_ts TIMESTAMP WITH TIME ZONE,
server_tag VARCHAR(256), server_tag VARCHAR(64),
audit_log_message TEXT, audit_log_message TEXT,
cascade_transaction BOOLEAN) cascade_transaction BOOLEAN)
RETURNS VOID RETURNS VOID
@ -2486,7 +2486,7 @@ CREATE INDEX fk_dhcp4_client_class_server_id ON dhcp4_client_class_server (serve
-- being null. -- being null.
-- ----------------------------------------------------- -- -----------------------------------------------------
CREATE OR REPLACE FUNCTION createAuditRevisionDHCP6(audit_ts TIMESTAMP WITH TIME ZONE, CREATE OR REPLACE FUNCTION createAuditRevisionDHCP6(audit_ts TIMESTAMP WITH TIME ZONE,
server_tag VARCHAR(256), server_tag VARCHAR(64),
audit_log_message TEXT, audit_log_message TEXT,
cascade_transaction BOOLEAN) cascade_transaction BOOLEAN)
RETURNS VOID RETURNS VOID

12
src/share/database/scripts/pgsql/dhcpdb_drop.pgsql
View File

@ -31,18 +31,18 @@ DROP FUNCTION IF EXISTS proc_stat_lease6_delete ();
DROP TABLE IF EXISTS logs CASCADE; DROP TABLE IF EXISTS logs CASCADE;
-- config backend procedures for DHCPv6 -- config backend procedures for DHCPv6
DROP FUNCTION IF EXISTS createAuditRevisionDHCP6(audit_ts TIMESTAMP WITH TIME ZONE, server_tag VARCHAR(256), DROP FUNCTION IF EXISTS createAuditRevisionDHCP6(audit_ts TIMESTAMP WITH TIME ZONE, server_tag VARCHAR(64),
audit_log_message TEXT, cascade_transaction BOOLEAN); audit_log_message TEXT, cascade_transaction BOOLEAN);
DROP FUNCTION IF EXISTS createAuditEntryDHCP6(object_type_val VARCHAR(256), object_id_val BIGINT, DROP FUNCTION IF EXISTS createAuditEntryDHCP6(object_type_val VARCHAR(256), object_id_val BIGINT,
modification_type_val VARCHAR(32)); modification_type_val VARCHAR(32));
DROP FUNCTION IF EXISTS createOptionAuditDHCP6(modification_type VARCHAR, scope_id SMALLINT, DROP FUNCTION IF EXISTS createOptionAuditDHCP6(modification_type VARCHAR, scope_id SMALLINT,
option_id INT, subnet_id BIGINT, host_id INT, option_id INT, subnet_id BIGINT, host_id INT,
network_name VARCHAR, pool_id BIGINT, pd_pool_id BIGINT, network_name VARCHAR, pool_id BIGINT, pd_pool_id BIGINT,
modification_ts TIMESTAMP WITH TIME ZONE); modification_ts TIMESTAMP WITH TIME ZONE);
DROP FUNCTION IF EXISTS setClientClass6Order(id BIGINT, follow_class_name VARCHAR(128), DROP FUNCTION IF EXISTS setClientClass6Order(id BIGINT, follow_class_name VARCHAR(128),
old_follow_class_name VARCHAR(128)); old_follow_class_name VARCHAR(128));
DROP FUNCTION IF EXISTS checkDHCPv6ClientClassDependency(class_id BIGINT, dependency_id BIGINT); DROP FUNCTION IF EXISTS checkDHCPv6ClientClassDependency(class_id BIGINT, dependency_id BIGINT);
DROP FUNCTION IF EXISTS updateDHCPv6ClientClassKnownDependency(client_class_id BIGINT, DROP FUNCTION IF EXISTS updateDHCPv6ClientClassKnownDependency(client_class_id BIGINT,
dependency_id BIGINT); dependency_id BIGINT);
DROP FUNCTION IF EXISTS checkDHCPv6ClientClassKnownDependencyChange(); DROP FUNCTION IF EXISTS checkDHCPv6ClientClassKnownDependencyChange();
@ -95,18 +95,18 @@ DROP FUNCTION IF EXISTS func_dhcp6_subnet_BDEL();
DROP FUNCTION IF EXISTS func_dhcp6_pd_pool_BDEL(); DROP FUNCTION IF EXISTS func_dhcp6_pd_pool_BDEL();
-- config backend procedures for DHCPv4 -- config backend procedures for DHCPv4
DROP FUNCTION IF EXISTS createAuditRevisionDHCP4(audit_ts TIMESTAMP WITH TIME ZONE, server_tag VARCHAR(256), DROP FUNCTION IF EXISTS createAuditRevisionDHCP4(audit_ts TIMESTAMP WITH TIME ZONE, server_tag VARCHAR(64),
audit_log_message TEXT, cascade_transaction BOOLEAN); audit_log_message TEXT, cascade_transaction BOOLEAN);
DROP FUNCTION IF EXISTS createAuditEntryDHCP4(object_type_val VARCHAR(256), object_id_val BIGINT, DROP FUNCTION IF EXISTS createAuditEntryDHCP4(object_type_val VARCHAR(256), object_id_val BIGINT,
modification_type_val VARCHAR(32)); modification_type_val VARCHAR(32));
DROP FUNCTION IF EXISTS createOptionAuditDHCP4(modification_type VARCHAR, scope_id SMALLINT, DROP FUNCTION IF EXISTS createOptionAuditDHCP4(modification_type VARCHAR, scope_id SMALLINT,
option_id INT, subnet_id BIGINT, host_id INT, option_id INT, subnet_id BIGINT, host_id INT,
network_name VARCHAR, pool_id BIGINT, network_name VARCHAR, pool_id BIGINT,
modification_ts TIMESTAMP WITH TIME ZONE); modification_ts TIMESTAMP WITH TIME ZONE);
DROP FUNCTION IF EXISTS setClientClass4Order(id BIGINT, follow_class_name VARCHAR(128), DROP FUNCTION IF EXISTS setClientClass4Order(id BIGINT, follow_class_name VARCHAR(128),
old_follow_class_name VARCHAR(128)); old_follow_class_name VARCHAR(128));
DROP FUNCTION IF EXISTS checkDHCPv4ClientClassDependency(class_id BIGINT, dependency_id BIGINT); DROP FUNCTION IF EXISTS checkDHCPv4ClientClassDependency(class_id BIGINT, dependency_id BIGINT);
DROP FUNCTION IF EXISTS updateDHCPv4ClientClassKnownDependency(client_class_id BIGINT, DROP FUNCTION IF EXISTS updateDHCPv4ClientClassKnownDependency(client_class_id BIGINT,
dependency_id BIGINT); dependency_id BIGINT);
DROP FUNCTION IF EXISTS checkDHCPv4ClientClassKnownDependencyChange(); DROP FUNCTION IF EXISTS checkDHCPv4ClientClassKnownDependencyChange();

4
src/share/database/scripts/pgsql/upgrade_6.2_to_7.0.sh.in
View File

@ -883,7 +883,7 @@ LANGUAGE plpgsql;
-- being null. -- being null.
-- ----------------------------------------------------- -- -----------------------------------------------------
CREATE OR REPLACE FUNCTION createAuditRevisionDHCP4(audit_ts TIMESTAMP WITH TIME ZONE, CREATE OR REPLACE FUNCTION createAuditRevisionDHCP4(audit_ts TIMESTAMP WITH TIME ZONE,
server_tag VARCHAR(256), server_tag VARCHAR(64),
audit_log_message TEXT, audit_log_message TEXT,
cascade_transaction BOOLEAN) cascade_transaction BOOLEAN)
RETURNS VOID RETURNS VOID
@ -1493,7 +1493,7 @@ CREATE INDEX fk_dhcp4_client_class_server_id ON dhcp4_client_class_server (serve
-- being null. -- being null.
-- ----------------------------------------------------- -- -----------------------------------------------------
CREATE OR REPLACE FUNCTION createAuditRevisionDHCP6(audit_ts TIMESTAMP WITH TIME ZONE, CREATE OR REPLACE FUNCTION createAuditRevisionDHCP6(audit_ts TIMESTAMP WITH TIME ZONE,
server_tag VARCHAR(256), server_tag VARCHAR(64),
audit_log_message TEXT, audit_log_message TEXT,
cascade_transaction BOOLEAN) cascade_transaction BOOLEAN)
RETURNS VOID RETURNS VOID