[#396,!205] Use microsec precision for the CB tables.

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 14b07a390bca5b42c31343e7be3516a94dd7e6c0..b033ea873795cd2e60541afcd9190eb9bf7f3e34 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -1337,93 +1337,93 @@ SET version = '7', minor = '0';
 -- -----------------------------------------------------
 -- Modify timestamps in the Configuration Backend
 -- specific tables to use fractional seconds with
--- 3 decimal places precision.
+-- 6 decimal places precision.
 -- -----------------------------------------------------
 
 ALTER TABLE dhcp4_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_audit
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_global_parameter
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_global_parameter_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_option_def
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_option_def_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_shared_network
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_shared_network_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_subnet
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_pool
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_subnet_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_options
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_options_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_audit
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_global_parameter
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_global_parameter_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_option_def
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_option_def_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_shared_network
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_shared_network_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_subnet
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_pool
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_subnet_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_options
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_options_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 -- -----------------------------------------------------
 -- Table `dhcp4_audit_revision`
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS dhcp4_audit_revision (
     id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-    modification_ts TIMESTAMP(3) NOT NULL,
+    modification_ts TIMESTAMP(6) NOT NULL,
     log_message TEXT,
     server_id BIGINT(10) UNSIGNED,
     PRIMARY KEY (id),

diff --git a/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in b/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
index b9cb7d9615eeac09ee147ddbcf24fe09583fac2c..ad9c5e2c270bd85d801c97aa22f05e540cdac800 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
@@ -24,89 +24,89 @@ mysql "$@" <<EOF
 -- -----------------------------------------------------
 
 ALTER TABLE dhcp4_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_audit
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_global_parameter
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_global_parameter_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_option_def
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_option_def_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_shared_network
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_shared_network_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_subnet
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_pool
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_subnet_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_options
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp4_options_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_audit
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_global_parameter
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_global_parameter_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_option_def
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_option_def_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_shared_network
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_shared_network_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_subnet
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_pool
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_subnet_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_options
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 ALTER TABLE dhcp6_options_server
-    MODIFY COLUMN modification_ts TIMESTAMP(3) NOT NULL;
+    MODIFY COLUMN modification_ts TIMESTAMP(6) NOT NULL;
 
 # -----------------------------------------------------
 # Table dhcp4_audit_revision
 # -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS dhcp4_audit_revision (
     id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-    modification_ts TIMESTAMP NOT NULL,
+    modification_ts TIMESTAMP(6) NOT NULL,
     log_message TEXT,
     server_id BIGINT(10) UNSIGNED,
     PRIMARY KEY (id),