From c6cb1c76af6f6433a9f2a2fe7b2c6fda211fab80 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Sat, 27 Jul 2024 11:11:38 +0200
Subject: [PATCH] [#1387] Synchronized upgrade scripts

---
 configure.ac                                         | 4 ++++
 src/lib/mysql/mysql_constants.h                      | 2 +-
 src/lib/pgsql/pgsql_connection.h                     | 2 +-
 src/share/database/scripts/mysql/dhcpdb_create.mysql | 4 ++--
 src/share/database/scripts/pgsql/dhcpdb_create.pgsql | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 24373f0181..b3b5031c3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1774,6 +1774,8 @@ AC_CONFIG_FILES([src/share/database/scripts/mysql/upgrade_022_to_023.sh],
                 [chmod +x src/share/database/scripts/mysql/upgrade_022_to_023.sh])
 AC_CONFIG_FILES([src/share/database/scripts/mysql/upgrade_023_to_024.sh],
                 [chmod +x src/share/database/scripts/mysql/upgrade_023_to_024.sh])
+AC_CONFIG_FILES([src/share/database/scripts/mysql/upgrade_024_to_025.sh],
+                [chmod +x src/share/database/scripts/mysql/upgrade_024_to_025.sh])
 AC_CONFIG_FILES([src/share/database/scripts/mysql/wipe_data.sh],
                 [chmod +x src/share/database/scripts/mysql/wipe_data.sh])
 AC_CONFIG_FILES([src/share/database/scripts/pgsql/Makefile])
@@ -1835,6 +1837,8 @@ AC_CONFIG_FILES([src/share/database/scripts/pgsql/upgrade_022_to_023.sh],
                 [chmod +x src/share/database/scripts/pgsql/upgrade_022_to_023.sh])
 AC_CONFIG_FILES([src/share/database/scripts/pgsql/upgrade_023_to_024.sh],
                 [chmod +x src/share/database/scripts/pgsql/upgrade_023_to_024.sh])
+AC_CONFIG_FILES([src/share/database/scripts/pgsql/upgrade_024_to_025.sh],
+                [chmod +x src/share/database/scripts/pgsql/upgrade_024_to_025.sh])
 AC_CONFIG_FILES([src/share/database/scripts/pgsql/wipe_data.sh],
                 [chmod +x src/share/database/scripts/pgsql/wipe_data.sh])
 AC_CONFIG_FILES([src/share/yang/Makefile])
diff --git a/src/lib/mysql/mysql_constants.h b/src/lib/mysql/mysql_constants.h
index 273dd261fc..1ec71737a5 100644
--- a/src/lib/mysql/mysql_constants.h
+++ b/src/lib/mysql/mysql_constants.h
@@ -52,7 +52,7 @@ const int MLM_MYSQL_FETCH_FAILURE = 0;
 
 /// @name Current database schema version values.
 //@{
-const uint32_t MYSQL_SCHEMA_VERSION_MAJOR = 24;
+const uint32_t MYSQL_SCHEMA_VERSION_MAJOR = 25;
 const uint32_t MYSQL_SCHEMA_VERSION_MINOR = 0;
 
 //@}
diff --git a/src/lib/pgsql/pgsql_connection.h b/src/lib/pgsql/pgsql_connection.h
index f0d9994878..842539055c 100644
--- a/src/lib/pgsql/pgsql_connection.h
+++ b/src/lib/pgsql/pgsql_connection.h
@@ -18,7 +18,7 @@ namespace isc {
 namespace db {
 
 /// @brief Define the PostgreSQL backend version.
-const uint32_t PGSQL_SCHEMA_VERSION_MAJOR = 24;
+const uint32_t PGSQL_SCHEMA_VERSION_MAJOR = 25;
 const uint32_t PGSQL_SCHEMA_VERSION_MINOR = 0;
 
 // Maximum number of parameters that can be used a statement
diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 59e478ba9a..3eeb495a3d 100644
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -6010,7 +6010,7 @@ UPDATE schema_version
 
 -- This line concludes the schema upgrade to version 24.0.
 
--- This line starts the schema upgrade to version 25.0
+-- This line starts the schema upgrade to version 25.0.
 
 -- Add prefix exclude option to IPv6 reservations.
 ALTER TABLE ipv6_reservations
@@ -6021,7 +6021,7 @@ ALTER TABLE ipv6_reservations
 UPDATE schema_version
     SET version = '25', minor = '0';
 
--- This line concludes the schema upgrade to version 25.0
+-- This line concludes the schema upgrade to version 25.0.
 
 # Notes:
 #
diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 0bed48e86b..90e9d52a77 100644
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -6471,12 +6471,12 @@ UPDATE schema_version
 
 -- This line concludes the schema upgrade to version 24.0.
 
--- This line starts the schema upgrade to version 25.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;
+    ADD COLUMN excluded_prefix_len SMALLINT NOT NULL DEFAULT '0';
 
 -- Update the schema version number.
 UPDATE schema_version