From bbc5caeface43f1c80c86611079c849a070d0eba Mon Sep 17 00:00:00 2001 From: Marcelo Lacerda <msl09@c3sl.ufpr.br> Date: Mon, 4 Mar 2013 10:45:36 -0300 Subject: [PATCH] Fixed regression where invalid entries where inserted in the inventory Signed-off-by: Marcelo Lacerda <msl09@c3sl.ufpr.br> --- database/load/002-dim_inventory.sql | 3 ++- database/load/003-fact_contact.sql | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/database/load/002-dim_inventory.sql b/database/load/002-dim_inventory.sql index 5a79a81..a6b62d4 100644 --- a/database/load/002-dim_inventory.sql +++ b/database/load/002-dim_inventory.sql @@ -35,7 +35,8 @@ BEGIN s.disk2_model = d.disk2_model AND s.disk2_size >= d.disk2_size * 0.9 AND s.disk2_size <= d.disk2_size * 1.1 AND - s.disk2_used = d.disk2_used) LOOP + s.disk2_used = d.disk2_used) + WHERE valid = '1' LOOP -- IF .... THEN diff --git a/database/load/003-fact_contact.sql b/database/load/003-fact_contact.sql index c9cb914..8fc9236 100644 --- a/database/load/003-fact_contact.sql +++ b/database/load/003-fact_contact.sql @@ -16,7 +16,7 @@ BEGIN -- INSERT INTO fact_contact (sch_id, cit_id, dat_id, macaddr) - (SELECT sch_id, cit_id, contact_date, macaddr::macaddr FROM sa_inventory) + (SELECT sch_id, cit_id, contact_date, macaddr::macaddr FROM sa_inventory WHERE valid = '1') EXCEPT (SELECT sch_id, cit_id, dat_id, macaddr FROM fact_contact WHERE dat_id >= result.min_date AND dat_id <= result.max_date); -- GitLab