remove TODO, and add extra jdbcType logic