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
Commits
015246ee
Commit
015246ee
authored
6 years ago
by
jvfpw18
Browse files
Options
Downloads
Patches
Plain Diff
run_aggregations now also run denormalizations
parent
bcc8e3cc
Branches
Branches containing commit
No related tags found
2 merge requests
!13
v1.1.0
,
!7
Add denormalizations to run aggregations
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
database/database_table.py
+25
-4
25 additions, 4 deletions
database/database_table.py
with
25 additions
and
4 deletions
database/database_table.py
+
25
−
4
View file @
015246ee
...
@@ -227,6 +227,21 @@ class DatabaseTable(Table):
...
@@ -227,6 +227,21 @@ class DatabaseTable(Table):
return
query
return
query
def
create_temporary_mirror
(
self
,
year
,
bind
=
None
):
'''
Creates a new temporary table where its data mirrors the original, taken directly from the database
'''
ttable
=
self
.
get_temporary
(
year
=
year
)
ttable
.
create
(
bind
)
if
bind
is
None
:
bind
=
self
.
metadata
.
bind
original_columns
=
list
(
self
.
columns
)
query
=
ttable
.
insert
().
from_select
(
original_columns
,
select
(
original_columns
))
bind
.
execute
(
query
)
return
ttable
def
check_protocol
(
self
):
def
check_protocol
(
self
):
'''
'''
Raises MissingProtocolError if no protocol is loaded.
Raises MissingProtocolError if no protocol is loaded.
...
@@ -789,7 +804,7 @@ class DatabaseTable(Table):
...
@@ -789,7 +804,7 @@ class DatabaseTable(Table):
def
_resolv_derivative
(
self
,
original
,
year
):
def
_resolv_derivative
(
self
,
original
,
year
):
'''
'''
Populates self._derivatives with all necessary derivatives to satify original in a given
Populates self._derivatives with all necessary derivatives to sati
s
fy original in a given
year.
year.
'''
'''
if
not
hasattr
(
self
,
'
_derivatives
'
):
if
not
hasattr
(
self
,
'
_derivatives
'
):
...
@@ -855,6 +870,7 @@ class DatabaseTable(Table):
...
@@ -855,6 +870,7 @@ class DatabaseTable(Table):
query
[
derivative
[
'
dbcolumn
'
][
0
]]
=
text
(
derivative
[
'
processed
'
])
query
[
derivative
[
'
dbcolumn
'
][
0
]]
=
text
(
derivative
[
'
processed
'
])
query
=
update
(
ttable
).
values
(
**
query
)
query
=
update
(
ttable
).
values
(
**
query
)
print
(
query
)
bind
.
execute
(
query
)
bind
.
execute
(
query
)
return
self
.
_derivatives
return
self
.
_derivatives
...
@@ -882,11 +898,11 @@ class DatabaseTable(Table):
...
@@ -882,11 +898,11 @@ class DatabaseTable(Table):
selecter
=
select
([
getattr
(
func
,
aggregation
)(
source_column
)])
selecter
=
select
([
getattr
(
func
,
aggregation
)(
source_column
)])
try
:
try
:
fk_
dict
=
[(
fk_column
,
fkey
)
for
fk_column
,
fkey
in
referred_table
.
get_relations
(
self
)]
fk_
tuples
=
[(
fk_column
,
fkey
)
for
fk_column
,
fkey
in
referred_table
.
get_relations
(
self
)]
except
MissingForeignKeyError
:
except
MissingForeignKeyError
:
fk_
dict
=
[(
fk_column
,
fkey
)
for
fk_column
,
fkey
in
self
.
get_relations
(
referred_table
)]
fk_
tuples
=
[(
fk_column
,
fkey
)
for
fk_column
,
fkey
in
self
.
get_relations
(
referred_table
)]
for
fk_column
,
fkey
in
fk_
dict
:
for
fk_column
,
fkey
in
fk_
tuples
:
selecter
=
selecter
.
where
(
fk_column
==
fkey
)
selecter
=
selecter
.
where
(
fk_column
==
fkey
)
if
year
:
if
year
:
selecter
=
selecter
.
where
(
self
.
c
.
ano_censo
==
year
)
selecter
=
selecter
.
where
(
self
.
c
.
ano_censo
==
year
)
...
@@ -916,6 +932,11 @@ class DatabaseTable(Table):
...
@@ -916,6 +932,11 @@ class DatabaseTable(Table):
query
=
self
.
_aggregate
(
column
,
func
,
source_column
,
year
)
query
=
self
.
_aggregate
(
column
,
func
,
source_column
,
year
)
bind
.
execute
(
query
)
bind
.
execute
(
query
)
# Run derivatives
ttable
=
self
.
create_temporary_mirror
(
year
,
bind
)
self
.
apply_derivatives
(
ttable
,
ttable
.
columns
.
keys
(),
year
,
bind
)
self
.
update_from_temporary
(
ttable
,
ttable
.
columns
.
keys
(),
bind
)
def
get_relations
(
self
,
table
):
def
get_relations
(
self
,
table
):
'''
'''
Yields relations between two tables in format
Yields relations between two tables in format
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment