From a1922c35fc61087bee025b786651b9eca2a6f635 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes de Oliveira <lfo14@inf.ufpr.br> Date: Tue, 29 Aug 2017 08:40:37 -0300 Subject: [PATCH] Issue #42: Remove references to databases Signed-off-by: Lucas Fernandes de Oliveira <lfo14@inf.ufpr.br> --- .gitignore | 1 + database/views/city.sql | 9 ------ database/views/fnu.sql | 15 ---------- database/views/inv.sql | 9 ------ database/views/inv_changes.sql | 51 ---------------------------------- database/views/point.sql | 31 --------------------- 6 files changed, 1 insertion(+), 115 deletions(-) delete mode 100644 database/views/city.sql delete mode 100644 database/views/fnu.sql delete mode 100644 database/views/inv.sql delete mode 100644 database/views/inv_changes.sql delete mode 100644 database/views/point.sql diff --git a/.gitignore b/.gitignore index b79ad712..832572ed 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /typings /build /dist +/database/views diff --git a/database/views/city.sql b/database/views/city.sql deleted file mode 100644 index 49fcd393..00000000 --- a/database/views/city.sql +++ /dev/null @@ -1,9 +0,0 @@ -SELECT - id AS "dim:city" - , name AS "dim:city_name" - , region AS "dim:region" - , state AS "dim:state" - , id AS "met:count:city" -FROM - city -; diff --git a/database/views/fnu.sql b/database/views/fnu.sql deleted file mode 100644 index 1e593f2d..00000000 --- a/database/views/fnu.sql +++ /dev/null @@ -1,15 +0,0 @@ -SELECT - contact_date AS "dim:contactDate" - , id_point AS "dim:point" - , macaddr AS "dim:macAddr" - , down_bytes AS "met:avg:download" - , up_bytes AS "met:avg:upload" - , '1'::INTEGER AS "met:count:countact" - , contact_date AS "met:max:contact" - , down_bytes AS "met:max:upload" - , up_bytes AS "met:max:download" - , down_bytes AS "met:sum:download" - , up_bytes AS "met:sum:upload" -FROM - fact_net_usage -; diff --git a/database/views/inv.sql b/database/views/inv.sql deleted file mode 100644 index d97985e5..00000000 --- a/database/views/inv.sql +++ /dev/null @@ -1,9 +0,0 @@ -SELECT - is_current AS "dim:currentInventory" - , load_date AS "dim:inventoryDate" - , id_point AS "dim:point" -FROM - dim_inventory -WHERE - is_current = '1' -; diff --git a/database/views/inv_changes.sql b/database/views/inv_changes.sql deleted file mode 100644 index 9b03c54b..00000000 --- a/database/views/inv_changes.sql +++ /dev/null @@ -1,51 +0,0 @@ -SELECT - d.new_hd_size AS "dim:disk" - , d.new_date AS "dim:inventoryDate" - , d.machine AS "dim:macAddr" - , d.new_memory_size AS "dim:memory" - , d.old_hd_size AS "dim:oldDisk" - , d.old_date AS "dim:oldInventoryDate" - , d.old_memory_size AS"dim:oldMemory" - , d.os_distro AS "dim:os" - , d.id_point AS "dim:point" - , d.processor AS "dim:processor" - , '1'::INTEGER AS "met:count:machines" - , d.hd_alert AS "met:modifiedDisk" - , d.memory_alert AS "met:modifiedMemory" -FROM - ( - SELECT - pt.id AS id_point - , c.id AS id_city - , c.region AS region - , c.state AS state - , initcap(c.name) AS city - , initcap(a.establishment) AS telecenter - , i1.macaddr AS machine - , i1.load_date AS old_date - , i2.load_date AS new_date - , i1.os_distro AS os_distro - , i1.processor AS processor - , simplify_memory(i1.memory) AS old_memory_size - , simplify_memory(i2.memory) AS new_memory_size - , simplify_hd(i1.disk1_size) AS old_hd_size - , simplify_hd(i2.disk1_size) AS new_hd_size - , alert_check_memory(i1.memory, i2.memory) AS memory_alert - , alert_check_hd(i1, i2) AS hd_alert - FROM - dim_inventory i1 - INNER JOIN dim_inventory i2 - ON i1.id_point = i2.id_point - AND i1.macaddr = i2.macaddr - AND i1.is_first = '1' - AND i2.is_current = '1' - INNER JOIN point pt ON pt.id = i1.id_point - INNER JOIN address a ON a.id_point = pt.id - INNER JOIN city c ON pt.id_city = c.id - WHERE - pt.is_telecenter = '1' - ) AS d -WHERE - d.memory_alert = 'true' - OR d.hd_alert = 'true' -; diff --git a/database/views/point.sql b/database/views/point.sql deleted file mode 100644 index a80da736..00000000 --- a/database/views/point.sql +++ /dev/null @@ -1,31 +0,0 @@ -SELECT - p.is_active AS "dim:active" - , p.id_city AS "dim:city" - , p.is_digital_city AS "dim:digitalCity" - , p.is_gesac AS "dim:gesac" - , p.id AS"dim:point" - , current_date AS "dim:pointDate" - , a.establishment AS "dim:pointName" - , CASE - WHEN (p.is_digital_city = TRUE) THEN 'DC' - WHEN (p.is_telecenter = TRUE AND p.is_gesac = FALSE) THEN 'TLBR' - WHEN (p.is_telecenter = TRUE AND p.is_gesac = TRUE) THEN 'TLBR/GESAC' - ELSE 'GESAC' - END AS"dim:project" - , p.is_telecenter AS "dim:telecenter" - , '1'::INTEGER AS "met:count:point" - , h.hired_download AS "met:avg:hiredDownload" - , h.hired_upload AS "met:avg:hiredUpload" -FROM - point p - INNER JOIN address a ON p.id = a.id_point - LEFT OUTER JOIN ( - SELECT - c.id_point - , ct.download_kbps AS hired_download - , ct.upload_kbps as hired_upload - FROM - convention c - INNER JOIN connection_type ct ON ct.id = c.id_connection_type - ) h ON p.id = h.id_point -; -- GitLab