Updated to use PartialSqlString instead of String

I also updated the tests to cover the scenario where it failed for returning String instead of PartialSqlString