0001-sql-use-custom-json-encoder-for-computed-data-storag.patch

Frédéric Péters, 05 mai 2021 15:10

Voir les différences: en ligne côte à côte

Subject: [PATCH] sql: use custom json encoder for computed data storage
 (#53772)

 tests/form_pages/test_computed_field.py | 31 +++++++++++++++++++++++++
 wcs/sql.py                              |  5 ++--
 2 files changed, 34 insertions(+), 2 deletions(-)

     import datetime
     import decimal
     import pytest
     from django.utils.timezone import make_aware
-...
         assert formdata.data['1'] == {'foo': 'bar'}
     def test_computed_field_decimal_data(pub, http_requests):
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'test'
         formdef.fields = [
             fields.ComputedField(
                 id='1',
                 label='computed',
                 varname='computed',
                 value_template='{{ "123.45"|decimal }}',
                 freeze_on_initial_value=True,
             ),
             fields.CommentField(id='2', label='X{{form_var_computed}}Y', type='comment'),
+        ]
         formdef.store()
         formdef.data_class().wipe()
         resp = get_app(pub).get('/test/')
         assert 'X123.45Y' in resp.text
         resp = resp.forms[0].submit('submit')  # -> validation
         resp = resp.forms[0].submit('submit').follow()  # -> submit
         assert 'The form has been recorded' in resp.text
         assert formdef.data_class().count() == 1
         formdata = formdef.data_class().select()[0]
         # pickle storage keeps the typed data but postgresql storage has to convert
         # it to stringfor json storage, hence the casting here:
         assert decimal.Decimal(formdata.data['1']) == decimal.Decimal('123.45')
     def test_computed_field_usage_in_live_data(pub, http_requests):
         FormDef.wipe()

     import copy
     import datetime
     import io
     import json
     import re
     import time
     import unicodedata
-...
     from . import qommon
     from .publisher import UnpicklerClass
     from .qommon import _, get_cfg
     from .qommon.misc import strftime
     from .qommon.misc import JSONEncoder, strftime
     from .qommon.storage import _take, deep_bytes2str
     from .qommon.storage import parse_clause as parse_storage_clause
     from .qommon.substitution import invalidate_substitution_cache
-...
                         if value is not None:
                             # embed value in a dict, so it's never necessary to cast the
                             # value for postgresql
                             value = {'data': value, '@type': 'computed-data'}
                             value = {'data': json.loads(JSONEncoder().encode(value)), '@type': 'computed-data'}
                     elif sql_type == 'varchar':
                         assert isinstance(value, str)
                     elif sql_type == 'date':
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-sql-use-custom-json-encoder-for-computed-data-storag.patch