From 388077f3163fc16f2aff3191bc60dd9628285d42 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Wed, 29 Jan 2020 12:50:43 +0100
Subject: [PATCH 2/2] feeder: add prefix to join's names of fields (#39373)

---
 tests/olap.model   | 16 ++++++++--------
 wcs_olap/feeder.py |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/olap.model b/tests/olap.model
index da11c68..ecede14 100644
--- a/tests/olap.model
+++ b/tests/olap.model
@@ -254,13 +254,13 @@
             {
                "filter" : true,
                "join" : [
-                  "item"
+                  "join_item"
                ],
                "label" : "2nd field",
                "name" : "item",
                "type" : "integer",
-               "value" : "\"item\".id",
-               "value_label" : "\"item\".label"
+               "value" : "\"join_item\".id",
+               "value_label" : "\"join_item\".label"
             },
             {
              "filter": true,
@@ -273,13 +273,13 @@
             {
                "filter" : true,
                "join" : [
-                  "itemOpen"
+                  "join_itemOpen"
                ],
                "label" : "4rth field",
                "name" : "itemOpen",
                "type" : "integer",
-               "value" : "\"itemOpen\".id",
-               "value_label" : "\"itemOpen\".label"
+               "value" : "\"join_itemOpen\".id",
+               "value_label" : "\"join_itemOpen\".label"
             },
             {
                "filter": true,
@@ -359,14 +359,14 @@
             {
                "detail" : "id",
                "master" : "\"field_item\"",
-               "name" : "item",
+               "name" : "join_item",
                "table" : "\"formdata_demande_field_item\"",
                "kind" : "left"
             },
             {
                "detail" : "id",
                "master" : "\"field_itemOpen\"",
-               "name" : "itemOpen",
+               "name" : "join_itemOpen",
                "table" : "\"formdata_demande_field_itemOpen\"",
                "kind" : "left"
             }
diff --git a/wcs_olap/feeder.py b/wcs_olap/feeder.py
index c8bc65d..070d265 100644
--- a/wcs_olap/feeder.py
+++ b/wcs_olap/feeder.py
@@ -1001,7 +1001,7 @@ class WcsFormdefFeeder(object):
         for field in good_fields.values():
             join = None
 
-            join_name = field.varname
+            join_name = 'join_' + field.varname
             field_name = 'field_%s' % field.varname
             dimension_name = field.varname
             dimension_label = field.label.lower()
-- 
2.24.0