[#89,!22] Added log_message column to audit MySQL tables.

isc-projects · Sep 18, 2018 · e28c0c7 · e28c0c7
1 parent 20bc3ce
commit e28c0c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
@@ -482,7 +482,7 @@ EOF
     run_statement "dhcp4_server" "$qry"
 
     # table: dhcp4_audit
-    qry="select id, object_type, object_id, modification_type, modification_ts from dhcp4_audit"
+    qry="select id, object_type, object_id, modification_type, modification_ts, log_message from dhcp4_audit"
     run_statement "dhcp4_audit" "$qry"
 
     # table: dhcp4_global_parameter
@@ -534,7 +534,7 @@ EOF
     run_statement "dhcp6_server" "$qry"
 
     # table: dhcp6_audit
-    qry="select id, object_type, object_id, modification_type, modification_ts from dhcp6_audit"
+    qry="select id, object_type, object_id, modification_type, modification_ts, log_message from dhcp6_audit"
     run_statement "dhcp6_audit" "$qry"
 
     # table: dhcp6_global_parameter

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -808,6 +808,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_audit (
     object_id BIGINT(20) UNSIGNED NOT NULL,
     modification_type TINYINT(1) NOT NULL,
     modification_ts TIMESTAMP NOT NULL,
+    log_message TEXT,
     PRIMARY KEY (id),
     KEY key_dhcp4_audit_by_modification_ts (modification_ts),
     KEY fk_dhcp4_audit_modification_type (modification_type),
@@ -1048,6 +1049,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_audit (
     object_id BIGINT(20) UNSIGNED NOT NULL,
     modification_type TINYINT(1) NOT NULL,
     modification_ts TIMESTAMP NOT NULL,
+    log_message TEXT,
     PRIMARY KEY (id),
     KEY key_dhcp6_audit_modification_ts (modification_ts),
     KEY fk_dhcp6_audit_modification_type (modification_type),

diff --git a/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in b/src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
@@ -148,6 +148,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_audit (
     object_id BIGINT(2) UNSIGNED NOT NULL,
     modification_type TINYINT(1) NOT NULL,
     modification_ts TIMESTAMP NOT NULL,
+    log_message TEXT,
     PRIMARY KEY (id),
     KEY key_dhcp4_audit_by_modification_ts (modification_ts),
     KEY fk_dhcp4_audit_modification_type (modification_type),
@@ -373,6 +374,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_audit (
     object_id BIGINT(20) UNSIGNED NOT NULL,
     modification_type TINYINT(1) NOT NULL,
     modification_ts TIMESTAMP NOT NULL,
+    log_message TEXT,
     PRIMARY KEY (id),
     KEY key_dhcp6_audit_modification_ts (modification_ts),
     KEY fk_dhcp6_audit_modification_type (modification_type),