[github88] CQL/SQL scripts corrected (unit-tests in src/bin/admin now pass)

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 e9e0abba204536b9ae1e7a323f38ce3f2670ae12..0deb78f59584c34710a19ccffdd4f9ac4b0ff282 100644 (file)
--- 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 168f8bd0df33a3c5c00c48e03d3ec7e58ae4ab2c..e9c4479a03492c71f15cf14902e4bb9905ffb528 100644 (file)
--- 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 326522df8d725c7d9e023438bee3fe9a40b2a5ac..0fca541770ab19aa8e6170071ce9a4419615eeef 100644 (file)
--- 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 <<EOF
 
 START TRANSACTION;
 
--- Create auth_key in hosts table
-ALTER TABLE hosts ADD COLUMN auth_key  VARCHAR(16) DEFAULT NULL;
-
 -- Add a column holding leases for user context.
 ALTER TABLE lease4 ADD COLUMN user_context TEXT;
 ALTER TABLE lease6 ADD COLUMN user_context TEXT;
@@ -136,7 +133,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 5.0 schema version.