From 63dc0183a304c20fa9dd9f8f653b354df47cff7c Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Thu, 7 Feb 2019 23:30:18 +0100
Subject: [PATCH] feeder: prepend field_ to column name for string and bool
 fields (fixes #30475)

---
 tests/conftest.py  |  6 +++---
 tests/olap.model   | 18 +++++++++---------
 tests/test_wcs.py  | 10 +++++-----
 wcs_olap/feeder.py |  6 +++---
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 1bfdd00..20431cc 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -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()
 
diff --git a/tests/olap.model b/tests/olap.model
index 4620bb5..126ba8c 100644
--- a/tests/olap.model
+++ b/tests/olap.model
@@ -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",
diff --git a/tests/test_wcs.py b/tests/test_wcs.py
index 93e1acc..d9d2109 100644
--- a/tests/test_wcs.py
+++ b/tests/test_wcs.py
@@ -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'),
diff --git a/wcs_olap/feeder.py b/wcs_olap/feeder.py
index 809e645..90850d0 100644
--- a/wcs_olap/feeder.py
+++ b/wcs_olap/feeder.py
@@ -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:
-- 
2.20.1