X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FUtils.pm;h=980a6228312644658921ae767d1f22c242e8dde5;hb=ea93df61568d8fa52a9764a09c4351928ff9374d;hp=693050645a634dd409e34aad340b237f560428b6;hpb=7b4b17aaedbb1c9395bf201e42fe16cd04d67401;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Utils.pm b/lib/SQL/Translator/Utils.pm index 6930506..980a622 100644 --- a/lib/SQL/Translator/Utils.pm +++ b/lib/SQL/Translator/Utils.pm @@ -135,7 +135,7 @@ sub parse_list_arg { # This processes string-like arguments. # else { - return [ + return [ map { s/^\s+|\s+$//g; $_ } map { split /,/ } grep { defined && length } @$list @@ -187,17 +187,17 @@ sub parse_mysql_version { my @vers; - # X.Y.Z style + # X.Y.Z style if ( $v =~ / ^ (\d+) \. (\d{1,3}) (?: \. (\d{1,3}) )? $ /x ) { push @vers, $1, $2, $3; } - # XYYZZ (mysql) style + # XYYZZ (mysql) style elsif ( $v =~ / ^ (\d) (\d{2}) (\d{2}) $ /x ) { push @vers, $1, $2, $3; } - # XX.YYYZZZ (perl) style or simply X + # XX.YYYZZZ (perl) style or simply X elsif ( $v =~ / ^ (\d+) (?: \. (\d{3}) (\d{3}) )? $ /x ) { push @vers, $1, $2, $3; } @@ -233,12 +233,12 @@ sub parse_dbms_version { my @vers; - # X.Y.Z style + # X.Y.Z style if ( $v =~ / ^ (\d+) \. (\d{1,3}) (?: \. (\d{1,3}) )? $ /x ) { push @vers, $1, $2, $3; } - # XX.YYYZZZ (perl) style or simply X + # XX.YYYZZZ (perl) style or simply X elsif ( $v =~ / ^ (\d+) (?: \. (\d{3}) (\d{3}) )? $ /x ) { push @vers, $1, $2, $3; } @@ -251,7 +251,7 @@ sub parse_dbms_version { return sprintf ('%d.%03d%03d', map { $_ || 0 } (@vers) ); } elsif ($target eq 'native') { - return join '.' => map 0+$_, grep defined, @vers; + return join '.' => grep defined, @vers; } else { #how do I croak sanely here? @@ -390,7 +390,7 @@ C. =head2 parse_mysql_version -Used by both L and +Used by both L and L in order to provide a consistent format for both C<< parser_args->{mysql_parser_version} >> and C<< producer_args->{mysql_version} >> respectively. Takes any of the following