X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FMySQL.pm;h=3c640857068fc9d06ddfdfdeff2f4913e17b9b57;hb=ea93df61568d8fa52a9764a09c4351928ff9374d;hp=db556043e691f6c053eda276854f5a2859ff1de0;hpb=4ab3763d2ad756c236b757306989cafa08e7f35e;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Parser/MySQL.pm b/lib/SQL/Translator/Parser/MySQL.pm index db55604..3c64085 100644 --- a/lib/SQL/Translator/Parser/MySQL.pm +++ b/lib/SQL/Translator/Parser/MySQL.pm @@ -39,11 +39,11 @@ Here's the word from the MySQL site CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name [(create_definition,...)] [table_options] [select_statement] - + or - + CREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name LIKE old_table_name; - + create_definition: col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT] [PRIMARY KEY] [reference_definition] @@ -55,7 +55,7 @@ Here's the word from the MySQL site or [CONSTRAINT symbol] FOREIGN KEY [index_name] (index_col_name,...) [reference_definition] or CHECK (expr) - + type: TINYINT[(length)] [UNSIGNED] [ZEROFILL] or SMALLINT[(length)] [UNSIGNED] [ZEROFILL] @@ -84,19 +84,19 @@ Here's the word from the MySQL site or LONGTEXT or ENUM(value1,value2,value3,...) or SET(value1,value2,value3,...) - + index_col_name: col_name [(length)] - + reference_definition: REFERENCES tbl_name [(index_col_name,...)] [MATCH FULL | MATCH PARTIAL] [ON DELETE reference_option] [ON UPDATE reference_option] - + reference_option: RESTRICT | CASCADE | SET NULL | NO ACTION | SET DEFAULT - + table_options: TYPE = {BDB | HEAP | ISAM | InnoDB | MERGE | MRG_MYISAM | MYISAM } or ENGINE = {BDB | HEAP | ISAM | InnoDB | MERGE | MRG_MYISAM | MYISAM } @@ -159,8 +159,7 @@ use base qw(Exporter); use SQL::Translator::Utils qw/parse_mysql_version/; -our %type_mapping = ( -); +our %type_mapping = (); @EXPORT_OK = qw(parse); @@ -173,19 +172,25 @@ 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 = ';'; } # # The "eofile" rule makes the parser fail if any "statement" rule -# fails. Otherwise, the first successful match by a "statement" +# fails. Otherwise, the first successful match by a "statement" # won't cause the failure needed to know that the parse, as a whole, # failed. -ky # -startrule : statement(s) eofile { - { tables => \%tables, database_name => $database_name, views => \%views, procedures =>\%procedures } +startrule : statement(s) eofile { + { + database_name => $database_name, + tables => \%tables, + views => \%views, + procedures => \%procedures, + } } eofile : /^\Z/ @@ -216,8 +221,8 @@ drop : /drop/i WORD(s) "$delimiter" { @table_comments = () } string : - # MySQL strings, unlike common SQL strings, can be double-quoted or - # single-quoted, and you can escape the delmiters by doubling (but only the + # MySQL strings, unlike common SQL strings, can be double-quoted or + # single-quoted, and you can escape the delmiters by doubling (but only the # delimiter) or by backslashing. /'(\\.|''|[^\\\'])*'/ | @@ -226,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] } @@ -240,7 +245,7 @@ alter : ALTER TABLE table_name alter_specification(s /,/) "$delimiter" my $table_name = $item{'table_name'}; die "Cannot ALTER table '$table_name'; it does not exist" unless $tables{ $table_name }; - for my $definition ( @{ $item[4] } ) { + for my $definition ( @{ $item[4] } ) { $definition->{'extra'}->{'alter'} = 1; push @{ $tables{ $table_name }{'constraints'} }, $definition; } @@ -253,7 +258,7 @@ create : CREATE /database/i WORD "$delimiter" { @table_comments = () } create : CREATE TEMPORARY(?) TABLE opt_if_not_exists(?) table_name '(' create_definition(s /,/) /(,\s*)?\)/ table_option(s?) "$delimiter" - { + { my $table_name = $item{'table_name'}; $tables{ $table_name }{'order'} = ++$table_order; $tables{ $table_name }{'table_name'} = $table_name; @@ -267,10 +272,10 @@ create : CREATE TEMPORARY(?) TABLE opt_if_not_exists(?) table_name '(' create_de for my $definition ( @{ $item[7] } ) { if ( $definition->{'supertype'} eq 'field' ) { my $field_name = $definition->{'name'}; - $tables{ $table_name }{'fields'}{ $field_name } = + $tables{ $table_name }{'fields'}{ $field_name } = { %$definition, order => $i }; $i++; - + if ( $definition->{'is_primary_key'} ) { push @{ $tables{ $table_name }{'constraints'} }, { @@ -328,7 +333,7 @@ create : CREATE PROCEDURE NAME not_delimiter "$delimiter" my $func_name = $item[3]; my $owner = ''; my $sql = "$item[1] $item[2] $item[3] $item[4]"; - + $procedures{ $func_name }{'order'} = ++$proc_order; $procedures{ $func_name }{'name'} = $func_name; $procedures{ $func_name }{'owner'} = $owner; @@ -338,20 +343,23 @@ 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; - + $views{ $view_name }{'order'} = ++$view_order; $views{ $view_name }{'name'} = $view_name; $views{ $view_name }{'sql'} = $sql; } +replace : /or replace/i + algorithm : /algorithm/i /=/ WORD { $return = "$item[1]=$item[3]"; @@ -359,14 +367,14 @@ algorithm : /algorithm/i /=/ WORD not_delimiter : /.*?(?=$delimiter)/is -create_definition : constraint +create_definition : constraint | index | field | comment | -comment : /^\s*(?:#|-{2}).*\n/ - { +comment : /^\s*(?:#|-{2}).*\n/ + { my $comment = $item[1]; $comment =~ s/^\s*(#|--)\s*//; $comment =~ s/\s*$//; @@ -380,9 +388,9 @@ comment : /\/\*/ /.*?\*\//s $comment =~ s/^\s*|\s*$//g; $return = $comment; } - -field_comment : /^\s*(?:#|-{2}).*\n/ - { + +field_comment : /^\s*(?:#|-{2}).*\n/ + { my $comment = $item[1]; $comment =~ s/^\s*(#|--)\s*//; $comment =~ s/\s*$//; @@ -401,21 +409,21 @@ field_comment2 : /comment/i /'.*?'/ blank : /\s*/ field : field_comment(s?) field_name data_type field_qualifier(s?) field_comment2(?) reference_definition(?) on_update(?) field_comment(s?) - { + { my %qualifiers = map { %$_ } @{ $item{'field_qualifier(s?)'} || [] }; if ( my @type_quals = @{ $item{'data_type'}{'qualifiers'} || [] } ) { $qualifiers{ $_ } = 1 for @type_quals; } - my $null = defined $qualifiers{'not_null'} + my $null = defined $qualifiers{'not_null'} ? $qualifiers{'not_null'} : 1; delete $qualifiers{'not_null'}; my @comments = ( @{ $item[1] }, @{ $item[5] }, @{ $item[8] } ); - $return = { + $return = { supertype => 'field', - name => $item{'field_name'}, + name => $item{'field_name'}, data_type => $item{'data_type'}{'type'}, size => $item{'data_type'}{'size'}, list => $item{'data_type'}{'list'}, @@ -423,46 +431,46 @@ field : field_comment(s?) field_name data_type field_qualifier(s?) field_comment constraints => $item{'reference_definition(?)'}, comments => [ @comments ], %qualifiers, - } + } } | field_qualifier : not_null - { - $return = { + { + $return = { null => $item{'not_null'}, - } + } } field_qualifier : default_val - { - $return = { + { + $return = { default => $item{'default_val'}, - } + } } field_qualifier : auto_inc - { - $return = { + { + $return = { is_auto_inc => $item{'auto_inc'}, - } + } } field_qualifier : primary_key - { - $return = { + { + $return = { is_primary_key => $item{'primary_key'}, - } + } } field_qualifier : unsigned - { - $return = { + { + $return = { is_unsigned => $item{'unsigned'}, - } + } } -field_qualifier : /character set/i WORD +field_qualifier : /character set/i WORD { $return = { 'CHARACTER SET' => $item[2], @@ -516,19 +524,19 @@ match_type : /match full/i { 'full' } on_delete : /on delete/i reference_option { $item[2] } -on_update : +on_update : /on update/i 'CURRENT_TIMESTAMP' { $item[2] } | /on update/i reference_option { $item[2] } -reference_option: /restrict/i | - /cascade/i | - /set null/i | - /no action/i | +reference_option: /restrict/i | + /cascade/i | + /set null/i | + /no action/i | /set default/i - { $item[1] } + { $item[1] } index : normal_index | fulltext_index @@ -542,7 +550,7 @@ field_name : NAME index_name : NAME data_type : WORD parens_value_list(s?) type_qualifier(s?) - { + { my $type = $item[1]; my $size; # field size, applicable only to non-set fields my $list; # set list, applicable only to sets (duh) @@ -557,12 +565,12 @@ data_type : WORD parens_value_list(s?) type_qualifier(s?) } - $return = { + $return = { type => $type, size => $size, list => $list, qualifiers => $item[3], - } + } } parens_field_list : '(' field_name(s /,/) ')' @@ -578,7 +586,7 @@ field_type : WORD create_index : /create/i /index/i -not_null : /not/i /null/i +not_null : /not/i /null/i { $return = 0 } | /null/i @@ -586,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_val : /default/i 'CURRENT_TIMESTAMP' { $return = \$item[2]; } | - /default/i /'(?:.*?\\')*.*?'|(?:')?[\w\d:.-]*(?:')?/ + /default/i /'(?:.*?(?:\\'|''))*.*?'|(?:')?[\w\d:.-]*(?:')?/ { $item[2] =~ s/^\s*'|'\s*$//g; $return = $item[2]; @@ -639,54 +641,62 @@ foreign_key_def_begin : /constraint/i /foreign key/i WORD /foreign key/i { $return = '' } -primary_key_def : primary_key index_name(?) '(' name_with_opt_paren(s /,/) ')' - { - $return = { +primary_key_def : primary_key index_name_not_using(?) index_type(?) '(' name_with_opt_paren(s /,/) ')' index_type(?) + { + $return = { supertype => 'constraint', - name => $item{'index_name(?)'}[0], + name => $item[2][0], type => 'primary_key', - fields => $item[4], + fields => $item[5], + options => $item[3][0] || $item[7][0], }; } -unique_key_def : UNIQUE KEY(?) index_name(?) '(' name_with_opt_paren(s /,/) ')' - { - $return = { +unique_key_def : UNIQUE KEY(?) index_name_not_using(?) index_type(?) '(' name_with_opt_paren(s /,/) ')' index_type(?) + { + $return = { supertype => 'constraint', - name => $item{'index_name(?)'}[0], + name => $item[3][0], type => 'unique', - fields => $item[5], - } + fields => $item[6], + options => $item[4][0] || $item[8][0], + } } -normal_index : KEY index_name(?) '(' name_with_opt_paren(s /,/) ')' - { - $return = { +normal_index : KEY index_name_not_using(?) index_type(?) '(' name_with_opt_paren(s /,/) ')' index_type(?) + { + $return = { supertype => 'index', type => 'normal', - name => $item{'index_name(?)'}[0], - fields => $item[4], - } + name => $item[2][0], + fields => $item[5], + options => $item[3][0] || $item[7][0], + } } +index_name_not_using : QUOTED_NAME + | /(\b(?!using)\w+\b)/ { $return = ($1 =~ /^using/i) ? undef : $1 } + +index_type : /using (btree|hash|rtree)/i { $return = uc $1 } + fulltext_index : /fulltext/i KEY(?) index_name(?) '(' name_with_opt_paren(s /,/) ')' - { - $return = { + { + $return = { supertype => 'index', type => 'fulltext', name => $item{'index_name(?)'}[0], fields => $item[5], - } + } } spatial_index : /spatial/i KEY(?) index_name(?) '(' name_with_opt_paren(s /,/) ')' - { - $return = { + { + $return = { supertype => 'index', type => 'spatial', name => $item{'index_name(?)'}[0], fields => $item[5], - } + } } name_with_opt_paren : NAME parens_value_list(s?) @@ -704,7 +714,7 @@ table_option : /comment/i /=/ /'.*?'/ $return = { comment => $comment }; } | /(default )?(charset|character set)/i /\s*=?\s*/ WORD - { + { $return = { 'CHARACTER SET' => $item[3] }; } | /collate/i WORD @@ -712,14 +722,20 @@ table_option : /comment/i /=/ /'.*?'/ $return = { 'COLLATE' => $item[2] } } | /union/i /\s*=\s*/ '(' table_name(s /,/) ')' - { + { $return = { $item[1] => $item[4] }; } - | WORD /\s*=\s*/ WORD - { + | 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 @@ -740,16 +756,21 @@ COMMA : ',' BACKTICK : '`' -NAME : BACKTICK /[^`]+/ BACKTICK +DOUBLE_QUOTE: '"' + +QUOTED_NAME : BACKTICK /[^`]+/ BACKTICK + { $item[2] } + | DOUBLE_QUOTE /[^"]+/ DOUBLE_QUOTE { $item[2] } + +NAME: QUOTED_NAME | /\w+/ - { $item[1] } -VALUE : /[-+]?\.?\d+(?:[eE]\d+)?/ +VALUE : /[-+]?\.?\d+(?:[eE]\d+)?/ { $item[1] } - | /'.*?'/ - { - # remove leading/trailing quotes + | /'.*?'/ + { + # remove leading/trailing quotes my $val = $item[1]; $val =~ s/^['"]|['"]$//g; $return = $val; @@ -760,7 +781,7 @@ VALUE : /[-+]?\.?\d+(?:[eE]\d+)?/ CURRENT_TIMESTAMP : /current_timestamp(\(\))?/i | /now\(\)/i { 'CURRENT_TIMESTAMP' } - + END_OF_GRAMMAR # ------------------------------------------------------------------- @@ -774,12 +795,18 @@ sub parse { return $translator->error("Error instantiating Parse::RecDescent ". "instance: Bad grammer"); } - - # 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 ) {} + + # 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; @@ -788,22 +815,22 @@ sub parse { my $schema = $translator->schema; $schema->name($result->{'database_name'}) if $result->{'database_name'}; - my @tables = sort { - $result->{'tables'}{ $a }{'order'} - <=> + my @tables = sort { + $result->{'tables'}{ $a }{'order'} + <=> $result->{'tables'}{ $b }{'order'} } keys %{ $result->{'tables'} }; for my $table_name ( @tables ) { my $tdata = $result->{tables}{ $table_name }; - my $table = $schema->add_table( + my $table = $schema->add_table( name => $tdata->{'table_name'}, ) or die $schema->error; $table->comments( $tdata->{'comments'} ); - my @fields = sort { - $tdata->{'fields'}->{$a}->{'order'} + my @fields = sort { + $tdata->{'fields'}->{$a}->{'order'} <=> $tdata->{'fields'}->{$b}->{'order'} } keys %{ $tdata->{'fields'} }; @@ -864,13 +891,17 @@ sub parse { if ( my @options = @{ $tdata->{'table_options'} || [] } ) { my @cleaned_options; - my @ignore_opts = $translator->parser_args->{ignore_opts}?split(/,/,$translator->parser_args->{ignore_opts}):(); + 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}); + if ( !exists $ignores->{$option_key} ) { + push @cleaned_options, $option; + } } } else { @cleaned_options = @options; @@ -886,44 +917,52 @@ 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'} + + my @procedures = sort { + $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}, sql => $result->{procedures}->{$proc_name}->{sql}, ); } - - my @views = sort { - $result->{views}->{ $a }->{'order'} <=> $result->{views}->{ $b }->{'order'} + my @views = sort { + $result->{views}->{ $a }->{'order'} + <=> + $result->{views}->{ $b }->{'order'} } keys %{ $result->{views} }; - foreach my $view_name (keys %{ $result->{views} }) { + + for my $view_name ( @views ) { $schema->add_view( name => $view_name, - sql => $result->{views}->{$view_name}->{sql}, + sql => $result->{'views'}->{$view_name}->{sql}, ); } return 1; } -# Takes a field, and returns +# 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} || []; @@ -952,8 +991,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]; } } @@ -973,6 +1014,7 @@ sub normalize_field { $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; @@ -984,20 +1026,21 @@ sub normalize_field { } - 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; + 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; # -------------------------------------------------------------------