Don't use libpq for identifier escaping #569
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The implementation of `PQescapeIdentifier` actually does very little, especially if we can assume that the connection's client encoding is UTF-8, and that the identifier is valid UTF-8. Since I'd like to share as much code between the current PG adapter, and the new async one, we can just re-implement this function ourselves. This was also the only place that required an `Rc` on the `RawConnection`, which isn't a source of any major overhead but I'm glad to see it go. For some reason I thought that replace returned a `Cow<str>`, not `String`. I may add our own version since this function could avoid allocating the majority of the time.
killercup
approved these changes
Jan 9, 2017
There was a problem hiding this comment.
LGTM, always nice to see Rc go!
Tiny nit re: identifier stuff, feel free to ignore. FYI, regex's replace_all returns a Cow but is far too much overhead 😆
| Ok(self.push_sql(&escaped_identifier)) | ||
| self.push_sql("\""); | ||
| self.push_sql(&identifier.replace('"', "\"\"")); | ||
| self.push_sql("\""); |
There was a problem hiding this comment.
(This broke the first meme generator I tested)
There was a problem hiding this comment.
r#"""# is more characters. ;)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The implementation of
PQescapeIdentifieractually does very little,especially if we can assume that the connection's client encoding is
UTF-8, and that the identifier is valid UTF-8. Since I'd like to share
as much code between the current PG adapter, and the new async one, we
can just re-implement this function ourselves.
This was also the only place that required an
Rcon theRawConnection, which isn't a source of any major overhead but I'm gladto see it go.
For some reason I thought that replace returned a
Cow<str>, notString. I may add our own version since this function could avoidallocating the majority of the time.