Support Cassandra String based partition keys

Fix for #1518 and #1591
This would be easier to read if `format()` was used for the entire query rather than mixing with concatenation.