map date to Date
Merge branch 'column_type_mapping'