From da77aa6295d0e36a3af4142c96f496641b459df6 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Fri, 25 Dec 2015 17:08:42 +0000 Subject: Fix checkgroupdefaultoverride bug in sql returning false positive --- provisioning-model.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'provisioning-model.lua') diff --git a/provisioning-model.lua b/provisioning-model.lua index 8388210..5c8312e 100644 --- a/provisioning-model.lua +++ b/provisioning-model.lua @@ -306,8 +306,8 @@ end local checkgroupdefaultoverride = function(device_id) sql = "SELECT p.param_id ".. - "FROM (devices_to_classes d2t JOIN provisioning_classes t USING(class_id) JOIN classes_to_param_groups t2g USING (class_id) JOIN provisioning_groups g USING(group_id) ".. - "JOIN param_groups_to_params g2p USING(group_id) JOIN provisioning_params p USING(param_id) JOIN provisioning_values v USING(param_id))".. + "FROM (devices_to_classes d2t JOIN provisioning_classes t USING(class_id) JOIN classes_to_param_groups t2g USING(class_id) JOIN provisioning_groups g USING(group_id) ".. + "JOIN param_groups_to_params g2p USING(group_id) JOIN provisioning_params p USING(param_id) JOIN provisioning_values v ON(d2t.device_id=v.device_id AND p.param_id=v.param_id AND g.name=v.group_name))".. "WHERE d2t.device_id='"..provdb.escape(device_id).."' AND v.value IS NOT NULL AND g2p.value IS NOT NULL AND v.value!=g2p.value" local tmp = getselectresponse(sql) return (#tmp ~= 0) -- cgit v1.2.3