X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FParser%2FMySQL.pm;h=b316ad561cf05f297dfc8e278fcd29799a19141b;hb=900758666f4b53e9a670d84260d28b16f834f69d;hp=a812e7413e0ce204c2845e63d15e80c6aab9fb6e;hpb=f2cf173453029696c146247193066c6334ea9cff;p=dbsrgits%2FSQL-Translator.git diff --git a/lib/SQL/Translator/Parser/MySQL.pm b/lib/SQL/Translator/Parser/MySQL.pm index a812e74..b316ad5 100644 --- a/lib/SQL/Translator/Parser/MySQL.pm +++ b/lib/SQL/Translator/Parser/MySQL.pm @@ -1,11 +1,9 @@ package SQL::Translator::Parser::MySQL; # ------------------------------------------------------------------- -# $Id: MySQL.pm,v 1.23 2003-06-06 00:05:09 kycl4rk Exp $ +# $Id: MySQL.pm,v 1.43 2004-02-09 22:23:40 kycl4rk Exp $ # ------------------------------------------------------------------- -# Copyright (C) 2003 Ken Y. Clark , -# darren chamberlain , -# Chris Mungall +# Copyright (C) 2002-4 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 @@ -123,7 +121,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.23 $ =~ /(\d+)\.(\d+)/; +$VERSION = sprintf "%d.%02d", q$Revision: 1.43 $ =~ /(\d+)\.(\d+)/; $DEBUG = 0 unless defined $DEBUG; use Data::Dumper; @@ -141,7 +139,7 @@ $::RD_HINT = 1; # Give out hints to help fix problems. $GRAMMAR = q! { - our ( %tables, $table_order ); + my ( %tables, $table_order, @table_comments ); } # @@ -156,15 +154,24 @@ eofile : /^\Z/ statement : comment | use + | set | drop | create | 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?) ';' { @@ -172,10 +179,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 }; @@ -191,27 +202,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; @@ -221,6 +220,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], @@ -233,21 +233,41 @@ create : CREATE UNIQUE(?) /(index|key)/i index_name /on/i table_name '(' field_n create_definition : constraint | index | field + | comment | -comment : /^\s*(?:#|-{2}).*\n/ +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 : field_name data_type field_qualifier(s?) reference_definition(?) +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 = { supertype => 'field', name => $item{'field_name'}, @@ -256,6 +276,7 @@ field : field_name data_type field_qualifier(s?) reference_definition(?) list => $item{'data_type'}{'list'}, null => $null, constraints => $item{'reference_definition(?)'}, + comments => [ @comments ], %qualifiers, } } @@ -296,6 +317,13 @@ field_qualifier : unsigned } } +field_qualifier : /character set/i WORD + { + $return = { + character_set => $item[2], + } + } + reference_definition : /references/i table_name parens_field_list(?) match_type(?) on_delete_do(?) on_update_do(?) { $return = { @@ -308,9 +336,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] } @@ -329,11 +357,11 @@ index : normal_index | fulltext_index | -table_name : WORD +table_name : NAME -field_name : WORD +field_name : NAME -index_name : WORD +index_name : NAME data_type : WORD parens_value_list(s?) type_qualifier(s?) { @@ -352,26 +380,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, @@ -397,9 +440,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]; } @@ -412,20 +461,27 @@ 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(?) '(' field_name(s /,/) ')' +primary_key_def : primary_key index_name(?) '(' name_with_opt_paren(s /,/) ')' { $return = { supertype => 'constraint', @@ -472,9 +528,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 @@ -526,17 +582,17 @@ sub parse { warn Dumper( $result ) if $DEBUG; my $schema = $translator->schema; - for my $table_name ( keys %{ $result } ) { + my @tables = sort { + $result->{ $a }->{'order'} <=> $result->{ $b }->{'order'} + } keys %{ $result }; + + for my $table_name ( @tables ) { my $tdata = $result->{ $table_name }; my $table = $schema->add_table( 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'} @@ -553,6 +609,7 @@ sub parse { default_value => $fdata->{'default'}, is_auto_increment => $fdata->{'is_auto_inc'}, is_nullable => $fdata->{'null'}, + comments => $fdata->{'comments'}, ) or die $table->error; $table->primary_key( $field->name ) if $fdata->{'is_primary_key'}; @@ -566,7 +623,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; } @@ -588,6 +645,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'}, @@ -602,15 +663,15 @@ sub parse { } } - return $result; + return 1; } 1; -# ---------------------------------------------------- +# ------------------------------------------------------------------- # Where man is not nature is barren. # William Blake -# ---------------------------------------------------- +# ------------------------------------------------------------------- =pod