From 031f29d9719262fe837bec83c5b008b3c2d62d9b Mon Sep 17 00:00:00 2001
From: "Henrique V. Ehrenfried" <hvehrenfried@inf.ufpr.br>
Date: Tue, 17 Dec 2019 10:59:12 -0300
Subject: [PATCH] Upgrade groups
---
database/groups.py | 17 ++++++++++++++---
mapping-protocols | 2 +-
sql-scripts | 2 +-
table-definitions | 2 +-
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/database/groups.py b/database/groups.py
index 98e2580..9ee7fa6 100644
--- a/database/groups.py
+++ b/database/groups.py
@@ -40,7 +40,10 @@ PROUNI = [
'prouni.sql'
]
PNAD = [
- 'pnad.sql'
+ 'pnad.sql',
+ 'jvt_viva_educacao.sql',
+ 'jvt_viva_trabalho.sql'
+
]
CADUNICO = [
'eixo2.sql',
@@ -48,14 +51,22 @@ CADUNICO = [
'eixo4.sql',
'african_sustentability.sql',
'african_rights.sql',
- 'african_culture.sql'
+ 'african_culture.sql',
+ 'ciganos_culture.sql',
+ 'ciganos_rights.sql',
+ 'ciganos_sustentability.sql'
]
FIES = [
'courseFIES.sql',
'fies.sql',
'institutionFIES.sql'
]
-ALL_GROUPS_SMPPIR = INEP + PROUNI + PNAD + CADUNICO + FIES
+
+SIM = [
+ 'homicidios.sql'
+]
+
+ALL_GROUPS_SMPPIR = INEP + PROUNI + PNAD + CADUNICO + FIES + SIM
# ---------------------------------------------------------------------------------------#
# ---------------------------------------------------------------------------------------#
diff --git a/mapping-protocols b/mapping-protocols
index 0014f23..df45e2c 160000
--- a/mapping-protocols
+++ b/mapping-protocols
@@ -1 +1 @@
-Subproject commit 0014f2394e674fa5c6e461bbc2b98e8f78c3b923
+Subproject commit df45e2cd58b506c0467a83abd909f8a251bdbaa5
diff --git a/sql-scripts b/sql-scripts
index 87666dc..1970abd 160000
--- a/sql-scripts
+++ b/sql-scripts
@@ -1 +1 @@
-Subproject commit 87666dc7f49b358daf0fc81c751ee36e46bc81f0
+Subproject commit 1970abd8c07ff01fe61f75007655e2e11288808f
diff --git a/table-definitions b/table-definitions
index cdea443..d5ede23 160000
--- a/table-definitions
+++ b/table-definitions
@@ -1 +1 @@
-Subproject commit cdea443e34bf09df2223aebe3090c6920442a38a
+Subproject commit d5ede23aeb80f65dc6caf596101226c7c8f300b9
--
GitLab