From 0941dfe945a590ba4196eb180aa4bc8ca42a6004 Mon Sep 17 00:00:00 2001
From: Rafael S Castliho <rscastilho@inf.ufpr.br>
Date: Wed, 12 Aug 2020 11:06:23 -0300
Subject: [PATCH 1/6] add idade to homicidios
---
homicidios.sql | 1 +
1 file changed, 1 insertion(+)
diff --git a/homicidios.sql b/homicidios.sql
index 2c2313d..5b2f0f4 100644
--- a/homicidios.sql
+++ b/homicidios.sql
@@ -9,6 +9,7 @@ SELECT
cast(obito as float)*100000/((cast(pop_ibge as float)/cast(pop_pnad as float))*cast(pop_filtrada as float)) as taxa_homicidio,
sim.ano_obito as ano,
sim."ocor_SIGLA_UF" as uf,
+ sim.idade,
sim.def_raca_cor as raca_cor
FROM
(select count(*) as obito, * from sim
--
GitLab
From e624de755344a2353c3a2ec55ce68f369a807f75 Mon Sep 17 00:00:00 2001
From: Rafael S Castliho <rscastilho@inf.ufpr.br>
Date: Wed, 12 Aug 2020 11:35:50 -0300
Subject: [PATCH 2/6] fix stuff
---
homicidios.sql | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/homicidios.sql b/homicidios.sql
index 5b2f0f4..b81c43d 100644
--- a/homicidios.sql
+++ b/homicidios.sql
@@ -1,5 +1,3 @@
-CREATE table taxa_homicidios
-AS
SELECT
sim.obito,
pnad.pop_ibge,
@@ -9,7 +7,7 @@ SELECT
cast(obito as float)*100000/((cast(pop_ibge as float)/cast(pop_pnad as float))*cast(pop_filtrada as float)) as taxa_homicidio,
sim.ano_obito as ano,
sim."ocor_SIGLA_UF" as uf,
- sim.idade,
+ sim.idade_obito_anos,
sim.def_raca_cor as raca_cor
FROM
(select count(*) as obito, * from sim
@@ -19,6 +17,7 @@ FROM
"ocor_CODIGO_UF",
"ocor_SIGLA_UF",
def_raca_cor,
+ idade_obito_anos,
"RACACOR"
) as sim
INNER JOIN
@@ -68,9 +67,12 @@ group by
sim.obito, pnad.pop_filtrada,
sim."ocor_SIGLA_UF",
sim.def_raca_cor,
+ sim.idade_obito_anos,
pnad.pop_ibge,
pnad.pop_pnad
order by
sim."ocor_SIGLA_UF",
sim.ano_obito
+
+limit 100
;
--
GitLab
From 44c16b3a6f293245d6bb5a2995c638dd53678a9c Mon Sep 17 00:00:00 2001
From: Rafael S Castliho <rscastilho@inf.ufpr.br>
Date: Wed, 12 Aug 2020 11:36:58 -0300
Subject: [PATCH 3/6] fix
---
homicidios.sql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/homicidios.sql b/homicidios.sql
index b81c43d..4b40f7b 100644
--- a/homicidios.sql
+++ b/homicidios.sql
@@ -7,7 +7,7 @@ SELECT
cast(obito as float)*100000/((cast(pop_ibge as float)/cast(pop_pnad as float))*cast(pop_filtrada as float)) as taxa_homicidio,
sim.ano_obito as ano,
sim."ocor_SIGLA_UF" as uf,
- sim.idade_obito_anos,
+ sim.idade_obito_anos as idade,
sim.def_raca_cor as raca_cor
FROM
(select count(*) as obito, * from sim
@@ -67,7 +67,7 @@ group by
sim.obito, pnad.pop_filtrada,
sim."ocor_SIGLA_UF",
sim.def_raca_cor,
- sim.idade_obito_anos,
+ sim.idade,
pnad.pop_ibge,
pnad.pop_pnad
order by
--
GitLab
From dbaf7e47cd01698cff14c5cc60223208b4f025fa Mon Sep 17 00:00:00 2001
From: Rafael S Castliho <rscastilho@inf.ufpr.br>
Date: Wed, 12 Aug 2020 11:38:00 -0300
Subject: [PATCH 4/6] desfazendo fix anterior que dava problema
---
homicidios.sql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/homicidios.sql b/homicidios.sql
index 4b40f7b..b81c43d 100644
--- a/homicidios.sql
+++ b/homicidios.sql
@@ -7,7 +7,7 @@ SELECT
cast(obito as float)*100000/((cast(pop_ibge as float)/cast(pop_pnad as float))*cast(pop_filtrada as float)) as taxa_homicidio,
sim.ano_obito as ano,
sim."ocor_SIGLA_UF" as uf,
- sim.idade_obito_anos as idade,
+ sim.idade_obito_anos,
sim.def_raca_cor as raca_cor
FROM
(select count(*) as obito, * from sim
@@ -67,7 +67,7 @@ group by
sim.obito, pnad.pop_filtrada,
sim."ocor_SIGLA_UF",
sim.def_raca_cor,
- sim.idade,
+ sim.idade_obito_anos,
pnad.pop_ibge,
pnad.pop_pnad
order by
--
GitLab
From 6224f1122583cac612a918c64cbd2b79be244153 Mon Sep 17 00:00:00 2001
From: Rafael S Castliho <rscastilho@inf.ufpr.br>
Date: Wed, 12 Aug 2020 11:50:21 -0300
Subject: [PATCH 5/6] =?UTF-8?q?removido=20o=20limite=20e=20colocado=20a=20?=
=?UTF-8?q?cria=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
homicidios.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/homicidios.sql b/homicidios.sql
index b81c43d..8036509 100644
--- a/homicidios.sql
+++ b/homicidios.sql
@@ -1,3 +1,4 @@
+CREATE table taxa_homicidios
SELECT
sim.obito,
pnad.pop_ibge,
@@ -74,5 +75,4 @@ order by
sim."ocor_SIGLA_UF",
sim.ano_obito
-limit 100
;
--
GitLab
From 3fe6b16821cce9cad03aef9e53d97dc1823aba47 Mon Sep 17 00:00:00 2001
From: Rafael S Castliho <rscastilho@inf.ufpr.br>
Date: Wed, 12 Aug 2020 11:51:45 -0300
Subject: [PATCH 6/6] AS adicionado
---
homicidios.sql | 1 +
1 file changed, 1 insertion(+)
diff --git a/homicidios.sql b/homicidios.sql
index 8036509..cb2ca5e 100644
--- a/homicidios.sql
+++ b/homicidios.sql
@@ -1,4 +1,5 @@
CREATE table taxa_homicidios
+AS
SELECT
sim.obito,
pnad.pop_ibge,
--
GitLab