eyalleshem commented on code in PR #2075:
URL:
https://github.com/apache/datafusion-sqlparser-rs/pull/2075#discussion_r2577742775
##########
src/tokenizer.rs:
##########
@@ -2304,7 +2386,69 @@ fn peeking_next_take_while(
}
fn unescape_single_quoted_string(chars: &mut State<'_>) -> Option<String> {
- Unescape::new(chars).unescape()
+ borrow_or_unescape_single_quoted_string(chars, true).map(|cow|
cow.into_owned())
+}
+
+/// Scans a single-quoted string and returns either a borrowed slice or an
unescaped owned string.
+///
+/// Strategy: Scan once to find the end and detect escape sequences.
+/// - If no escapes exist (or unescape=false), return Cow::Borrowed
+/// - If escapes exist and unescape=true, reprocess using existing Unescape
logic
+fn borrow_or_unescape_single_quoted_string<'a>(
+ chars: &mut State<'a>,
+ unescape: bool,
+) -> Option<Cow<'a, str>> {
+ let content_start = chars.byte_pos;
+ chars.next(); // consume opening '
+
+ // Scan to find end and check for escape sequences
+ let mut has_escapes = false;
+
+ loop {
+ match chars.next() {
+ Some('\'') => {
+ // Check for doubled single quote (escape)
+ if chars.peek() == Some(&'\'') {
+ has_escapes = true;
+ chars.next(); // consume the second '
+ } else {
+ // End of string found (including closing ')
+ let content_end = chars.byte_pos;
+ let full_content =
&chars.source[content_start..content_end];
+
+ // If no unescaping needed, return borrowed (without
quotes)
+ if !unescape || !has_escapes {
+ // Strip opening and closing quotes
+ return
Some(Cow::Borrowed(&full_content[1..full_content.len() - 1]));
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
