Projet

Général

Profil

0001-feeder-add-prefix-to-join-s-names-of-fields-39373.patch

Serghei Mihai, 30 janvier 2020 18:51

Télécharger (3,39 ko)

Voir les différences: 

Subject: [PATCH] feeder: add prefix to join's names of fields (#39373)


 tests/olap.model   | 22 +++++++++++-----------
 wcs_olap/feeder.py |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)
tests/olap.model
247 247 
            {
248 248 
               "filter": true,
249 249 
               "label": "1st field",
250 
               "name": "string",
250 
               "name": "join_string",
251 251 
               "type": "string",
252 252 
               "value": "\"field_string\""
253 253 
            },
254 254 
            {
255 255 
               "filter" : true,
256 256 
               "join" : [
257 
                  "item"
257 
                  "join_item"
258 258 
               ],
259 259 
               "label" : "2nd field",
260 260 
               "name" : "item",
261 261 
               "type" : "integer",
262 
               "value" : "\"item\".id",
263 
               "value_label" : "\"item\".label"
262 
               "value" : "\"join_item\".id",
263 
               "value_label" : "\"join_item\".label"
264 264 
            },
265 265 
            {
266 266 
             "filter": true,
267 267 
             "label": "3rd field",
268 
             "name": "bool",
268 
             "name": "join_bool",
269 269 
             "type": "bool",
270 270 
             "value": "\"field_bool\"",
271 271 
             "value_label": "(CASE WHEN \"field_bool\" IS NULL THEN NULL WHEN \"field_bool\" THEN 'Oui' ELSE 'Non' END)"
......
273 273 
            {
274 274 
               "filter" : true,
275 275 
               "join" : [
276 
                  "itemOpen"
276 
                  "join_itemOpen"
277 277 
               ],
278 278 
               "label" : "4rth field",
279 279 
               "name" : "itemOpen",
280 280 
               "type" : "integer",
281 
               "value" : "\"itemOpen\".id",
282 
               "value_label" : "\"itemOpen\".label"
281 
               "value" : "\"join_itemOpen\".id",
282 
               "value_label" : "\"join_itemOpen\".label"
283 283 
            },
284 284 
            {
285 285 
               "filter": true,
286 286 
               "label": "5th field",
287 
               "name": "stringCaseSensitive-é",
287 
               "name": "join_stringCaseSensitive-é",
288 288 
               "type": "string",
289 289 
               "value": "\"field_stringCaseSensitive-é\""
290 290 
            }
......
359 359 
            {
360 360 
               "detail" : "id",
361 361 
               "master" : "\"field_item\"",
362 
               "name" : "item",
362 
               "name" : "join_item",
363 363 
               "table" : "\"formdata_demande_field_item\"",
364 364 
               "kind" : "left"
365 365 
            },
366 366 
            {
367 367 
               "detail" : "id",
368 368 
               "master" : "\"field_itemOpen\"",
369 
               "name" : "itemOpen",
369 
               "name" : "join_itemOpen",
370 370 
               "table" : "\"formdata_demande_field_itemOpen\"",
371 371 
               "kind" : "left"
372 372 
            }
wcs_olap/feeder.py
1000 1000 
        for field in good_fields.values():
1001 1001 
            join = None
1002 1002 

  		




  1003
  
  
    
            join_name = field.varname

  		




  
  1003
  
    
            join_name = 'join_' + field.varname

  		




  1004
  1004
  
    
            field_name = 'field_%s' % field.varname

  		




  1005
  1005
  
    
            dimension_name = field.varname

  		




  1006
  1006
  
    
            dimension_label = field.label.lower()

  		




  1007
  
  
    
-