[#2752] Rebased new schemas

src/share/database/scripts/mysql/.gitignore

@@ -23,4 +23,5 @@
 /upgrade_012_to_013.sh
 /upgrade_013_to_014.sh
 /upgrade_014_to_015.sh
+/upgrade_015_to_016.sh
 /wipe_data.sh

src/share/database/scripts/mysql/Makefile.am

@@ -34,6 +34,7 @@ mysql_SCRIPTS += upgrade_011_to_012.sh
 mysql_SCRIPTS += upgrade_012_to_013.sh
 mysql_SCRIPTS += upgrade_013_to_014.sh
 mysql_SCRIPTS += upgrade_014_to_015.sh
+mysql_SCRIPTS += upgrade_015_to_016.sh
 mysql_SCRIPTS += wipe_data.sh
 
 DISTCLEANFILES = ${mysql_SCRIPTS}

src/share/database/scripts/mysql/dhcpdb_create.mysql

@@ -5089,6 +5089,23 @@ UPDATE schema_version
 
 -- This line concludes the schema upgrade to version 15.
 
+-- This line starts the schema upgrade to version 16.
+
+-- Add relay and remote id colums to DHCPv4 leases.
+ALTER TABLE lease4
+    ADD COLUMN relay_id VARBINARY(128) DEFAULT NULL,
+    ADD COLUMN remote_id VARBINARY(128) DEFAULT NULL;
+
+-- Create relay and remote id indexes.
+CREATE INDEX lease4_by_relay_id ON lease4 (relay_id);
+CREATE INDEX lease4_by_remote_id ON lease4 (remote_id);
+
+-- Update the schema version number.
+UPDATE schema_version
+    SET version = '16', minor = '0';
+
+-- This line concludes the schema upgrade to version 16.
+
 # Notes:
 #
 # Indexes

src/share/database/scripts/mysql/upgrade_015_to_016.sh.in

@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# Copyright (C) 2023 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/.
+
+# shellcheck disable=SC1091
+# SC1091: Not following: ... was not specified as input (see shellcheck -x).
+
+# 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. Use installed version if available and
+# use build version if it isn't.
+if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+else
+    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+fi
+
+# Check version.
+version=$(mysql_version "${@}")
+if test "${version}" != "15.0"; then
+    printf 'This script upgrades 15.0 to 16.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 16.
+
+-- Add relay and remote id colums to DHCPv4 leases.
+ALTER TABLE lease4
+    ADD COLUMN relay_id VARBINARY(128) DEFAULT NULL,
+    ADD COLUMN remote_id VARBINARY(128) DEFAULT NULL;
+
+-- Create relay and remote id indexes.
+CREATE INDEX lease4_by_relay_id ON lease4 (relay_id);
+CREATE INDEX lease4_by_remote_id ON lease4 (remote_id);
+
+-- Update the schema version number.
+UPDATE schema_version
+    SET version = '16', minor = '0';
+
+-- This line concludes the schema upgrade to version 16.
+EOF