From b2448c147778ca345decb911aee36f13eca610ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Mon, 17 Sep 2012 14:33:06 +0200 Subject: [PATCH] DBUpgrade kann jetzt auch dollar quoting in SQL. --- SL/DBUpgrade2.pm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm index be7c54f5b..a74e8ae82 100644 --- a/SL/DBUpgrade2.pm +++ b/SL/DBUpgrade2.pm @@ -162,13 +162,26 @@ sub process_query { if (@quote_chars) { if ($char eq $quote_chars[-1]) { pop(@quote_chars); + } elsif (length $quote_chars[-1] > 1 + && substr($quote_chars[-1], 0, 1) eq $char + && substr($_, $i, length $quote_chars[-1]) eq $quote_chars[-1]) { + $i += length $quote_chars[-1] - 1; + $char = $quote_chars[-1]; + pop(@quote_chars); } $query .= $char; } else { + my ($tag, $tag_end); if (($char eq "'") || ($char eq "\"")) { push(@quote_chars, $char); + } elsif ($char eq '$' # start of dollar quoting + && ($tag_end = index($_, '$', $i + 1)) > -1 # ends on same line + && (do { substr($_, $i + 1, $tag_end - $i - 1); 1 }) # extract tag + && $tag =~ /^ (?= [A-Za-z_] [A-Za-z0-9_]* | ) $/x) { # tag is identifier + push @quote_chars, $char = '$' . $tag . '$'; + $i = $tag_end; } elsif ($char eq ";") { # Query is complete. Send it. -- 2.20.1