From 3ef565ea82a711a5e42d90a23f7b8bec8a1d3d94 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 28 Dec 2015 04:30:01 +0000 Subject: Clean up group defaults so you can specify whether or not to override the parameter default In general, device and reg groups do not override anything and service groups override all parameters --- upgradeprovisioning | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'upgradeprovisioning') diff --git a/upgradeprovisioning b/upgradeprovisioning index da1dd66..ffaa99a 100755 --- a/upgradeprovisioning +++ b/upgradeprovisioning @@ -548,6 +548,10 @@ if [ "$version" -lt "7" ]; then psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'Internal', '2', '2')" provisioning psql -U postgres -c "INSERT INTO provisioning_options VALUES((SELECT param_id FROM provisioning_params WHERE name='algospkmode'), 'Disabled', '3', '3')" provisioning + # device and reg param groups should not override defaults with same value, other group types should + psql -U postgres -c "UPDATE param_groups_to_params SET value=null WHERE (group_id, param_id) IN (SELECT group_id, param_id FROM (provisioning_groups g JOIN param_groups_to_params g2p USING(group_id) JOIN provisioning_params p USING(param_id)) WHERE (g.name LIKE 'reg%' OR g.name LIKE 'device%') AND g2p.value=p.value)" provisioning + psql -U postgres -c "UPDATE param_groups_to_params o SET value=(SELECT value FROM provisioning_params WHERE param_id=o.param_id) WHERE (group_id, param_id) IN (SELECT group_id, param_id FROM (provisioning_groups g JOIN param_groups_to_params g2p USING(group_id) JOIN provisioning_params p USING(param_id)) WHERE g.name NOT LIKE 'reg%' AND g.name NOT LIKE 'device%' AND g2p.value IS NULL)" provisioning + # database psql -U postgres -c "UPDATE provisioning_params SET value='7' WHERE name='databaseversion'" provisioning fi -- cgit v1.2.3