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

\.svn
^build$
^dist$
\.egg-info$
^.tox$
\.pyc$
\.pyo$
\.bak$
\.old$
\~$
\#.*?\#$
\.swp$
^doc/book/en/apidoc$
\.old$
syntax: regexp
.*/data.*/database/.*\.sqlite
.*/data.*/database/.*\.config
.*/data/database/tmpdb.*
.*/data/ldapdb/.*
.*/data/uicache/
.*/data/cubes/.*/i18n/.*\.po
^doc/html/
^doc/doctrees/
^doc/book/en/devweb/js_api/
^doc/_build
^doc/js_api/
data/pgdb/
data.*/pgdb.*