From aa4d04469e36a4e57c21d0202a6a51d0745ea08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Frans=20Pondaco=20Winandy?=
<jvfpw18@inf.ufpr.br>
Date: Wed, 26 Jun 2019 08:39:21 -0300
Subject: [PATCH] Add year_column to settings
---
database/database_table.py | 4 ++--
settings.py | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/database/database_table.py b/database/database_table.py
index 99b0f91..73cd16a 100644
--- a/database/database_table.py
+++ b/database/database_table.py
@@ -836,7 +836,7 @@ class DatabaseTable(Table):
fk_column = ttable.columns.get(fk_column.name)
query = query.where(fk_column == fkey)
if year:
- query = query.where(ttable.c.ano_censo == year)
+ query = query.where(ttable.columns.get(settings.YEAR_COLUMN) == year)
yield query
def apply_derivatives(self, ttable, columns, year, bind=None, dbonly=False):
@@ -908,7 +908,7 @@ class DatabaseTable(Table):
for fk_column, fkey in fk_tuples:
selecter = selecter.where(fk_column == fkey)
if year:
- selecter = selecter.where(self.c.ano_censo == year)
+ selecter = selecter.where(self.columns.get(settings.YEAR_COLUMN) == year)
query = update(self).values(**{column.name: selecter})
diff --git a/settings.py b/settings.py
index 1166eb2..c18a6bd 100644
--- a/settings.py
+++ b/settings.py
@@ -35,6 +35,9 @@ DATABASE_HOST = 'localhost'
# Database to connect to
DATABASE = 'hotmapper_demo'
+# Column used to run aggregations and denormalizations
+YEAR_COLUMN = 'ano_censo'
+
# URI structure. Standards to login:password model, but can be changed as needed.
DATABASE_URI = '{}://{}:{}@{}/{}'.format(DATABASE_DIALECT, DATABASE_USER,
DATABASE_USER_PASSWORD, DATABASE_HOST, DATABASE)
--
GitLab