jdbc: do not add varchar-to-varchar casts
Improve previous commit; hsqldb doesn't like CHARACTER SET as part of a VARCHAR type.