entrouvert
/
wcs-olap
16
0
Fork 0
Code Issues Pull Requests Releases Activity

import non anonymized string columns (fixes #29203)

This commit is contained in:
Benjamin Dauvergne 2019-01-18 00:21:52 +01:00
parent 99370bdc98
commit 82993d5dd3
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/olap.model
View File

@ -239,6 +239,13 @@
"value" : "\"function__receiver\".id",
"value_label" : "\"function__receiver\".label"
},
{
"filter": true,
"label": "1st field",
"name": "field_string",
"type": "string",
"value": "\"field_string\""
},
{
"filter" : true,
"join" : [

1
tests/test_wcs.py
View File

@ -66,6 +66,7 @@ schema = olap
('formdata_demande', 'geolocation_base'),
('formdata_demande', 'json_data'),
('formdata_demande', 'status_id'),
('formdata_demande', 'field_field_string'),
('formdata_demande', 'field_field_item'),
('formdata_demande', 'field_field_bool'),
('formdata_demande', 'function__receiver'),

12
wcs_olap/feeder.py
View File

@ -564,6 +564,8 @@ class WcsFormdefFeeder(object):
field_def = 'smallint REFERENCES %s (id)' % table_name
elif field.type == 'bool':
field_def = 'boolean'
elif field.type == 'string':
field_def = 'varchar'
else:
continue
self.fields.append(field)
@ -701,7 +703,7 @@ class WcsFormdefFeeder(object):
v = self.items_mappings[field.varname].get(raw)
else:
v = raw and self.get_item_id(field, raw)
elif field.type == 'bool':
elif field.type in ('string', 'bool'):
v = raw
# unstructured storage of field values
@ -895,6 +897,14 @@ class WcsFormdefFeeder(object):
'value_label': '(case when "%s" IS NOT NULL then \'Oui\' else \'Non\' end)' % field.varname,
'filter': True,
}
elif field.type == 'string':
dimension = {
'name': field.varname,
'label': field.label.lower(),
'type': 'string',
'value': '"%s"' % field.varname,
'filter': True,
}
else:
continue
if join: