summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2016-03-11 14:57:36 +0000
committerTed Trask <ttrask01@yahoo.com>2016-03-11 14:57:36 +0000
commit79f8431289ac679652005707351c799d503f48ad (patch)
tree394ea1872ee9ca59a9ad8b14f6c0b9280af642ec
parentbcd9fe9f46f4ff727de28c19058dcab7301cb278 (diff)
downloadacf-provisioning-79f8431289ac679652005707351c799d503f48ad.tar.bz2
acf-provisioning-79f8431289ac679652005707351c799d503f48ad.tar.xz
Modify dump_database to enforce consistent order for device classes and values
-rw-r--r--provisioning-model.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/provisioning-model.lua b/provisioning-model.lua
index eac1623..57880b5 100644
--- a/provisioning-model.lua
+++ b/provisioning-model.lua
@@ -2083,12 +2083,12 @@ function mymodule.dump_database(self, db)
sql = "SELECT device_id FROM devices_to_classes GROUP BY device_id ORDER BY device_id ASC"
devices = getselectresponse(sql)
for i,d in ipairs(devices) do
- sql = "SELECT label FROM devices_to_classes JOIN provisioning_classes USING(class_id) WHERE device_id='"..provdb.escape(d.device_id).."'"
+ sql = "SELECT label FROM devices_to_classes JOIN provisioning_classes USING(class_id) WHERE device_id='"..provdb.escape(d.device_id).."' ORDER BY label ASC"
tmp = getselectresponse(sql)
for j,t in ipairs(tmp) do
lines[#lines+1] = "INSERT INTO devices_to_classes VALUES("..provdb.escape(i)..", (SELECT class_id FROM provisioning_classes WHERE label='"..provdb.escape(t.label).."'));"
end
- sql = "SELECT group_name, p.name AS param, v.value FROM provisioning_values v JOIN provisioning_params p USING(param_id) WHERE device_id='"..provdb.escape(d.device_id).."'"
+ sql = "SELECT group_name, p.name AS param, v.value FROM provisioning_values v JOIN provisioning_params p USING(param_id) WHERE device_id='"..provdb.escape(d.device_id).."' ORDER BY group_name, p.name"
tmp = getselectresponse(sql)
for j,t in ipairs(tmp) do
lines[#lines+1] = "INSERT INTO provisioning_values VALUES("..provdb.escape(i)..", "..escape_or_null(t.group_name)..", (SELECT param_id FROM provisioning_params WHERE name='"..provdb.escape(t.param).."'), "..escape_or_null(t.value)..");"