From: Thomas Markwalder Date: Fri, 19 Apr 2024 19:22:50 +0000 (+0000) Subject: [#2957] Addressed review comments X-Git-Tag: Kea-2.5.8~53 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f935d2b86abf7ba0d6f216174262b88dde84b77;p=thirdparty%2Fkea.git [#2957] Addressed review comments Minor corrections, added ChangeLog and fixed db-version UT. --- diff --git a/ChangeLog b/ChangeLog index 712aef481c..87e92e9b3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2221. [bug] tmark + Corrected an index on the dhcp4_servers table + in the PostgreSQL schema. + (Gitlab #2957) + 2220. [bug] marcin Exclude packets ignored during load balancing from the pkt6-receive-drop statistics. The packets dropped by the diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in index f710bf8fbb..4ca9c22e9c 100644 --- a/src/bin/admin/tests/pgsql_tests.sh.in +++ b/src/bin/admin/tests/pgsql_tests.sh.in @@ -142,7 +142,7 @@ pgsql_db_version_test() { run_command \ "${kea_admin}" db-version pgsql -u "${db_user}" -p "${db_password}" -n "${db_name}" version="${OUTPUT}" - assert_str_eq "20.0" "${version}" "Expected kea-admin to return %s, returned value was %s" + assert_str_eq "21.0" "${version}" "Expected kea-admin to return %s, returned value was %s" # Let's wipe the whole database pgsql_wipe @@ -888,7 +888,7 @@ pgsql_upgrade_18_to_19_test() { } pgsql_upgrade_19_to_20_test() { - # Verify that lease6_by_sunet_id_address index on lease6 is keyed by + # Verify that lease6_by_subnet_id_address index on lease6 is keyed by # attributes number 5 and 1 (i.e. subnet-id and address) qry="select ix.indkey as keys from pg_class t, pg_class i, pg_index ix \ where t.oid = ix.indrelid and i.oid = ix.indexrelid and \ diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql index bececdcd76..c86069fda0 100644 --- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql +++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql @@ -6327,7 +6327,7 @@ UPDATE schema_version -- This line starts the schema upgrade to version 21.0. --- Correct dhcp4_server_modifcation_ts to index the dhcp4_server table. +-- Correct dhcp4_server_modification_ts to index the dhcp4_server table. DROP INDEX dhcp4_server_modification_ts; CREATE INDEX dhcp4_server_modification_ts ON dhcp4_server (modification_ts); diff --git a/src/share/database/scripts/pgsql/upgrade_020_to_021.sh.in b/src/share/database/scripts/pgsql/upgrade_020_to_021.sh.in index 65b2e0496e..69e6c0e195 100644 --- a/src/share/database/scripts/pgsql/upgrade_020_to_021.sh.in +++ b/src/share/database/scripts/pgsql/upgrade_020_to_021.sh.in @@ -39,7 +39,7 @@ START TRANSACTION; -- This line starts the schema upgrade to version 21.0. --- Correct dhcp4_server_modifcation_ts to index the dhcp4_server table. +-- Correct dhcp4_server_modification_ts to index the dhcp4_server table. DROP INDEX dhcp4_server_modification_ts; CREATE INDEX dhcp4_server_modification_ts ON dhcp4_server (modification_ts);