From: Francis Dupont <fdupont@isc.org>
Date: Thu, 21 Jun 2018 10:36:22 +0000 (+0200)
Subject: [5584] Checkpoint: fixes
X-Git-Tag: trac5685_base~2^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5336c37efe0c74c31938e1e76451a7aaf8189b50;p=thirdparty%2Fkea.git

[5584] Checkpoint: fixes
---

diff --git a/configure.ac b/configure.ac
index fa459cb1e8..82f38892e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1492,7 +1492,7 @@ AC_CONFIG_FILES([Makefile
                  src/share/database/scripts/Makefile
                  src/share/database/scripts/cql/Makefile
                  src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh
-                 src/share/database/scripts/cql/upgrade_2.0_to_2.1.sh
+                 src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh
                  src/share/database/scripts/mysql/Makefile
                  src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh
                  src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh
diff --git a/src/lib/dhcpsrv/cql_connection.h b/src/lib/dhcpsrv/cql_connection.h
index 53375961a5..9d81d93626 100644
--- a/src/lib/dhcpsrv/cql_connection.h
+++ b/src/lib/dhcpsrv/cql_connection.h
@@ -49,10 +49,10 @@ constexpr uint32_t CQL_DRIVER_VERSION_MAJOR = CASS_VERSION_MAJOR;
 constexpr uint32_t CQL_DRIVER_VERSION_MINOR = CASS_VERSION_MINOR;
 /// @}
 
-/// Define CQL schema version: 2.1
+/// Define CQL schema version: 3.0
 /// @{
-constexpr uint32_t CQL_SCHEMA_VERSION_MAJOR = 2u;
-constexpr uint32_t CQL_SCHEMA_VERSION_MINOR = 1u;
+constexpr uint32_t CQL_SCHEMA_VERSION_MAJOR = 3u;
+constexpr uint32_t CQL_SCHEMA_VERSION_MINOR = 0u;
 /// @}
 
 /// @brief Defines a single statement or query
diff --git a/src/lib/dhcpsrv/lease.h b/src/lib/dhcpsrv/lease.h
index 8f241651d1..45568dc0d1 100644
--- a/src/lib/dhcpsrv/lease.h
+++ b/src/lib/dhcpsrv/lease.h
@@ -222,6 +222,9 @@ struct Lease : public UserContext, public isc::data::CfgToElement {
     /// @param probation_period lease lifetime will be set to this value
     virtual void decline(uint32_t probation_period) = 0;
 
+    /// Avoid a clang spurious error
+    using isc::data::CfgToElement::toElement;
+
 protected:
 
     /// @brief Sets common (for v4 and v6) properties of the lease object.
diff --git a/src/share/database/scripts/cql/Makefile.am b/src/share/database/scripts/cql/Makefile.am
index 000eefd4b1..c5def18567 100644
--- a/src/share/database/scripts/cql/Makefile.am
+++ b/src/share/database/scripts/cql/Makefile.am
@@ -4,7 +4,7 @@ sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/cql
 sqlscripts_DATA = dhcpdb_create.cql
 sqlscripts_DATA += dhcpdb_drop.cql
 sqlscripts_DATA += upgrade_1.0_to_2.0.sh
-sqlscripts_DATA += upgrade_2.0_to_2.1.sh
+sqlscripts_DATA += upgrade_2.0_to_3.0.sh
 sqlscripts_DATA += soft_wipe.cql
 
 EXTRA_DIST = ${sqlscripts_DATA}
diff --git a/src/share/database/scripts/cql/dhcpdb_create.cql b/src/share/database/scripts/cql/dhcpdb_create.cql
index 1f565f68ae..e2efacbf5b 100644
--- a/src/share/database/scripts/cql/dhcpdb_create.cql
+++ b/src/share/database/scripts/cql/dhcpdb_create.cql
@@ -274,7 +274,7 @@ INSERT INTO schema_version (version, minor) VALUES(2, 0);
 
 -- This line concludes database upgrade to version 2.0
 
--- This line starts database upgrade to version 2.1
+-- This line starts database upgrade to version 3.0
 
 -- Add a column holding leases for user context.
 ALTER TABLE lease4 ADD user_context text;
@@ -293,7 +293,8 @@ CREATE TABLE IF NOT EXISTS logs (
 -- Create search index for logs table
 CREATE INDEX IF NOT EXISTS logsindex ON logs (address);
 
+-- Cql requires primary keys in the WHERE here.
 DELETE FROM schema_version WHERE version=2;
-INSERT INTO schema_version (version, minor) VALUES(2, 1);
+INSERT INTO schema_version (version, minor) VALUES(3, 0);
 
--- This line concludes database upgrade to version 2.1
+-- This line concludes database upgrade to version 3.0
diff --git a/src/share/database/scripts/cql/upgrade_2.0_to_2.1.sh.in b/src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in
similarity index 79%
rename from src/share/database/scripts/cql/upgrade_2.0_to_2.1.sh.in
rename to src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in
index 94a27aa7a5..b52f165580 100644
--- a/src/share/database/scripts/cql/upgrade_2.0_to_2.1.sh.in
+++ b/src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in
@@ -12,12 +12,12 @@ fi
 version=$(cql_version "$@")
 
 if [ "${version}" != "2.0" ]; then
-    printf "This script upgrades 2.0 to 2.1. Reported version is %s. Skipping upgrade.\n" "${version}"
+    printf "This script upgrades 2.0 to 3.0. Reported version is %s. Skipping upgrade.\n" "${version}"
     exit 0
 fi
 
 cqlsh "$@" <<EOF
--- This line starts database upgrade to version 2.1
+-- This line starts database upgrade to version 3.0
 
 -- Add a column holding leases for user context.
 ALTER TABLE lease4 ADD user_context text;
@@ -36,10 +36,11 @@ CREATE TABLE IF NOT EXISTS logs (
 -- Create search index for logs table
 CREATE INDEX IF NOT EXISTS logsindex ON logs (address);
 
+-- Cql requires primary keys in the WHERE here.
 DELETE FROM schema_version WHERE version=2;
-INSERT INTO schema_version (version, minor) VALUES(2, 1);
+INSERT INTO schema_version (version, minor) VALUES(3, 0);
 
--- This line concludes database upgrade to version 2.1
+-- This line concludes database upgrade to version 3.0
 EOF
 
 exit $?