diff options
author | Thomas Markwalder <tmark@isc.org> | 2024-07-18 15:44:23 +0200 |
---|---|---|
committer | Thomas Markwalder <tmark@isc.org> | 2024-07-18 17:18:26 +0200 |
commit | 48196f735e975d45838a655e23ee7587751c63b5 (patch) | |
tree | fe032eb282505da843e97bc37d25dd1f12244c22 /src/share/database | |
parent | Apply 1 suggestion(s) to 1 file(s) (diff) | |
download | kea-48196f735e975d45838a655e23ee7587751c63b5.tar.xz kea-48196f735e975d45838a655e23ee7587751c63b5.zip |
[#3476] Addressed review comments
modified:
src/bin/admin/kea-admin.in
src/lib/dhcp/option_data_types.h
src/lib/dhcp/tests/option_definition_unittest.cc
src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.cc
src/lib/dhcpsrv/testutils/generic_cb_dhcp6_unittest.cc
src/share/database/scripts/mysql/dhcpdb_create.mysql
src/share/database/scripts/mysql/upgrade_023_to_024.sh.in
src/share/database/scripts/pgsql/dhcpdb_create.pgsql
src/share/database/scripts/pgsql/upgrade_023_to_024.sh.in
Diffstat (limited to 'src/share/database')
4 files changed, 4 insertions, 0 deletions
diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql index edc754074b..c9b8f81484 100644 --- a/src/share/database/scripts/mysql/dhcpdb_create.mysql +++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql @@ -5984,6 +5984,7 @@ BEGIN ALTER TABLE dhcp6_option_def ADD CONSTRAINT fk_option_def_data_type6 FOREIGN KEY (type) REFERENCES option_def_data_type(id); + SET @disable_audit = 0; END IF; END $$ DELIMITER ; diff --git a/src/share/database/scripts/mysql/upgrade_023_to_024.sh.in b/src/share/database/scripts/mysql/upgrade_023_to_024.sh.in index bdd0839d45..fd438731cb 100644 --- a/src/share/database/scripts/mysql/upgrade_023_to_024.sh.in +++ b/src/share/database/scripts/mysql/upgrade_023_to_024.sh.in @@ -111,6 +111,7 @@ BEGIN ALTER TABLE dhcp6_option_def ADD CONSTRAINT fk_option_def_data_type6 FOREIGN KEY (type) REFERENCES option_def_data_type(id); + SET @disable_audit = 0; END IF; END $$ DELIMITER ; diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql index 46e3ad6dc4..e2a5f848a0 100644 --- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql +++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql @@ -6445,6 +6445,7 @@ BEGIN ALTER TABLE dhcp6_option_def ADD CONSTRAINT fk_option_def_data_type6 FOREIGN KEY (type) REFERENCES option_def_data_type(id); + PERFORM set_config('kea.disable_audit', 'false', false); RETURN 'UPDATED'; END; $$ LANGUAGE plpgsql; diff --git a/src/share/database/scripts/pgsql/upgrade_023_to_024.sh.in b/src/share/database/scripts/pgsql/upgrade_023_to_024.sh.in index a67cb9ecff..04749d855a 100644 --- a/src/share/database/scripts/pgsql/upgrade_023_to_024.sh.in +++ b/src/share/database/scripts/pgsql/upgrade_023_to_024.sh.in @@ -93,6 +93,7 @@ BEGIN ALTER TABLE dhcp6_option_def ADD CONSTRAINT fk_option_def_data_type6 FOREIGN KEY (type) REFERENCES option_def_data_type(id); + PERFORM set_config('kea.disable_audit', 'false', false); RETURN 'UPDATED'; END; \$\$ LANGUAGE plpgsql; |