Yeah, that's how we ended up dealing with it, as well. Another thing is that if you consistently bind all of your literals both going into the database as well as in your queries... you'll never have this problem (because the literals had their trailing whitespace stripped going in, so it's fine if it gets stripped when you query for it, as well).

And of course, always binding all of your literals (or at least very nearly all of them) is pretty much always the right course. (Excepting of course for some moderately rare conditions which I describe in great detail here.)