X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FMySQL.pm;h=a877a9b79ccadf299dbe6349ee39493aabd9407f;hb=09fa21a61ddab6f0fd8f7cdcdd7cbda74e44566c;hp=16604e5972594af1b162290ea377f12f18339fc7;hpb=1853ba82c9d5358373a1d2a77a939c9418a811b8;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Parser/MySQL.pm b/lib/SQL/Translator/Parser/MySQL.pm index 16604e5..a877a9b 100644 --- a/lib/SQL/Translator/Parser/MySQL.pm +++ b/lib/SQL/Translator/Parser/MySQL.pm @@ -1,7 +1,7 @@ package SQL::Translator::Parser::MySQL; # ------------------------------------------------------------------- -# $Id: MySQL.pm,v 1.30 2003-08-16 13:20:06 rossta Exp $ +# $Id: MySQL.pm,v 1.42 2004-01-25 18:09:51 kycl4rk Exp $ # ------------------------------------------------------------------- # Copyright (C) 2003 Ken Y. Clark , # darren chamberlain , @@ -123,7 +123,7 @@ Here's the word from the MySQL site use strict; use vars qw[ $DEBUG $VERSION $GRAMMAR @EXPORT_OK ]; -$VERSION = sprintf "%d.%02d", q$Revision: 1.30 $ =~ /(\d+)\.(\d+)/; +$VERSION = sprintf "%d.%02d", q$Revision: 1.42 $ =~ /(\d+)\.(\d+)/; $DEBUG = 0 unless defined $DEBUG; use Data::Dumper; @@ -141,7 +141,7 @@ $::RD_HINT = 1; # Give out hints to help fix problems. $GRAMMAR = q! { - our ( %tables, $table_order ); + my ( %tables, $table_order, @table_comments ); } # @@ -162,12 +162,18 @@ statement : comment | use : /use/i WORD ';' + { @table_comments = () } set : /set/i /[^;]+/ ';' + { @table_comments = () } + +drop : /drop/i TABLE /[^;]+/ ';' drop : /drop/i WORD(s) ';' + { @table_comments = () } create : CREATE /database/i WORD ';' + { @table_comments = () } create : CREATE TEMPORARY(?) TABLE opt_if_not_exists(?) table_name '(' create_definition(s /,/) ')' table_option(s?) ';' { @@ -175,10 +181,14 @@ create : CREATE TEMPORARY(?) TABLE opt_if_not_exists(?) table_name '(' create_de $tables{ $table_name }{'order'} = ++$table_order; $tables{ $table_name }{'table_name'} = $table_name; + if ( @table_comments ) { + $tables{ $table_name }{'comments'} = [ @table_comments ]; + @table_comments = (); + } + my $i = 1; for my $definition ( @{ $item[7] } ) { if ( $definition->{'supertype'} eq 'field' ) { - my $field_name = $definition->{'name'}; $tables{ $table_name }{'fields'}{ $field_name } = { %$definition, order => $i }; @@ -194,27 +204,15 @@ create : CREATE TEMPORARY(?) TABLE opt_if_not_exists(?) table_name '(' create_de } } elsif ( $definition->{'supertype'} eq 'constraint' ) { - # prob get rid of this? -# for my $field ( @{ $definition->{'fields'} } ) { -# push @{ -# $tables{$table_name}{'fields'}{$field}{'constraints'} -# }, -# $definition; -# } - - # this should be the only one needed push @{ $tables{ $table_name }{'constraints'} }, $definition; } elsif ( $definition->{'supertype'} eq 'index' ) { - push @{ $tables{ $table_name }{'indices'} }, - $definition; + push @{ $tables{ $table_name }{'indices'} }, $definition; } } - for my $opt ( @{ $item{'table_option(s?)'} } ) { - if ( my ( $key, $val ) = each %$opt ) { - $tables{ $table_name }{'table_options'}{ $key } = $val; - } + if ( my @options = @{ $item{'table_option(s?)'} } ) { + $tables{ $table_name }{'table_options'} = \@options; } 1; @@ -224,6 +222,7 @@ opt_if_not_exists : /if not exists/i create : CREATE UNIQUE(?) /(index|key)/i index_name /on/i table_name '(' field_name(s /,/) ')' ';' { + @table_comments = (); push @{ $tables{ $item{'table_name'} }{'indices'} }, { name => $item[4], @@ -236,26 +235,39 @@ create : CREATE UNIQUE(?) /(index|key)/i index_name /on/i table_name '(' field_n create_definition : constraint | index | field + | comment | -comment : /^\s*(?:#|-{2}).*\n/ { - my $comment = $item[1]; - $comment =~ s/^\s*(#|-{2})\s*//; - $comment =~ s/\s*$//; - $return = $comment; -} +comment : /^\s*(?:#|-{2}).*\n/ + { + my $comment = $item[1]; + $comment =~ s/^\s*(#|-{2})\s*//; + $comment =~ s/\s*$//; + $return = $comment; + push @table_comments, $comment; + } + +field_comment : /^\s*(?:#|-{2}).*\n/ + { + my $comment = $item[1]; + $comment =~ s/^\s*(#|-{2})\s*//; + $comment =~ s/\s*$//; + $return = $comment; + } blank : /\s*/ -field : comment(s?) field_name data_type field_qualifier(s?) reference_definition(?) comment(s?) +field : field_comment(s?) field_name data_type field_qualifier(s?) reference_definition(?) field_comment(s?) { - my %qualifiers = map { %$_ } @{ $item{'field_qualifier(s?)'} || [] }; - my $null = defined $item{'not_null'} ? $item{'not_null'} : 1; - delete $qualifiers{'not_null'}; + 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'} + ? $qualifiers{'not_null'} : 1; + delete $qualifiers{'not_null'}; + my @comments = ( @{ $item[1] }, @{ $item[6] } ); $return = { @@ -326,9 +338,9 @@ reference_definition : /references/i table_name parens_field_list(?) match_type( } } -match_type : /match full/i { 'match_full' } +match_type : /match full/i { 'full' } | - /match partial/i { 'match_partial' } + /match partial/i { 'partial' } on_delete_do : /on delete/i reference_option { $item[2] } @@ -351,7 +363,7 @@ table_name : NAME field_name : NAME -index_name : WORD +index_name : NAME data_type : WORD parens_value_list(s?) type_qualifier(s?) { @@ -370,26 +382,41 @@ data_type : WORD parens_value_list(s?) type_qualifier(s?) unless ( @{ $size || [] } ) { if ( lc $type eq 'tinyint' ) { - $size = [4]; + $size = 4; } elsif ( lc $type eq 'smallint' ) { - $size = [6]; + $size = 6; } elsif ( lc $type eq 'mediumint' ) { - $size = [9]; + $size = 9; } elsif ( $type =~ /^int(eger)?$/ ) { $type = 'int'; - $size = [11]; + $size = 11; } elsif ( lc $type eq 'bigint' ) { - $size = [20]; + $size = 20; } - elsif ( lc $type =~ /(float|double|decimal|numeric|real)/ ) { + 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, size => $size, @@ -415,9 +442,15 @@ not_null : /not/i /null/i { $return = 0 } unsigned : /unsigned/i { $return = 0 } -default_val : /default/i /(?:')?[\w\d:.-]*(?:')?/ - { - $item[2] =~ s/'//g; +#default_val : /default/i /(?:')?[\s\w\d:.-]*(?:')?/ +# { +# $item[2] =~ s/'//g; +# $return = $item[2]; +# } + +default_val : /default/i /'(?:.*?\\')*.*?'|(?:')?[\w\d:.-]*(?:')?/ + { + $item[2] =~ s/^\s*'|'\s*$//g; $return = $item[2]; } @@ -430,18 +463,25 @@ constraint : primary_key_def | foreign_key_def | -foreign_key_def : opt_constraint(?) /foreign key/i WORD(?) parens_field_list reference_definition +foreign_key_def : foreign_key_def_begin parens_field_list reference_definition { $return = { supertype => 'constraint', type => 'foreign_key', - name => $item[3][0], - fields => $item[4], + name => $item[1], + fields => $item[2], %{ $item{'reference_definition'} }, } } -opt_constraint : /constraint/i WORD +foreign_key_def_begin : /constraint/i /foreign key/i + { $return = '' } + | + /constraint/i WORD /foreign key/i + { $return = $item[2] } + | + /foreign key/i + { $return = '' } primary_key_def : primary_key index_name(?) '(' name_with_opt_paren(s /,/) ')' { @@ -490,9 +530,9 @@ UNIQUE : /unique/i { 1 } KEY : /key/i | /index/i -table_option : /[^\s;]*/ +table_option : WORD /\s*=\s*/ WORD { - $return = { split /=/, $item[1] } + $return = { $item[1] => $item[3] }; } CREATE : /create/i @@ -554,11 +594,7 @@ sub parse { name => $tdata->{'table_name'}, ) or die $schema->error; -# for my $opt ( @{ $tdata->{'table_options'} } ) { -# if ( my ( $key, $val ) = each %$opt ) { -# $tables->options( -# } -# } + $table->comments( $tdata->{'comments'} ); my @fields = sort { $tdata->{'fields'}->{$a}->{'order'} @@ -589,7 +625,7 @@ sub parse { if ( $field->data_type =~ /(set|enum)/i && !$field->size ) { my %extra = $field->extra; - my $longest; + my $longest = 0; for my $len ( map { length } @{ $extra{'list'} || [] } ) { $longest = $len if $len > $longest; } @@ -611,6 +647,10 @@ sub parse { ) or die $table->error; } + if ( my @options = @{ $tdata->{'table_options'} || [] } ) { + $table->options( \@options ) or die $table->error; + } + for my $cdata ( @{ $tdata->{'constraints'} || [] } ) { my $constraint = $table->add_constraint( name => $cdata->{'name'},