[#2959] use 0 and 1 instead of false and true

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 2c4a43ccbc30647480646361fd043e6747af4705..153ba099d3f37579f2e77663781dd35f472b498f 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -5820,19 +5820,19 @@ UPDATE schema_version
 SET @disable_audit = 1;
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 -- Add a constraint on lease6_relay_id that any lease_addr must map to
 -- a lease6 address.
@@ -5883,17 +5883,17 @@ DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.qualifying-suffix';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-set';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-replacement';
 
-UPDATE dhcp4_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
-
-UPDATE dhcp6_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+UPDATE dhcp4_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+
+UPDATE dhcp6_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
 
 SET @disable_audit = 0;
 

diff --git a/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in b/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
index 52bd0eccbb8aeb3ba777dc86d11da35355bbb1fa..49fb4534dbafee8cf481cf758f02c42104d52565 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
@@ -60,19 +60,19 @@ mysql "$@" <<EOF
 SET @disable_audit = 1;
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 -- Add a constraint on lease6_relay_id that any lease_addr must map to
 -- a lease6 address.

diff --git a/src/share/database/scripts/mysql/upgrade_021_to_022.sh.in b/src/share/database/scripts/mysql/upgrade_021_to_022.sh.in
index a986c0e5741f408876c77766607b3ff5f1f68b0f..6b488d40a018811749adb6174afbc7fd48c13731 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_021_to_022.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_021_to_022.sh.in
@@ -78,17 +78,17 @@ DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.qualifying-suffix';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-set';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-replacement';
 
-UPDATE dhcp4_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
-
-UPDATE dhcp6_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+UPDATE dhcp4_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+
+UPDATE dhcp6_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
 
 SET @disable_audit = 0;
 

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 19567e3a2bfaa93df3adc54a952046d9e9e4ec77..79fee4f5a50d7a1b3ebf192306545f9684c62f91 100644 (file)
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -6270,19 +6270,19 @@ UPDATE schema_version
 SELECT set_config('kea.disable_audit', 'true', false);
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 -- Clear lease6_relay_id table.
 DELETE FROM lease6_relay_id;
@@ -6357,17 +6357,17 @@ DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.qualifying-suffix';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-set';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-replacement';
 
-UPDATE dhcp4_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
-
-UPDATE dhcp6_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+UPDATE dhcp4_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+
+UPDATE dhcp6_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
 
 SELECT set_config('kea.disable_audit', 'false', false);
 

diff --git a/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in b/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
index b4983416a26b873d84ee48ab602ebb14118d189c..ff150f5552daac892466ea24ce2a09379311c6f8 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
@@ -43,19 +43,19 @@ START TRANSACTION;
 SELECT set_config('kea.disable_audit', 'true', false);
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 -- Clear lease6_relay_id table.
 DELETE FROM lease6_relay_id;

diff --git a/src/share/database/scripts/pgsql/upgrade_021_to_022.sh.in b/src/share/database/scripts/pgsql/upgrade_021_to_022.sh.in
index 76d6f7a10779dc99fefe83e25fc823ed3f9e2695..6d61a0081a7fd1736b6aac372a2f266d7aeefe76 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_021_to_022.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_021_to_022.sh.in
@@ -57,17 +57,17 @@ DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.qualifying-suffix';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-set';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-replacement';
 
-UPDATE dhcp4_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
-
-UPDATE dhcp6_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+UPDATE dhcp4_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+
+UPDATE dhcp6_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
 
 SELECT set_config('kea.disable_audit', 'false', false);