fix bad-caching of datetime with tz info at sql generation time There is a special handling for datetime with tzinfo, where value was stored in the query cache. The implementation of merge_args was simply overwriting parameters of the query with those in the query cache, expecting no collision. To fix this: * handle replacement of tzinfo in merge_args, not at sql generation time * add an assertion to ensure we've actually no collision Closes #6978316

     1

for eschema in schema.entities():

     2

    if not (eschema.final or 'cw_source' in eschema.subjrels):

     3

        add_relation_definition(eschema.type, 'cw_source', 'CWSource', ask_confirm=False)

     4

     5

sql('INSERT INTO cw_source_relation(eid_from, eid_to) '

     6

    'SELECT e.eid,s.cw_eid FROM entities as e, cw_CWSource as s '

     7

    'WHERE s.cw_name=e.source AND NOT EXISTS(SELECT 1 FROM cw_source_relation WHERE eid_from=e.eid AND eid_to=s.cw_eid)')

     8

commit()