Unrelated to your change, but please change checks for xxx == PDataType.TIMESTAMP to (xxx == PDataType.TIMESTAMP || xxx == PDataType.UNSIGNED_TIMESTAMP) in these expressions.