[#1387] Synchronized upgrade scripts

diff --git a/configure.ac b/configure.ac
index 24373f01815b957c44f8a39c95cf627578ff32b7..b3b5031c3ca3636e08564cc711abda360b12e134 100644 (file)
--- 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 273dd261fc1edbe2a1f28d9d9763d3a30a16a0cb..1ec71737a5bbadab791a3be1b9c3c2ef18c2e13c 100644 (file)
--- 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 f0d99948781bf3b8442845704ae360c0be67b44c..842539055cfe3951ed78a26836583db5854cc619 100644 (file)
--- 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 59e478ba9a91fa1e177402e7441aa5b22c229d76..3eeb495a3df40507f48569d63294fba0eb621b32 100644 (file)
--- 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 0bed48e86b68fcda657b0737c3fa52d6f971f192..90e9d52a7725aa2644995da1435632c77eaba695 100644 (file)
--- 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