From 43b50f8a8cfd58b9686ac741dd60900261861def Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Wed, 17 May 2017 09:38:19 -0300 Subject: [PATCH] PT-126 Fix remove comments regex --- bin/pt-online-schema-change | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change index 93c913dc..ccd4e7cb 100755 --- a/bin/pt-online-schema-change +++ b/bin/pt-online-schema-change @@ -10053,9 +10053,13 @@ sub find_renamed_cols { /x; my $table_ident = qr/$unquoted_ident|`$quoted_ident`|"$ansi_quotes_ident"/; - my $alter_change_col_re = qr/\bCHANGE \s+ (?:COLUMN \s+)? (?:COMMENT\s+[^\]['].*?[^\]['])? - (?:COMMENT\s+[^\]["].*?[^\]["])? - ($table_ident) \s+ ($table_ident)/ix; + + # remove comments + $alter =~ s/^(.*?)\s+COMMENT\s+'(.*?[^\\]')+(.*)/$1$3/; + $alter =~ s/^(.*?)\s+COMMENT\s+"(.*?[^\\]")+(.*)/$1$3/; + + my $alter_change_col_re = qr/\bCHANGE \s+ (?:COLUMN \s+)? + ($table_ident) \s+ ($table_ident)/ix; my %renames; while ( $alter =~ /$alter_change_col_re/g ) {