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

feeder: prepend field_ to column name for string and bool fields (fixes #30475)

This commit is contained in:
Benjamin Dauvergne 2019-02-07 23:30:18 +01:00
parent deb2cc3e9c
commit 63dc0183a3
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/conftest.py
View File

@ -88,10 +88,10 @@ formdef = FormDef()
formdef.name = 'Demande'
formdef.category_id = cat.id
formdef.fields = [
fields.StringField(id='1', label='1st field', type='string', anonymise=False, varname='field_string'),
fields.StringField(id='1', label='1st field', type='string', anonymise=False, varname='string'),
fields.ItemField(id='2', label='2nd field', type='item',
items=['foo', 'bar', 'baz'], varname='field_item'),
fields.BoolField(id='3', label='3rd field', type='bool', varname='field_bool'),
items=['foo', 'bar', 'baz'], varname='item'),
fields.BoolField(id='3', label='3rd field', type='bool', varname='bool'),
]
formdef.store()

18
tests/olap.model
View File

@ -242,25 +242,25 @@
{
"filter": true,
"label": "1st field",
"name": "field_string",
"name": "string",
"type": "string",
"value": "\"field_string\""
},
{
"filter" : true,
"join" : [
"field_item"
"item"
],
"label" : "2nd field",
"name" : "field_item",
"name" : "item",
"type" : "integer",
"value" : "\"field_item\".id",
"value_label" : "\"field_item\".label"
"value" : "\"item\".id",
"value_label" : "\"item\".label"
},
{
"filter": true,
"label": "3rd field",
"name": "field_bool",
"name": "bool",
"type": "bool",
"value": "\"field_bool\"",
"value_label": "(case when \"field_bool\" IS NOT NULL then 'Oui' else 'Non' end)"
@ -326,9 +326,9 @@
},
{
"detail" : "id",
"master" : "field_field_item",
"name" : "field_item",
"table" : "formdata_demande_field_field_item"
"master" : "field_item",
"name" : "item",
"table" : "formdata_demande_field_item"
}
],
"key" : "id",

10
tests/test_wcs.py
View File

@ -52,12 +52,12 @@ def test_wcs_fixture(wcs, postgres_db, tmpdir, olap_cmd, caplog):
('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', 'field_string'),
('formdata_demande', 'field_item'),
('formdata_demande', 'field_bool'),
('formdata_demande', 'function__receiver'),
('formdata_demande_field_field_item', 'id'),
('formdata_demande_field_field_item', 'label'),
('formdata_demande_field_item', 'id'),
('formdata_demande_field_item', 'label'),
('formdef', 'id'),
('formdef', 'category_id'),
('formdef', 'label'),

6
wcs_olap/feeder.py
View File

@ -901,8 +901,8 @@ class WcsFormdefFeeder(object):
'name': field.varname,
'label': field.label.lower(),
'type': 'bool',
'value': '"%s"' % field.varname,
'value_label': '(case when "%s" IS NOT NULL then \'Oui\' else \'Non\' end)' % field.varname,
'value': '"field_%s"' % field.varname,
'value_label': '(case when "field_%s" IS NOT NULL then \'Oui\' else \'Non\' end)' % field.varname,
'filter': True,
}
elif field.type == 'string':
@ -910,7 +910,7 @@ class WcsFormdefFeeder(object):
'name': field.varname,
'label': field.label.lower(),
'type': 'string',
'value': '"%s"' % field.varname,
'value': '"field_%s"' % field.varname,
'filter': True,
}
else: