From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 23 Jul 2018 12:35:48 +0000 (+0200)
Subject: [github88] Schema creation scripts fixed.
X-Git-Tag: ha_phase2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=808ce380a600c4843b4ca4fb32bfd69e11c81306;p=thirdparty%2Fkea.git

[github88] Schema creation scripts fixed.
---

diff --git a/src/share/database/scripts/cql/dhcpdb_create.cql b/src/share/database/scripts/cql/dhcpdb_create.cql
index 56c1ce8c9c..ad232dc90d 100644
--- a/src/share/database/scripts/cql/dhcpdb_create.cql
+++ b/src/share/database/scripts/cql/dhcpdb_create.cql
@@ -276,9 +276,6 @@ INSERT INTO schema_version (version, minor) VALUES(2, 0);
 
 -- This line starts database upgrade to version 3.0
 
--- This line adds auth_key column into host reservation table 
-ALTER TABLE host_reservations ADD auth_key text;
-
 -- Add a column holding leases for user context.
 ALTER TABLE lease4 ADD user_context text;
 ALTER TABLE lease6 ADD user_context text;
@@ -296,11 +293,11 @@ CREATE TABLE IF NOT EXISTS logs (
 -- Create search index for logs table
 CREATE INDEX IF NOT EXISTS logsindex ON logs (address);
 
--- Add new field.
+-- This line adds auth_key column into host reservation table
 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);
->>>>>>> [lib] Address review comments for #83
+
 -- This line concludes database upgrade to version 3.0
diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index a6d50a3a42..ab9153705b 100644
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -679,10 +679,6 @@ SET version = '6', minor = '0';
 
 # This line concludes database upgrade to version 6.0.
 
-#add auth key in host tables
-ALTER TABLE hosts  
-    ADD COLUMN auth_key VARCHAR(16) NULL; 
-
 # Add user context into tables holding leases
 ALTER TABLE lease4 ADD COLUMN user_context TEXT NULL;
 ALTER TABLE lease6 ADD COLUMN user_context TEXT NULL;