X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FMySQL.pm;h=5383f74e2deb1364c8b39313806acce6fc32d5fc;hb=ba506e52c480afe33dfec6b38a12759fad1e7fa2;hp=86027e12d64f836915328117c688bae8365135bd;hpb=07d6e5f7a00c14f44c4f2cab58bbb0a4dbe65567;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Parser/MySQL.pm b/lib/SQL/Translator/Parser/MySQL.pm index 86027e1..5383f74 100644 --- a/lib/SQL/Translator/Parser/MySQL.pm +++ b/lib/SQL/Translator/Parser/MySQL.pm @@ -1,9 +1,7 @@ package SQL::Translator::Parser::MySQL; # ------------------------------------------------------------------- -# $Id: MySQL.pm,v 1.58 2007-03-19 17:15:24 duality72 Exp $ -# ------------------------------------------------------------------- -# Copyright (C) 2002-4 SQLFairy Authors +# Copyright (C) 2002-2009 SQLFairy Authors # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -101,9 +99,12 @@ Here's the word from the MySQL site table_options: TYPE = {BDB | HEAP | ISAM | InnoDB | MERGE | MRG_MYISAM | MYISAM } + or ENGINE = {BDB | HEAP | ISAM | InnoDB | MERGE | MRG_MYISAM | MYISAM } or AUTO_INCREMENT = # or AVG_ROW_LENGTH = # + or [ DEFAULT ] CHARACTER SET charset_name or CHECKSUM = {0 | 1} + or COLLATE collation_name or COMMENT = "string" or MAX_ROWS = # or MIN_ROWS = # @@ -117,6 +118,7 @@ Here's the word from the MySQL site or DATA DIRECTORY="absolute path to directory" or INDEX DIRECTORY="absolute path to directory" + A subset of the ALTER TABLE syntax that allows addition of foreign keys: ALTER [IGNORE] TABLE tbl_name alter_specification [, alter_specification] ... @@ -130,19 +132,35 @@ A subset of INSERT that we ignore: INSERT anything +=head1 ARGUMENTS + +This parser takes a single optional parser_arg C, which +provides the desired version for the target database. Any statement in the processed +dump file, that is commented with a version higher than the one supplied, will be stripped. + +Valid version specifiers for C are listed L + +More information about the MySQL comment-syntax: L + + =cut use strict; use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ]; -$VERSION = sprintf "%d.%02d", q$Revision: 1.58 $ =~ /(\d+)\.(\d+)/; +$VERSION = '1.60'; $DEBUG = 0 unless defined $DEBUG; use Data::Dumper; use Parse::RecDescent; use Exporter; use Storable qw(dclone); +use DBI qw(:sql_types); use base qw(Exporter); +use SQL::Translator::Utils qw/parse_mysql_version/; + +our %type_mapping = (); + @EXPORT_OK = qw(parse); # Enable warnings within the Parse::RecDescent module. @@ -155,7 +173,8 @@ use constant DEFAULT_PARSER_VERSION => 30000; $GRAMMAR = << 'END_OF_GRAMMAR'; { - my ( $database_name, %tables, $table_order, @table_comments, %views, $view_order, %procedures, $proc_order ); + my ( $database_name, %tables, $table_order, @table_comments, %views, + $view_order, %procedures, $proc_order ); my $delimiter = ';'; } @@ -166,7 +185,12 @@ $GRAMMAR = << 'END_OF_GRAMMAR'; # failed. -ky # startrule : statement(s) eofile { - { tables => \%tables, database_name => $database_name, views => \%views, procedures =>\%procedures } + { + database_name => $database_name, + tables => \%tables, + views => \%views, + procedures => \%procedures, + } } eofile : /^\Z/ @@ -207,9 +231,9 @@ string : nonstring : /[^;\'"]+/ -statement_body : (string | nonstring)(s?) +statement_body : string | nonstring -insert : /insert/i statement_body "$delimiter" +insert : /insert/i statement_body(s?) "$delimiter" delimiter : /delimiter/i /[\S]+/ { $delimiter = $item[2] } @@ -292,7 +316,7 @@ create : CREATE UNIQUE(?) /(index|key)/i index_name /on/i table_name '(' field_n push @{ $tables{ $item{'table_name'} }{'indices'} }, { name => $item[4], - type => $item[2] ? 'unique' : 'normal', + type => $item[2][0] ? 'unique' : 'normal', fields => $item[8], } ; @@ -319,11 +343,12 @@ create : CREATE PROCEDURE NAME not_delimiter "$delimiter" PROCEDURE : /procedure/i | /function/i -create : CREATE algorithm /view/i NAME not_delimiter "$delimiter" +create : CREATE replace(?) algorithm(?) /view/i NAME not_delimiter "$delimiter" { @table_comments = (); - my $view_name = $item[4]; - my $sql = "$item[1] $item[2] $item[3] $item[4] $item[5]"; + my $view_name = $item[5]; + my $sql = join(q{ }, grep { defined and length } $item[1], $item[2]->[0], $item[3]->[0]) + . " $item[4] $item[5] $item[6]"; # Hack to strip database from function calls in SQL $sql =~ s#`\w+`\.(`\w+`\()##g; @@ -333,6 +358,8 @@ create : CREATE algorithm /view/i NAME not_delimiter "$delimiter" $views{ $view_name }{'sql'} = $sql; } +replace : /or replace/i + algorithm : /algorithm/i /=/ WORD { $return = "$item[1]=$item[3]"; @@ -513,6 +540,7 @@ reference_option: /restrict/i | index : normal_index | fulltext_index + | spatial_index | table_name : NAME @@ -566,19 +594,13 @@ not_null : /not/i /null/i unsigned : /unsigned/i { $return = 0 } -#default_val : /default/i /(?:')?[\s\w\d:.-]*(?:')?/ -# { -# $item[2] =~ s/'//g; -# $return = $item[2]; -# } - default_val : /default/i 'CURRENT_TIMESTAMP' { - $return = $item[2]; + $return = \$item[2]; } | - /default/i /'(?:.*?\\')*.*?'|(?:')?[\w\d:.-]*(?:')?/ + /default/i /'(?:.*?(?:\\'|''))*.*?'|(?:')?[\w\d:.-]*(?:')?/ { $item[2] =~ s/^\s*'|'\s*$//g; $return = $item[2]; @@ -639,16 +661,22 @@ unique_key_def : UNIQUE KEY(?) index_name(?) '(' name_with_opt_paren(s /,/) ')' } } -normal_index : KEY index_name(?) '(' name_with_opt_paren(s /,/) ')' +normal_index : KEY index_name_not_using(?) index_type(?) '(' name_with_opt_paren(s /,/) ')' { $return = { supertype => 'index', type => 'normal', - name => $item{'index_name(?)'}[0], - fields => $item[4], + name => $item[2][0], + fields => $item[5], + options => $item[3][0], } } +index_name_not_using : QUOTED_NAME + | /(\b(?!using)\w+\b)/ { $return = $1 } + +index_type : /using (btree|hash|rtree)/i { $return = uc $1 } + fulltext_index : /fulltext/i KEY(?) index_name(?) '(' name_with_opt_paren(s /,/) ')' { $return = { @@ -659,10 +687,20 @@ fulltext_index : /fulltext/i KEY(?) index_name(?) '(' name_with_opt_paren(s /,/) } } +spatial_index : /spatial/i KEY(?) index_name(?) '(' name_with_opt_paren(s /,/) ')' + { + $return = { + supertype => 'index', + type => 'spatial', + name => $item{'index_name(?)'}[0], + fields => $item[5], + } + } + name_with_opt_paren : NAME parens_value_list(s?) { $item[2][0] ? "$item[1]($item[2][0][0])" : $item[1] } -UNIQUE : /unique/i { 1 } +UNIQUE : /unique/i KEY : /key/i | /index/i @@ -673,15 +711,29 @@ table_option : /comment/i /=/ /'.*?'/ $comment =~ s/'$//; $return = { comment => $comment }; } - | /(default )?(charset|character set)/i /\s*=\s*/ WORD + | /(default )?(charset|character set)/i /\s*=?\s*/ WORD { $return = { 'CHARACTER SET' => $item[3] }; } - | WORD /\s*=\s*/ WORD + | /collate/i WORD + { + $return = { 'COLLATE' => $item[2] } + } + | /union/i /\s*=\s*/ '(' table_name(s /,/) ')' { + $return = { $item[1] => $item[4] }; + } + | WORD /\s*=\s*/ MAYBE_QUOTED_WORD + { $return = { $item[1] => $item[3] }; } - + +MAYBE_QUOTED_WORD: /\w+/ + | /'(\w+)'/ + { $return = $1 } + | /"(\w+)"/ + { $return = $1 } + default : /default/i ADD : /add/i @@ -700,12 +752,19 @@ DIGITS : /\d+/ COMMA : ',' -NAME : "`" /\w+/ "`" +BACKTICK : '`' + +DOUBLE_QUOTE: '"' + +QUOTED_NAME : BACKTICK /[^`]+/ BACKTICK + { $item[2] } + | DOUBLE_QUOTE /[^"]+/ DOUBLE_QUOTE { $item[2] } - | /\w+/ - { $item[1] } -VALUE : /[-+]?\.?\d+(?:[eE]\d+)?/ +NAME: QUOTED_NAME + | /\w+/ + +VALUE : /[-+]?\.?\d+(?:[eE]\d+)?/ { $item[1] } | /'.*?'/ { @@ -727,7 +786,6 @@ END_OF_GRAMMAR sub parse { my ( $translator, $data ) = @_; my $parser = Parse::RecDescent->new($GRAMMAR); - local $::RD_TRACE = $translator->trace ? 1 : undef; local $DEBUG = $translator->debug; @@ -736,9 +794,17 @@ sub parse { "instance: Bad grammer"); } - # Preprocess for MySQL-specific and not-before-version comments from mysqldump - my $parser_version = $translator->parser_args->{mysql_parser_version} || DEFAULT_PARSER_VERSION; - while ( $data =~ s#/\*!(\d{5})?(.*?)\*/#($1 && $1 > $parser_version ? '' : $2)#es ) {} + # Preprocess for MySQL-specific and not-before-version comments + # from mysqldump + my $parser_version = parse_mysql_version( + $translator->parser_args->{mysql_parser_version}, 'mysql' + ) || DEFAULT_PARSER_VERSION; + + while ( $data =~ + s#/\*!(\d{5})?(.*?)\*/#($1 && $1 > $parser_version ? '' : $2)#es + ) { + # do nothing; is there a better way to write this? -- ky + } my $result = $parser->startrule($data); return $translator->error( "Parse failed." ) unless defined $result; @@ -805,15 +871,6 @@ sub parse { ) or die $table->error; } - if ( $field->data_type =~ /(set|enum)/i && !$field->size ) { - my %extra = $field->extra; - my $longest = 0; - for my $len ( map { length } @{ $extra{'list'} || [] } ) { - $longest = $len if $len > $longest; - } - $field->size( $longest ) if $longest; - } - for my $cdata ( @{ $fdata->{'constraints'} } ) { next unless $cdata->{'type'} eq 'foreign_key'; $cdata->{'fields'} ||= [ $field->name ]; @@ -831,7 +888,23 @@ sub parse { } if ( my @options = @{ $tdata->{'table_options'} || [] } ) { - $table->options( \@options ) or die $table->error; + my @cleaned_options; + my @ignore_opts = $translator->parser_args->{'ignore_opts'} + ? split( /,/, $translator->parser_args->{'ignore_opts'} ) + : (); + if (@ignore_opts) { + my $ignores = { map { $_ => 1 } @ignore_opts }; + foreach my $option (@options) { + # make sure the option isn't in ignore list + my ($option_key) = keys %$option; + if ( !exists $ignores->{$option_key} ) { + push @cleaned_options, $option; + } + } + } else { + @cleaned_options = @options; + } + $table->options( \@cleaned_options ) or die $table->error; } for my $cdata ( @{ $tdata->{'constraints'} || [] } ) { @@ -842,19 +915,25 @@ sub parse { reference_table => $cdata->{'reference_table'}, reference_fields => $cdata->{'reference_fields'}, match_type => $cdata->{'match_type'} || '', - on_delete => $cdata->{'on_delete'} || $cdata->{'on_delete_do'}, - on_update => $cdata->{'on_update'} || $cdata->{'on_update_do'}, + on_delete => $cdata->{'on_delete'} + || $cdata->{'on_delete_do'}, + on_update => $cdata->{'on_update'} + || $cdata->{'on_update_do'}, ) or die $table->error; } - # After the constrains and PK/idxs have been created, we normalize fields + # After the constrains and PK/idxs have been created, + # we normalize fields normalize_field($_) for $table->get_fields; } my @procedures = sort { - $result->{procedures}->{ $a }->{'order'} <=> $result->{procedures}->{ $b }->{'order'} + $result->{procedures}->{ $a }->{'order'} + <=> + $result->{procedures}->{ $b }->{'order'} } keys %{ $result->{procedures} }; - foreach my $proc_name (@procedures) { + + for my $proc_name ( @procedures ) { $schema->add_procedure( name => $proc_name, owner => $result->{procedures}->{$proc_name}->{owner}, @@ -863,12 +942,15 @@ sub parse { } my @views = sort { - $result->{views}->{ $a }->{'order'} <=> $result->{views}->{ $b }->{'order'} + $result->{views}->{ $a }->{'order'} + <=> + $result->{views}->{ $b }->{'order'} } keys %{ $result->{views} }; - foreach my $view_name (keys %{ $result->{views} }) { + + for my $view_name ( keys %{ $result->{'views'} } ) { $schema->add_view( name => $view_name, - sql => $result->{views}->{$view_name}->{sql}, + sql => $result->{'views'}->{$view_name}->{sql}, ); } @@ -908,8 +990,10 @@ sub normalize_field { } elsif ( lc $type =~ /(float|double|decimal|numeric|real|fixed|dec)/ ) { my $old_size = (ref $size || '') eq 'ARRAY' ? $size : []; - $changed = @$old_size != 2 && $old_size->[0] != 8 && $old_size->[1] != 2; - $size = [8,2]; + $changed = @$old_size != 2 + || $old_size->[0] != 8 + || $old_size->[1] != 2; + $size = [8,2]; } } @@ -929,16 +1013,30 @@ sub normalize_field { $changed = $size != 4_294_967_295; $size = 4_294_967_295; } - $DB::single = 1 if $field->name eq 'employee_id'; - if ($changed) { - # We only want to clone the field, not *everything* - { local $field->{table} = undef; - $field->parsed_field(dclone($field)); - $field->parsed_field->{table} = $field->table; - } - $field->size($size); - $field->data_type($type); - $field->extra->{list} = $list if @$list; + + if ( $field->data_type =~ /(set|enum)/i && !$field->size ) { + my %extra = $field->extra; + my $longest = 0; + for my $len ( map { length } @{ $extra{'list'} || [] } ) { + $longest = $len if $len > $longest; + } + $changed = 1; + $size = $longest if $longest; + } + + + if ( $changed ) { + # We only want to clone the field, not *everything* + { + local $field->{table} = undef; + $field->parsed_field( dclone( $field ) ); + $field->parsed_field->{table} = $field->table; + } + $field->size( $size ); + $field->data_type( $type ); + $field->sql_data_type( $type_mapping{ lc $type } ) + if exists $type_mapping{ lc $type }; + $field->extra->{list} = $list if @$list; } }