HCOLL-74 added support for both db date and db timestamp