X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2Fmysql.pm;h=2e227298b46c982b8c08a3cc8a1e5e92889ec1f2;hb=bc1cb85e84e6a30c75763edd478378a68009c722;hp=485b881f3cf2bf290e5d39b75c28530f5dd0aabd;hpb=28b4691da7f640a8df40780bdac200b513cf132d;p=dbsrgits%2FDBIx-Class-Schema-Loader.git diff --git a/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm b/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm index 485b881..2e22729 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm @@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI'; use Carp::Clan qw/^DBIx::Class/; use Class::C3; -our $VERSION = '0.04001'; +our $VERSION = '0.07000'; =head1 NAME @@ -27,31 +27,37 @@ See L. =cut -# had to override here because MySQL apparently -# doesn't support '%' syntax. Perhaps the other -# drivers support this syntax also, but I didn't -# want to risk breaking some esoteric DBD::foo version -# in a maint release... -sub _tables_list { +sub _setup { my $self = shift; - my $dbh = $self->schema->storage->dbh; - my @tables = $dbh->tables(undef, $self->db_schema, undef, undef); - s/\Q$self->{_quoter}\E//g for @tables; - s/^.*\Q$self->{_namesep}\E// for @tables; + $self->next::method(@_); - return @tables; + if (not defined $self->preserve_case) { + $self->preserve_case(0); + } +} + +sub _tables_list { + my ($self, $opts) = @_; + + return $self->next::method($opts, undef, undef); } sub _table_fk_info { my ($self, $table) = @_; my $dbh = $self->schema->storage->dbh; - my $table_def_ref = $dbh->selectrow_arrayref("SHOW CREATE TABLE `$table`") - or croak ("Cannot get table definition for $table"); - my $table_def = $table_def_ref->[1] || ''; - - my (@reldata) = ($table_def =~ /CONSTRAINT `.*` FOREIGN KEY \(`(.*)`\) REFERENCES `(.*)` \(`(.*)`\)/ig); + + my $table_def_ref = eval { $dbh->selectrow_arrayref("SHOW CREATE TABLE `$table`") }; + my $table_def = $table_def_ref->[1]; + + return [] if not $table_def; + + my $qt = qr/["`]/; + + my (@reldata) = ($table_def =~ + /CONSTRAINT $qt.*$qt FOREIGN KEY \($qt(.*)$qt\) REFERENCES $qt(.*)$qt \($qt(.*)$qt\)/ig + ); my @rels; while (scalar @reldata > 0) { @@ -59,11 +65,11 @@ sub _table_fk_info { my $f_table = shift @reldata; my $f_cols = shift @reldata; - my @cols = map { s/\Q$self->{_quoter}\E//; lc $_ } - split(/\s*,\s*/, $cols); + my @cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; $self->_lc($_) } + split(/$qt?\s*$qt?,$qt?\s*$qt?/, $cols); - my @f_cols = map { s/\Q$self->{_quoter}\E//; lc $_ } - split(/\s*,\s*/, $f_cols); + my @f_cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; $self->_lc($_) } + split(/$qt?\s*$qt?,$qt?\s*$qt?/, $f_cols); push(@rels, { local_columns => \@cols, @@ -83,12 +89,12 @@ sub _mysql_table_get_keys { if(!exists($self->{_cache}->{_mysql_keys}->{$table})) { my %keydata; my $dbh = $self->schema->storage->dbh; - my $sth = $dbh->prepare("SHOW INDEX FROM `$table`"); + my $sth = $dbh->prepare('SHOW INDEX FROM '.$self->_table_as_sql($table)); $sth->execute; while(my $row = $sth->fetchrow_hashref) { next if $row->{Non_unique}; push(@{$keydata{$row->{Key_name}}}, - [ $row->{Seq_in_index}, lc $row->{Column_name} ] + [ $row->{Seq_in_index}, $self->_lc($row->{Column_name}) ] ); } foreach my $keyname (keys %keydata) { @@ -121,11 +127,96 @@ sub _table_uniq_info { return \@uniqs; } +sub _columns_info_for { + my $self = shift; + my ($table) = @_; + + my $result = $self->next::method(@_); + + my $dbh = $self->schema->storage->dbh; + + while (my ($col, $info) = each %$result) { + delete $info->{size} + unless $info->{data_type} =~ /^(?: (?:var)?(?:char(?:acter)?|binary) | bit | year)\z/ix; + + if ($info->{data_type} eq 'int') { + $info->{data_type} = 'integer'; + } + elsif ($info->{data_type} eq 'double') { + $info->{data_type} = 'double precision'; + } + + my ($precision, $scale, $column_type) = eval { $dbh->selectrow_array(<<'EOF', {}, lc $table, lc $col) }; +SELECT numeric_precision, numeric_scale, column_type +FROM information_schema.columns +WHERE lower(table_name) = ? AND lower(column_name) = ? +EOF + $column_type = '' if not defined $column_type; + + if ($info->{data_type} eq 'bit' && (not exists $info->{size})) { + $info->{size} = $precision if defined $precision; + } + elsif ($info->{data_type} =~ /^(?:float|double precision|decimal)\z/) { + if (defined $precision && defined $scale) { + if ($precision == 10 && $scale == 0) { + delete $info->{size}; + } + else { + $info->{size} = [$precision,$scale]; + } + } + } + elsif ($info->{data_type} eq 'year') { + if ($column_type =~ /\(2\)/) { + $info->{size} = 2; + } + elsif ($column_type =~ /\(4\)/ || $info->{size} == 4) { + delete $info->{size}; + } + } + } + + return $result; +} + +sub _extra_column_info { + no warnings 'uninitialized'; + my ($self, $table, $col, $info, $dbi_info) = @_; + my %extra_info; + + if ($dbi_info->{mysql_is_auto_increment}) { + $extra_info{is_auto_increment} = 1 + } + if ($dbi_info->{mysql_type_name} =~ /\bunsigned\b/i) { + $extra_info{extra}{unsigned} = 1; + } + if ($dbi_info->{mysql_values}) { + $extra_info{extra}{list} = $dbi_info->{mysql_values}; + } + if ( lc($dbi_info->{COLUMN_DEF}) eq 'current_timestamp' + && lc($dbi_info->{mysql_type_name}) eq 'timestamp') { + + $extra_info{default_value} = \'CURRENT_TIMESTAMP'; + } + + return \%extra_info; +} + =head1 SEE ALSO L, L, L +=head1 AUTHOR + +See L and L. + +=head1 LICENSE + +This library is free software; you can redistribute it and/or modify it under +the same terms as Perl itself. + =cut 1; +# vim:et sw=4 sts=4 tw=0: