From 61267ca824ee5ca5b9d0a0d15d3c328941ade55a Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Mon, 23 Jul 2018 16:03:40 +0200 Subject: [PATCH] [github88] CQL/SQL scripts corrected (unit-tests in src/bin/admin now pass) --- src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in | 3 ++- src/share/database/scripts/pgsql/dhcpdb_create.pgsql | 2 +- src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in | 5 +---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in b/src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in index e9e0abba20..0deb78f595 100644 --- a/src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in +++ b/src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in @@ -36,9 +36,10 @@ 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. +-- Add auth_key for storing keys for DHCPV6 reconfigure. ALTER TABLE host_reservations ADD auth_key text; +-- Cql requires primary keys in the WHERE here. DELETE FROM schema_version WHERE version=2; INSERT INTO schema_version (version, minor) VALUES(3, 0); diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql index 168f8bd0df..e9c4479a03 100644 --- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql +++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql @@ -867,7 +867,7 @@ CREATE TABLE logs ( CREATE INDEX timestamp_id ON logs (timestamp); CREATE INDEX address_id ON logs (address); --- Create auth_key in ipv6_reservations +-- Create auth_key in hosts table for storing keys for DHCPv6 reconfigure. ALTER TABLE hosts ADD COLUMN auth_key VARCHAR(16) DEFAULT NULL; -- Set schema 5.0 version diff --git a/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in b/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in index 326522df8d..0fca541770 100644 --- a/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in +++ b/src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in @@ -19,9 +19,6 @@ psql "$@" >/dev/null <