From 99f19d2e1d58a6be7764d7cb4bbf1bc5e639a1dd Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 28 Nov 2019 19:54:05 +0100 Subject: [PATCH 2/2] feeder: use 'full' outer join for item fields (#38066) --- tests/olap.model | 6 ++++-- wcs_olap/feeder.py | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/olap.model b/tests/olap.model index 8d4dc1e..ca45be9 100644 --- a/tests/olap.model +++ b/tests/olap.model @@ -346,13 +346,15 @@ "detail" : "id", "master" : "\"field_item\"", "name" : "item", - "table" : "\"formdata_demande_field_item\"" + "table" : "\"formdata_demande_field_item\"", + "kind" : "full" }, { "detail" : "id", "master" : "\"field_itemOpen\"", "name" : "itemOpen", - "table" : "\"formdata_demande_field_itemOpen\"" + "table" : "\"formdata_demande_field_itemOpen\"", + "kind" : "full" } ], "key" : "id", diff --git a/wcs_olap/feeder.py b/wcs_olap/feeder.py index 9cf58a1..daa30bb 100644 --- a/wcs_olap/feeder.py +++ b/wcs_olap/feeder.py @@ -998,9 +998,8 @@ class WcsFormdefFeeder(object): 'table': quote(table_name), 'master': quote('field_%s' % field.varname), 'detail': 'id', + 'kind': 'full', } - if not field.required: - join['kind'] = 'full' dimension = { 'name': field.varname, 'label': field.label.lower(), -- 2.23.0