Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
HOTMapper
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Harbor Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
HOTMapper
HOTMapper
Merge requests
!13
v1.1.0
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
v1.1.0
v1.1.0
into
master
Overview
1
Commits
54
Pipelines
0
Changes
2
Merged
jvfpw18
requested to merge
v1.1.0
into
master
5 years ago
Overview
1
Commits
54
Pipelines
0
Changes
2
Expand
@hvehrenfried
0
0
Merge request reports
Viewing commit
aa4d0446
Prev
Next
Show latest version
2 files
+
5
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
aa4d0446
Add year_column to settings
· aa4d0446
jvfpw18
authored
5 years ago
database/database_table.py
+
2
−
2
Options
@@ -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
.
c
olumns
.
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
.
c
olumns
.
get
(
settings
.
YEAR_COLUMN
)
==
year
)
query
=
update
(
self
).
values
(
**
{
column
.
name
:
selecter
})
Loading