[#2299] Fixed minor review comments

modified:
    src/share/database/scripts/mysql/dhcpdb_create.mysql
    src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
    src/share/database/scripts/pgsql/dhcpdb_create.pgsql
    src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 7059f2765512edaa73d561082c7f164303a9ac80..b03bf9125dfbadf0bd01672b320118b791d5bf3d 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -4288,7 +4288,7 @@ UPDATE schema_version
 
 -- This line starts database upgrade to version 14.0.
 
--- Modify shared-network-name foreign key contraint on dhcp4_subnet to not perform
+-- Modify shared-network-name foreign key constraint on dhcp4_subnet to not perform
 -- the update when the network is deleted the cascaded update will not execute
 -- dhcp4_subnet update trigger leaving the updated subnets without audit_entries.
 ALTER TABLE dhcp4_subnet
@@ -4311,12 +4311,12 @@ CREATE TRIGGER dhcp4_shared_network_BDEL BEFORE DELETE ON dhcp4_shared_network
         CALL createAuditEntryDHCP4('dhcp4_shared_network', OLD.id, "delete");
         -- In MySQL Foreign key constraint triggered updates will not cascade, so we explicitly
         -- update subnets first which should ensure they get audit entries.
-        UPDATE dhcp4_subnet SET shared_network_name = NULL  WHERE shared_network_name = OLD.name;
+        UPDATE dhcp4_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
         DELETE FROM dhcp4_options WHERE shared_network_name = OLD.name;
     END $$
 DELIMITER ;
 
--- Modify shared-network-name foreign key contraint on dhcp6_subnet to not perform
+-- Modify shared-network-name foreign key constraint on dhcp6_subnet to not perform
 -- the update when the network is deleted the cascaded update will not execute
 -- dhcp6_subnet update trigger leaving the updated subnets without audit_entries.
 ALTER TABLE dhcp6_subnet
@@ -4339,7 +4339,7 @@ CREATE TRIGGER dhcp6_shared_network_BDEL BEFORE DELETE ON dhcp6_shared_network
         CALL createAuditEntryDHCP6('dhcp6_shared_network', OLD.id, "delete");
         -- In MySQL Foreign key constraint triggered updates will not cascade, so we explicitly
         -- update subnets first which should ensure they get audit entries.
-        UPDATE dhcp6_subnet SET shared_network_name = NULL  WHERE shared_network_name = OLD.name;
+        UPDATE dhcp6_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
         DELETE FROM dhcp6_options WHERE shared_network_name = OLD.name;
     END $$
 DELIMITER ;

diff --git a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
index 73717382e72bf0dc670d67191b3cbc4887a3d34d..6aa2438e222e74ae7ec71a0747128fa2d6a2ed16 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
@@ -54,7 +54,7 @@ fi
 mysql "$@" <<EOF
 -- This line starts database upgrade to version 14.0.
 
--- Modify shared-network-name foreign key contraint on dhcp4_subnet to not perform
+-- Modify shared-network-name foreign key constraint on dhcp4_subnet to not perform
 -- the update when the network is deleted the cascaded update will not execute
 -- dhcp4_subnet update trigger leaving the updated subnets without audit_entries.
 ALTER TABLE dhcp4_subnet
@@ -77,12 +77,12 @@ CREATE TRIGGER dhcp4_shared_network_BDEL BEFORE DELETE ON dhcp4_shared_network
         CALL createAuditEntryDHCP4('dhcp4_shared_network', OLD.id, "delete");
         -- In MySQL Foreign key constraint triggered updates will not cascade, so we explicitly
         -- update subnets first which should ensure they get audit entries.
-        UPDATE dhcp4_subnet SET shared_network_name = NULL  WHERE shared_network_name = OLD.name;
+        UPDATE dhcp4_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
         DELETE FROM dhcp4_options WHERE shared_network_name = OLD.name;
     END $$
 DELIMITER ;
 
--- Modify shared-network-name foreign key contraint on dhcp6_subnet to not perform
+-- Modify shared-network-name foreign key constraint on dhcp6_subnet to not perform
 -- the update when the network is deleted the cascaded update will not execute
 -- dhcp6_subnet update trigger leaving the updated subnets without audit_entries.
 ALTER TABLE dhcp6_subnet
@@ -105,7 +105,7 @@ CREATE TRIGGER dhcp6_shared_network_BDEL BEFORE DELETE ON dhcp6_shared_network
         CALL createAuditEntryDHCP6('dhcp6_shared_network', OLD.id, "delete");
         -- In MySQL Foreign key constraint triggered updates will not cascade, so we explicitly
         -- update subnets first which should ensure they get audit entries.
-        UPDATE dhcp6_subnet SET shared_network_name = NULL  WHERE shared_network_name = OLD.name;
+        UPDATE dhcp6_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
         DELETE FROM dhcp6_options WHERE shared_network_name = OLD.name;
     END $$
 DELIMITER ;

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 2daba58b38c95f2b4b48a1a57049fd5b3bc6c94a..7872ac7a14622a21bcbf9e39a0f01a10b8838310 100644 (file)
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -4917,7 +4917,7 @@ UPDATE schema_version
 
 -- This starts schema update to 12.0.
 
--- Modify shared-network-name foreign key contraint on dhcp4_subnet to not perform
+-- Modify shared-network-name foreign key constraint on dhcp4_subnet to not perform
 -- the update when the network is deleted the cascaded update will not execute
 -- dhcp4_subnet update trigger leaving the updated subnets without audit_entries.
 ALTER TABLE dhcp4_subnet
@@ -4936,14 +4936,14 @@ BEGIN
     -- Explicitly update subnets now rather than via foreign key constraint, this ensures the
     -- audit entries for subnets will preceded that of the shared-network, keeping the order
     -- of the entries the same as they are for MySQL.
-    UPDATE dhcp4_subnet SET shared_network_name = NULL  WHERE shared_network_name = OLD.name;
+    UPDATE dhcp4_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
     DELETE FROM dhcp4_options WHERE shared_network_name = OLD.name;
     RETURN OLD;
 END;
 $dhcp4_shared_network_BDEL$
 LANGUAGE plpgsql;
 
--- Modify shared-network-name foreign key contraint on dhcp6_subnet to not perform
+-- Modify shared-network-name foreign key constraint on dhcp6_subnet to not perform
 -- the update when the network is deleted the cascaded update will not execute
 -- dhcp6_subnet update trigger leaving the updated subnets without audit_entries.
 ALTER TABLE dhcp6_subnet
@@ -4962,7 +4962,7 @@ BEGIN
     -- Explicitly update subnets now rather than via foreign key constraint, this ensures the
     -- audit entries for subnets will preceded that of the shared-network, keeping the order
     -- of the entries the same as they are for MySQL.
-    UPDATE dhcp6_subnet SET shared_network_name = NULL  WHERE shared_network_name = OLD.name;
+    UPDATE dhcp6_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
     DELETE FROM dhcp6_options WHERE shared_network_name = OLD.name;
     RETURN OLD;
 END;

diff --git a/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in b/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
index 64583e938677e3d3a14e73d959f994ca79a32252..720983cfbb906ee7437d86f43d20c6670035cf98 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
@@ -38,7 +38,7 @@ START TRANSACTION;
 
 -- This starts schema update to 12.0.
 
--- Modify shared-network-name foreign key contraint on dhcp4_subnet to not perform
+-- Modify shared-network-name foreign key constraint on dhcp4_subnet to not perform
 -- the update when the network is deleted the cascaded update will not execute
 -- dhcp4_subnet update trigger leaving the updated subnets without audit_entries.
 ALTER TABLE dhcp4_subnet
@@ -57,14 +57,14 @@ BEGIN
     -- Explicitly update subnets now rather than via foreign key constraint, this ensures the
     -- audit entries for subnets will preceded that of the shared-network, keeping the order
     -- of the entries the same as they are for MySQL.
-    UPDATE dhcp4_subnet SET shared_network_name = NULL  WHERE shared_network_name = OLD.name;
+    UPDATE dhcp4_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
     DELETE FROM dhcp4_options WHERE shared_network_name = OLD.name;
     RETURN OLD;
 END;
 \$dhcp4_shared_network_BDEL\$
 LANGUAGE plpgsql;
 
--- Modify shared-network-name foreign key contraint on dhcp6_subnet to not perform
+-- Modify shared-network-name foreign key constraint on dhcp6_subnet to not perform
 -- the update when the network is deleted the cascaded update will not execute
 -- dhcp6_subnet update trigger leaving the updated subnets without audit_entries.
 ALTER TABLE dhcp6_subnet
@@ -83,7 +83,7 @@ BEGIN
     -- Explicitly update subnets now rather than via foreign key constraint, this ensures the
     -- audit entries for subnets will preceded that of the shared-network, keeping the order
     -- of the entries the same as they are for MySQL.
-    UPDATE dhcp6_subnet SET shared_network_name = NULL  WHERE shared_network_name = OLD.name;
+    UPDATE dhcp6_subnet SET shared_network_name = NULL WHERE shared_network_name = OLD.name;
     DELETE FROM dhcp6_options WHERE shared_network_name = OLD.name;
     RETURN OLD;
 END;