SL::DBUpgrade bug fixes

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index a74e8ae..a39ef93 100644 (file)
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -163,7 +163,6 @@ sub process_query {
         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];
@@ -176,10 +175,10 @@ sub process_query {
         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
+        } elsif ($char eq '$'                                            # start of dollar quoting
+             && ($tag_end  = index($_, '$', $i + 1)) > -1                # ends on same line
+             && (do { $tag = 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 ";") {