assert_str_eq '18' "${OUTPUT}" "${query}: expected output %s, returned %s"
}
+mysql_upgrade_24_to_25_test() {
+ # excluded_prefix should have been added to ipv6_reservations
+ qry="select excluded_prefix from ipv6_reservations limit 1"
+ run_command \
+ mysql_execute "${qry}"
+ assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+
+ # excluded_prefix_len should have been added to ipv6_reservations
+ qry="select excluded_prefix_len from ipv6_reservations limit 1"
+ run_command \
+ mysql_execute "${qry}"
+ assert_eq 0 "${EXIT_CODE}" "${qry}. (expected status code %d, returned %d)"
+}
+
mysql_upgrade_test() {
test_start "mysql.upgrade"
# Check upgrade from 23.0 to 24.0.
mysql_upgrade_23_to_24_test
+ # Check upgrade from 24.0 to 25.0.
+ mysql_upgrade_24_to_25_test
+
# Let's wipe the whole database
mysql_wipe
assert_str_eq '18' "${OUTPUT}" "${query}: expected output %s, returned %s"
}
+pgsql_upgrade_24_to_25_test() {
+ # Added excluded_prefix to ipv6_reservations
+ run_command \
+ pgsql_execute "select excluded_prefix from ipv6_reservations"
+ assert_eq 0 "${EXIT_CODE}" "ipv6_reservations is missing excluded_prefix column. (expected status code %d, returned %d)"
+ # Added excluded_prefix_len to ipv6_reservations
+ run_command \
+ pgsql_execute "select excluded_prefix_len from ipv6_reservations"
+ assert_eq 0 "${EXIT_CODE}" "ipv6_reservations is missing excluded_prefix_len column. (expected status code %d, returned %d)"
+}
+
pgsql_upgrade_test() {
test_start "pgsql.upgrade"
# Check 23 to 24 upgrade
pgsql_upgrade_23_to_24_test
+ # Check 24 to 25 upgrade
+ pgsql_upgrade_24_to_25_test
+
# Let's wipe the whole database
pgsql_wipe
/upgrade_021_to_022.sh
/upgrade_022_to_023.sh
/upgrade_023_to_024.sh
+/upgrade_024_to_025.sh
/wipe_data.sh
mysql_SCRIPTS += upgrade_021_to_022.sh
mysql_SCRIPTS += upgrade_022_to_023.sh
mysql_SCRIPTS += upgrade_023_to_024.sh
+mysql_SCRIPTS += upgrade_024_to_025.sh
mysql_SCRIPTS += wipe_data.sh
DISTCLEANFILES = ${mysql_SCRIPTS}
-- This line concludes the schema upgrade to version 24.0.
+-- This line starts the schema upgrade to version 25.0
+
+-- Add prefix exclude option to IPv6 reservations.
+ALTER TABLE ipv6_reservations
+ ADD COLUMN excluded_prefix BINARY(16) DEFAULT NULL,
+ ADD COLUMN excluded_prefix_len TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+
+-- Update the schema version number.
+UPDATE schema_version
+ SET version = '25', minor = '0';
+
+-- This line concludes the schema upgrade to version 25.0
+
# Notes:
#
# Indexes
--- /dev/null
+#!/bin/sh
+
+# Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Exit with error if commands exit with non-zero and if undefined variables are
+# used.
+set -eu
+
+# shellcheck disable=SC2034
+# SC2034: ... appears unused. Verify use (or export if used externally).
+prefix="@prefix@"
+
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/mysql"; then
+ # shellcheck source=./src/bin/admin/admin-utils.sh.in
+ . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+else
+ # shellcheck source=./src/bin/admin/admin-utils.sh.in
+ . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+fi
+
+# Check version.
+version=$(mysql_version "${@}")
+if test "${version}" != "24.0"; then
+ printf 'This script upgrades 24.0 to 25.0. '
+ printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
+ exit 0
+fi
+
+# Get the schema name from database argument. We need this to
+# query information_schema for the right database.
+for arg in "${@}"
+do
+ if ! printf '%s' "${arg}" | grep -Eq -- '^--'
+ then
+ schema="$arg"
+ break
+ fi
+done
+
+# Make sure we have the schema.
+if [ -z "$schema" ]
+then
+ printf "Could not find database schema name in cmd line args: %s\n" "${*}"
+ exit 255
+fi
+
+mysql "$@" <<EOF
+
+-- This line starts the schema upgrade to version 25.0.
+
+-- Add prefix exclude option to IPv6 reservations.
+ALTER TABLE ipv6_reservations
+ ADD COLUMN excluded_prefix BINARY(16) DEFAULT NULL,
+ ADD COLUMN excluded_prefix_len TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
+
+-- Update the schema version number.
+UPDATE schema_version
+ SET version = '25', minor = '0';
+
+-- This line concludes the schema upgrade to version 25.0.
+EOF
/upgrade_021_to_022.sh
/upgrade_022_to_023.sh
/upgrade_023_to_024.sh
+/upgrade_024_to_025.sh
/wipe_data.sh
pgsql_SCRIPTS += upgrade_021_to_022.sh
pgsql_SCRIPTS += upgrade_022_to_023.sh
pgsql_SCRIPTS += upgrade_023_to_024.sh
+pgsql_SCRIPTS += upgrade_024_to_025.sh
pgsql_SCRIPTS += wipe_data.sh
DISTCLEANFILES = ${pgsql_SCRIPTS}
-- Get rid of the now obsolete function.
DROP FUNCTION IF EXISTS updateOptionDataDef();
+-- Update the schema version number.
UPDATE schema_version
SET version = '24', minor = '0';
-- This line concludes the schema upgrade to version 24.0.
+-- This line starts the schema upgrade to version 25.0
+
+-- Add prefix exclude option to IPv6 reservations.
+ALTER TABLE ipv6_reservations
+ ADD COLUMN excluded_prefix INET DEFAULT NULL,
+ ADD COLUMN excluded_prefix_len SMALLINT NOT NULL;
+
+-- Update the schema version number.
+UPDATE schema_version
+ SET version = '25', minor = '0';
+
+-- This line concludes the schema upgrade to version 25.0.
+
-- Commit the script transaction.
COMMIT;
-- Get rid of the now obsolete function.
DROP FUNCTION IF EXISTS updateOptionDataDef();
+-- Update the schema version number.
UPDATE schema_version
SET version = '24', minor = '0';
--- /dev/null
+#!/bin/sh
+
+# Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Exit with error if commands exit with non-zero and if undefined variables are
+# used.
+set -eu
+
+# shellcheck disable=SC2034
+# SC2034: ... appears unused. Verify use (or export if used externally).
+prefix="@prefix@"
+
+# Include utilities based on location of this script. Check for sources first,
+# so that the unexpected situations with weird paths fall on the default
+# case of installed.
+script_path=$(cd "$(dirname "${0}")" && pwd)
+if test "${script_path}" = "@abs_top_builddir@/src/share/database/scripts/pgsql"; then
+ # shellcheck source=./src/bin/admin/admin-utils.sh.in
+ . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+else
+ # shellcheck source=./src/bin/admin/admin-utils.sh.in
+ . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+fi
+
+VERSION=$(pgsql_version "$@")
+
+if [ "$VERSION" != "24.0" ]; then
+ printf 'This script upgrades 24.0 to 25.0. '
+ printf 'Reported version is %s. Skipping upgrade.\n' "${VERSION}"
+ exit 0
+fi
+
+psql "$@" >/dev/null <<EOF
+START TRANSACTION;
+
+-- This line starts the schema upgrade to version 25.0.
+
+-- Add prefix exclude option to IPv6 reservations.
+ALTER TABLE ipv6_reservations
+ ADD COLUMN excluded_prefix INET DEFAULT NULL,
+ ADD COLUMN excluded_prefix_len SMALLINT NOT NULL DEFAULT '0';
+
+-- Update the schema version number.
+UPDATE schema_version
+ SET version = '25', minor = '0';
+
+-- This line concludes the schema upgrade to version 25.0.
+
+-- Commit the script transaction.
+COMMIT;
+
+EOF
projects / thirdparty / kea.git / commitdiff
