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 table, column in [

     2

        ('transactions', 'tx_time'),

     3

        ('tx_entity_actions', 'tx_uuid'),

     4

        ('tx_relation_actions', 'tx_uuid')]:

     5

    repo.system_source.create_index(session, table, column)

     6

     7

commit()