From: Ken Youens-Clark Date: Wed, 22 Feb 2006 22:52:51 +0000 (+0000) Subject: Changed to build up schema from "show create table" statements and then X-Git-Tag: v0.11008~467 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=24bc7217ae5baa6f8b3980f3770db922111d5add;p=dbsrgits%2FSQL-Translator.git Changed to build up schema from "show create table" statements and then pass to regular MySQL parser. --- diff --git a/lib/SQL/Translator/Parser/DBI/MySQL.pm b/lib/SQL/Translator/Parser/DBI/MySQL.pm index 0cc9a12..b69c4d5 100644 --- a/lib/SQL/Translator/Parser/DBI/MySQL.pm +++ b/lib/SQL/Translator/Parser/DBI/MySQL.pm @@ -1,7 +1,7 @@ package SQL::Translator::Parser::DBI::MySQL; # ------------------------------------------------------------------- -# $Id: MySQL.pm,v 1.5 2005-07-12 16:05:35 duality72 Exp $ +# $Id: MySQL.pm,v 1.6 2006-02-22 22:52:51 kycl4rk Exp $ # ------------------------------------------------------------------- # Copyright (C) 2002-4 SQLFairy Authors # @@ -40,147 +40,30 @@ use strict; use DBI; use Data::Dumper; use SQL::Translator::Schema::Constants; +use SQL::Translator::Parser::MySQL; use vars qw[ $DEBUG $VERSION @EXPORT_OK ]; -$VERSION = sprintf "%d.%02d", q$Revision: 1.5 $ =~ /(\d+)\.(\d+)/; +$VERSION = sprintf "%d.%02d", q$Revision: 1.6 $ =~ /(\d+)\.(\d+)/; $DEBUG = 0 unless defined $DEBUG; # ------------------------------------------------------------------- sub parse { my ( $tr, $dbh ) = @_; my $schema = $tr->schema; - my @table_names = @{ $dbh->selectcol_arrayref( 'show tables') }; + my @table_names = @{ $dbh->selectcol_arrayref('show tables') }; + $dbh->{'FetchHashKeyName'} = 'NAME_lc'; + + my $create; for my $table_name ( @table_names ) { - my $table = $schema->add_table( - name => $table_name, - ) or die $schema->error; - - my $cols = $dbh->selectall_arrayref( - "desc $table_name", - { Columns => {} } - ); - - for my $col ( @$cols ) { - my $fname = $col->{'field'} or next; - my $type = $col->{'type'} or next; - my $collation = $col->{'collation'} || ''; - my $is_nullable = uc $col->{'null'} eq 'YES' ? 1 : 0; - my $key = $col->{'key'}; - my $default = $col->{'default'}; - my $extra = $col->{'extra'}; - my $is_auto_inc = $extra =~ s/auto_increment//i; - - my ( $data_type, $size, $char_set ); - - # - # Normal datatype = "int(11)" - # or "varchar(20) character set latin1" - # - if ( $type =~ m{ - (\w+) # data type - \( # open paren - (\d+) # first number - (?:,(\d+))? # optional comma and number - \) # close paren - (.*)? # anything else (character set) - }x - ) { - $data_type = $1; - $size = $2; - $size .= ",$3" if $3; - $char_set = $4 || ''; - } - # - # Some data type just say "double" or "text" - # - elsif ( $type =~ m{ - (\w+) # data type - (.*)? # anything else (character set) - }x - ) { - $data_type = $1; - $size = undef; - $char_set = $2 || ''; - } - - my $field = $table->add_field( - name => $fname, - data_type => $data_type, - size => $size, - default_value => $default, - is_auto_increment => $is_auto_inc, - is_nullable => $is_nullable, - comments => $extra, - ) or die $table->error; - - $table->primary_key( $field->name ) if $key eq 'PRI'; - } - - my $indices = $dbh->selectall_arrayref( - "show index from $table_name", - { Columns => {} }, - ); - - my ( %keys, %constraints, $order ); - for my $index ( @$indices ) { - my $table = $index->{'table'}; - my $non_unique = $index->{'non_unique'}; - my $key_name = $index->{'key_name'} || ''; - my $seq_in_index = $index->{'seq_in_index'}; - my $column_name = $index->{'column_name'}; - my $collation = $index->{'collation'}; - my $cardinality = $index->{'cardinality'}; - my $sub_part = $index->{'sub_part'}; - my $packed = $index->{'packed'}; - my $null = $index->{'null'}; - my $index_type = $index->{'index_type'}; - my $comment = $index->{'comment'}; - - my $is_constraint = $key_name eq 'PRIMARY' || $non_unique == 0; - - if ( $is_constraint ) { - $constraints{ $key_name }{'order'} = ++$order; - push @{ $constraints{ $key_name }{'fields'} }, $column_name; - - if ( $key_name eq 'PRIMARY' ) { - $constraints{ $key_name }{'type'} = PRIMARY_KEY; - } - elsif ( $non_unique == 0 ) { - $constraints{ $key_name }{'type'} = UNIQUE; - } - } - else { - $keys{ $key_name }{'order'} = ++$order; - push @{ $keys{ $key_name }{'fields'} }, $column_name; - } - } - - for my $key_name ( - sort { $keys{ $a }{'order'} <=> $keys{ $b }{'order'} } - keys %keys - ) { - my $key = $keys{ $key_name }; - my $index = $table->add_index( - name => $key_name, - type => NORMAL, - fields => $key->{'fields'}, - ) or die $table->error; - } - - for my $constraint_name ( - sort { $constraints{ $a }{'order'} <=> $constraints{ $b }{'order'} } - keys %constraints - ) { - my $def = $constraints{ $constraint_name }; - my $constraint = $table->add_constraint( - name => $constraint_name, - type => $def->{'type'}, - fields => $def->{'fields'}, - ) or die $table->error; - } + my $sth = $dbh->prepare("show create table $table_name"); + $sth->execute; + my $table = $sth->fetchrow_hashref; + $create .= $table->{'create table'} . ";\n\n"; } + SQL::Translator::Parser::MySQL::parse( $tr, $create ); + return 1; } @@ -195,7 +78,7 @@ sub parse { =head1 AUTHOR -Ken Y. Clark Ekclark@cpan.orgE. +Ken Youens-Clark Ekclark@cpan.orgE. =head1 SEE ALSO