Skip to content

Commit e28c0c7

Browse files
committed
[#89,!22] Added log_message column to audit MySQL tables.
1 parent 20bc3ce commit e28c0c7

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/bin/admin/tests/mysql_tests.sh.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ EOF
482482
run_statement "dhcp4_server" "$qry"
483483

484484
# table: dhcp4_audit
485-
qry="select id, object_type, object_id, modification_type, modification_ts from dhcp4_audit"
485+
qry="select id, object_type, object_id, modification_type, modification_ts, log_message from dhcp4_audit"
486486
run_statement "dhcp4_audit" "$qry"
487487

488488
# table: dhcp4_global_parameter
@@ -534,7 +534,7 @@ EOF
534534
run_statement "dhcp6_server" "$qry"
535535

536536
# table: dhcp6_audit
537-
qry="select id, object_type, object_id, modification_type, modification_ts from dhcp6_audit"
537+
qry="select id, object_type, object_id, modification_type, modification_ts, log_message from dhcp6_audit"
538538
run_statement "dhcp6_audit" "$qry"
539539

540540
# table: dhcp6_global_parameter

src/share/database/scripts/mysql/dhcpdb_create.mysql

+2
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_audit (
808808
object_id BIGINT(20) UNSIGNED NOT NULL,
809809
modification_type TINYINT(1) NOT NULL,
810810
modification_ts TIMESTAMP NOT NULL,
811+
log_message TEXT,
811812
PRIMARY KEY (id),
812813
KEY key_dhcp4_audit_by_modification_ts (modification_ts),
813814
KEY fk_dhcp4_audit_modification_type (modification_type),
@@ -1048,6 +1049,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_audit (
10481049
object_id BIGINT(20) UNSIGNED NOT NULL,
10491050
modification_type TINYINT(1) NOT NULL,
10501051
modification_ts TIMESTAMP NOT NULL,
1052+
log_message TEXT,
10511053
PRIMARY KEY (id),
10521054
KEY key_dhcp6_audit_modification_ts (modification_ts),
10531055
KEY fk_dhcp6_audit_modification_type (modification_type),

src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in

+2
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ CREATE TABLE IF NOT EXISTS dhcp4_audit (
148148
object_id BIGINT(2) UNSIGNED NOT NULL,
149149
modification_type TINYINT(1) NOT NULL,
150150
modification_ts TIMESTAMP NOT NULL,
151+
log_message TEXT,
151152
PRIMARY KEY (id),
152153
KEY key_dhcp4_audit_by_modification_ts (modification_ts),
153154
KEY fk_dhcp4_audit_modification_type (modification_type),
@@ -373,6 +374,7 @@ CREATE TABLE IF NOT EXISTS dhcp6_audit (
373374
object_id BIGINT(20) UNSIGNED NOT NULL,
374375
modification_type TINYINT(1) NOT NULL,
375376
modification_ts TIMESTAMP NOT NULL,
377+
log_message TEXT,
376378
PRIMARY KEY (id),
377379
KEY key_dhcp6_audit_modification_ts (modification_ts),
378380
KEY fk_dhcp6_audit_modification_type (modification_type),

0 commit comments

Comments
 (0)