X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FMySQL.pm;h=016bfbb542cbaeaf5437de2f22bc10f7c1caf136;hb=5eb4a350fba7f4d16e8a726bd530cfadbce8e547;hp=df1077dba1b8d39cd4ecaecf71689eee3caad394;hpb=256d534ad6e7b34ccd1f668ddfaa6395f530c185;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Parser/MySQL.pm b/lib/SQL/Translator/Parser/MySQL.pm index df1077d..016bfbb 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.34 2003-08-19 14:41:05 kycl4rk Exp $ +# $Id: MySQL.pm,v 1.40 2003-09-08 18:16:04 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.34 $ =~ /(\d+)\.(\d+)/; +$VERSION = sprintf "%d.%02d", q$Revision: 1.40 $ =~ /(\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,20 +204,10 @@ 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; } } @@ -224,6 +224,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], @@ -238,24 +239,36 @@ create_definition : constraint | field | -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 = { @@ -370,20 +383,20 @@ 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|fixed|dec)/ @@ -392,17 +405,17 @@ data_type : WORD parens_value_list(s?) type_qualifier(s?) } } - if ( lc $type eq 'tinytext' ) { - $size = [255]; + if ( $type =~ /^tiny(text|blob)$/i ) { + $size = 255; } - elsif ( lc $type eq 'text' ) { - $size = [65_000]; + elsif ( $type =~ /^(blob|text)$/i ) { + $size = 65_535; } - elsif ( lc $type eq 'mediumtext' ) { - $size = [16_000_000]; + elsif ( $type =~ /^medium(blob|text)$/i ) { + $size = 16_777_215; } - elsif ( lc $type eq 'longtext' ) { - $size = [4_000_000_000]; + elsif ( $type =~ /^long(blob|text)$/i ) { + $size = 4_294_967_295; } $return = { @@ -430,7 +443,7 @@ not_null : /not/i /null/i { $return = 0 } unsigned : /unsigned/i { $return = 0 } -default_val : /default/i /(?:')?[\w\d:.-]*(?:')?/ +default_val : /default/i /(?:')?[\s\w\d:.-]*(?:')?/ { $item[2] =~ s/'//g; $return = $item[2]; @@ -445,18 +458,19 @@ constraint : primary_key_def | foreign_key_def | -foreign_key_def : opt_constraint(?) /foreign key/i WORD(?) parens_field_list reference_definition +foreign_key_def : opt_constraint(?) /foreign key/i parens_field_list reference_definition { $return = { supertype => 'constraint', type => 'foreign_key', - name => $item[3][0], - fields => $item[4], + name => $item[1][0], + fields => $item[3], %{ $item{'reference_definition'} }, } } -opt_constraint : /constraint/i WORD +opt_constraint : /constraint/i NAME + { $item[2] } primary_key_def : primary_key index_name(?) '(' name_with_opt_paren(s /,/) ')' { @@ -569,11 +583,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'}