Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • add_filters_localoferta_matricula
  • development
  • docente-type-2-test
  • homologa
  • issue-752-aee
  • issue-811-region
  • master
  • postgres
  • simcaq-new-tables
9 results

Target

Select target project
  • tools/sql-scripts
1 result
Select Git revision
  • add_filters_localoferta_matricula
  • development
  • docente-type-2-test
  • homologa
  • issue-752-aee
  • issue-811-region
  • master
  • postgres
  • simcaq-new-tables
9 results
Show changes
Commits on Source (3)
......@@ -28,9 +28,7 @@ SELECT
aluno_ens_superior.nome_ies,
aluno_ens_superior.cod_ies,
ies_ens_superior.nome_regiao_ies,
ies_ens_superior.sigla_uf_ies,
aluno_ens_superior.ano_censo,
ies_ens_superior.nome_regiao_ies,
ies_ens_superior.sigla_uf_ies,
COUNT(*) AS total
......
......@@ -12,7 +12,16 @@ SELECT
sim.idade_obito_anos,
sim.def_raca_cor as raca_cor
FROM
(select count(*) as obito, * from sim
(
select
count(*) as obito,
ano_obito,
"ocor_CODIGO_UF",
"ocor_SIGLA_UF",
def_raca_cor,
idade_obito_anos,
"RACACOR"
from sim
where "CIRCOBITO" = 3
group by
ano_obito,
......@@ -23,12 +32,36 @@ FROM
"RACACOR"
) as sim
INNER JOIN
(select * from
(select * , count(*) as pop_filtrada from
(
select
pnad.ano_censo,
pnad.cod_uf,
pnad.cor_raca,
pop.pop_ibge,
pop.estado_id,
pnad.pop_pnad,
pnad.pop_filtrada
from
-- população por cor raça do PNAD
(
select
pnad_cont.ano_censo,
pnad_cont.cod_uf,
pnad_cont.cor_raca,
pnd.pop_pnad,
count(*) as pop_filtrada
from
pnad_cont
inner join
(select *, count(*) as pop_pnad from pnad_cont
group by ano_censo, cod_uf
(
select
ano_censo,
cod_uf,
count(*) as pop_pnad
from pnad_cont
group by
ano_censo,
cod_uf
) as pnd
on
pnad_cont.ano_censo = pnd.ano_censo and
......@@ -41,8 +74,12 @@ INNER JOIN
) as pnad
inner join
(select *, sum(ibge_populacao.populacao) as pop_ibge
-- População por estado
(
select
ibge_populacao.estado_id,
ibge_populacao.ano_censo,
sum(ibge_populacao.populacao) as pop_ibge
from
ibge_populacao
group by
......@@ -57,6 +94,7 @@ INNER JOIN
pnad.cod_uf,
pnad.cor_raca,
pop.pop_ibge,
pop.estado_id,
pnad.pop_pnad,
pnad.pop_filtrada
) as pnad
......