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

[MESSAGES CONTROL]
disable-msg = C0301

[VARIABLES]
# Enable / disable this checker
enable-variables = yes
additional-builtins = _, display_name

[BASIC]
required-attributes=
attr-rgx = (w|[a-z_][a-z0-9_]{2,30})
variable-rgx = (w|[a-z_][a-z0-9_]{2,30})$
argument-rgx = (w|[a-z_][a-z0-9_]{2,30})$

[TYPECHECK]
generated-members=debug,info,notice,warning,error,critical,exception