From dfc28070c0dbbe85a9e7872157811e137082e898 Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Thu, 23 May 2024 23:45:06 +0300 Subject: [PATCH] [#2959] use 0 and 1 instead of false and true --- .../scripts/mysql/dhcpdb_create.mysql | 30 +++++++++---------- .../scripts/mysql/upgrade_019_to_020.sh.in | 8 ++--- .../scripts/mysql/upgrade_021_to_022.sh.in | 22 +++++++------- .../scripts/pgsql/dhcpdb_create.pgsql | 30 +++++++++---------- .../scripts/pgsql/upgrade_018_to_019.sh.in | 8 ++--- .../scripts/pgsql/upgrade_021_to_022.sh.in | 22 +++++++------- 6 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql index 2c4a43ccbc..153ba099d3 100644 --- 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 52bd0eccbb..49fb4534db 100644 --- 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 "$@" <