X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FMySQL.pm;h=b833d99e3d22d344d5ce665374f01ece12bf15b8;hb=d4f84dd192edc7a64a0b1a9923f1bafc0bc5ef9d;hp=89a2194a21125320d1936ef37ddb8b931c728ba9;hpb=4d4385499fa84e31f78abe4cacf517e4a11c7b8f;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Parser/MySQL.pm b/lib/SQL/Translator/Parser/MySQL.pm index 89a2194..b833d99 100644 --- a/lib/SQL/Translator/Parser/MySQL.pm +++ b/lib/SQL/Translator/Parser/MySQL.pm @@ -1,9 +1,9 @@ package SQL::Translator::Parser::MySQL; # ------------------------------------------------------------------- -# $Id: MySQL.pm,v 1.58 2007-03-19 17:15:24 duality72 Exp $ +# $Id: MySQL.pm 1440 2009-01-17 16:31:57Z jawnsy $ # ------------------------------------------------------------------- -# 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 +101,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 +120,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,18 +134,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+)/; +use vars qw[ $DEBUG $GRAMMAR @EXPORT_OK ]; $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. @@ -211,7 +232,7 @@ statement_body : (string | nonstring)(s?) insert : /insert/i statement_body "$delimiter" delimiter : /delimiter/i /[\S]+/ - { $delimiter = $item[2] } + { $delimiter = $item[2] } empty_statement : "$delimiter" @@ -291,20 +312,20 @@ 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], } ; } create : CREATE /trigger/i NAME not_delimiter "$delimiter" - { - @table_comments = (); - } + { + @table_comments = (); + } create : CREATE PROCEDURE NAME not_delimiter "$delimiter" - { - @table_comments = (); + { + @table_comments = (); my $func_name = $item[3]; my $owner = ''; my $sql = "$item[1] $item[2] $item[3] $item[4]"; @@ -313,14 +334,14 @@ create : CREATE PROCEDURE NAME not_delimiter "$delimiter" $procedures{ $func_name }{'name'} = $func_name; $procedures{ $func_name }{'owner'} = $owner; $procedures{ $func_name }{'sql'} = $sql; - } + } PROCEDURE : /procedure/i - | /function/i + | /function/i create : CREATE algorithm /view/i NAME not_delimiter "$delimiter" - { - @table_comments = (); + { + @table_comments = (); my $view_name = $item[4]; my $sql = "$item[1] $item[2] $item[3] $item[4] $item[5]"; @@ -330,12 +351,12 @@ create : CREATE algorithm /view/i NAME not_delimiter "$delimiter" $views{ $view_name }{'order'} = ++$view_order; $views{ $view_name }{'name'} = $view_name; $views{ $view_name }{'sql'} = $sql; - } + } algorithm : /algorithm/i /=/ WORD - { - $return = "$item[1]=$item[3]"; - } + { + $return = "$item[1]=$item[3]"; + } not_delimiter : /.*?(?=$delimiter)/is @@ -512,6 +533,7 @@ reference_option: /restrict/i | index : normal_index | fulltext_index + | spatial_index | table_name : NAME @@ -535,42 +557,6 @@ data_type : WORD parens_value_list(s?) type_qualifier(s?) $list = []; } - if ( @{ $size || [] } == 0 && !$thisparser->{local}{sqlt_parser_args}{no_default_sizes} ) { - if ( lc $type eq 'tinyint' ) { - $size = 4; - } - elsif ( lc $type eq 'smallint' ) { - $size = 6; - } - elsif ( lc $type eq 'mediumint' ) { - $size = 9; - } - elsif ( $type =~ /^int(eger)?$/i ) { - $type = 'int'; - $size = 11; - } - elsif ( lc $type eq 'bigint' ) { - $size = 20; - } - elsif ( - lc $type =~ /(float|double|decimal|numeric|real|fixed|dec)/ - ) { - $size = [8,2]; - } - } - - if ( $type =~ /^tiny(text|blob)$/i ) { - $size = 255; - } - elsif ( $type =~ /^(blob|text)$/i ) { - $size = 65_535; - } - elsif ( $type =~ /^medium(blob|text)$/i ) { - $size = 16_777_215; - } - elsif ( $type =~ /^long(blob|text)$/i ) { - $size = 4_294_967_295; - } $return = { type => $type, @@ -610,7 +596,7 @@ unsigned : /unsigned/i { $return = 0 } default_val : /default/i 'CURRENT_TIMESTAMP' { - $return = $item[2]; + $return = \$item[2]; } | /default/i /'(?:.*?\\')*.*?'|(?:')?[\w\d:.-]*(?:')?/ @@ -694,10 +680,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 @@ -708,10 +704,18 @@ 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] }; } + | /collate/i WORD + { + $return = { 'COLLATE' => $item[2] } + } + | /union/i /\s*=\s*/ '(' table_name(s /,/) ')' + { + $return = { $item[1] => $item[4] }; + } | WORD /\s*=\s*/ WORD { $return = { $item[1] => $item[3] }; @@ -735,7 +739,9 @@ DIGITS : /\d+/ COMMA : ',' -NAME : "`" /\w+/ "`" +BACKTICK : '`' + +NAME : BACKTICK /[^`]+/ BACKTICK { $item[2] } | /\w+/ { $item[1] } @@ -753,16 +759,15 @@ VALUE : /[-+]?\.?\d+(?:[eE]\d+)?/ { 'NULL' } CURRENT_TIMESTAMP : /current_timestamp(\(\))?/i - | /now\(\)/i - { 'CURRENT_TIMESTAMP' } - + | /now\(\)/i + { 'CURRENT_TIMESTAMP' } + 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; @@ -770,12 +775,11 @@ sub parse { return $translator->error("Error instantiating Parse::RecDescent ". "instance: Bad grammer"); } - - # This is the only way to get args into the productions/actions - $parser->{local}{sqlt_parser_args} = $translator->parser_args; # Preprocess for MySQL-specific and not-before-version comments from mysqldump - my $parser_version = $translator->parser_args->{mysql_parser_version} || DEFAULT_PARSER_VERSION; + 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 ) {} my $result = $parser->startrule($data); @@ -820,7 +824,7 @@ sub parse { $table->primary_key( $field->name ) if $fdata->{'is_primary_key'}; for my $qual ( qw[ binary unsigned zerofill list collate ], - 'character set', 'on update' ) { + 'character set', 'on update' ) { if ( my $val = $fdata->{ $qual } || $fdata->{ uc $qual } ) { next if ref $val eq 'ARRAY' && !@$val; $field->extra( $qual, $val ); @@ -843,20 +847,12 @@ 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 ]; push @{ $tdata->{'constraints'} }, $cdata; } + } for my $idata ( @{ $tdata->{'indices'} || [] } ) { @@ -868,7 +864,19 @@ 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; + push(@cleaned_options, $option) unless (exists $ignores->{$option_key}); + } + } else { + @cleaned_options = @options; + } + $table->options( \@cleaned_options ) or die $table->error; } for my $cdata ( @{ $tdata->{'constraints'} || [] } ) { @@ -883,32 +891,114 @@ sub parse { 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 + normalize_field($_) for $table->get_fields; } my @procedures = sort { $result->{procedures}->{ $a }->{'order'} <=> $result->{procedures}->{ $b }->{'order'} } keys %{ $result->{procedures} }; foreach my $proc_name (@procedures) { - $schema->add_procedure( - name => $proc_name, - owner => $result->{procedures}->{$proc_name}->{owner}, - sql => $result->{procedures}->{$proc_name}->{sql}, - ); + $schema->add_procedure( + name => $proc_name, + owner => $result->{procedures}->{$proc_name}->{owner}, + sql => $result->{procedures}->{$proc_name}->{sql}, + ); } my @views = sort { $result->{views}->{ $a }->{'order'} <=> $result->{views}->{ $b }->{'order'} } keys %{ $result->{views} }; foreach my $view_name (keys %{ $result->{views} }) { - $schema->add_view( - name => $view_name, - sql => $result->{views}->{$view_name}->{sql}, - ); + $schema->add_view( + name => $view_name, + sql => $result->{views}->{$view_name}->{sql}, + ); } return 1; } +# Takes a field, and returns +sub normalize_field { + my ($field) = @_; + my ($size, $type, $list, $changed) = @_; + + $size = $field->size; + $type = $field->data_type; + $list = $field->extra->{list} || []; + + if ( !ref $size && $size eq 0 ) { + if ( lc $type eq 'tinyint' ) { + $changed = $size != 4; + $size = 4; + } + elsif ( lc $type eq 'smallint' ) { + $changed = $size != 6; + $size = 6; + } + elsif ( lc $type eq 'mediumint' ) { + $changed = $size != 9; + $size = 9; + } + elsif ( $type =~ /^int(eger)?$/i ) { + $changed = $size != 11 || $type ne 'int'; + $type = 'int'; + $size = 11; + } + elsif ( lc $type eq 'bigint' ) { + $changed = $size != 20; + $size = 20; + } + 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]; + } + } + + if ( $type =~ /^tiny(text|blob)$/i ) { + $changed = $size != 255; + $size = 255; + } + elsif ( $type =~ /^(blob|text)$/i ) { + $changed = $size != 65_535; + $size = 65_535; + } + elsif ( $type =~ /^medium(blob|text)$/i ) { + $changed = $size != 16_777_215; + $size = 16_777_215; + } + elsif ( $type =~ /^long(blob|text)$/i ) { + $changed = $size != 4_294_967_295; + $size = 4_294_967_295; + } + 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; + } +} + + 1; # -------------------------------------------------------------------