X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2Fmysql.pm;h=705bc02c32ce9a3802c01890ef6c753923c85c33;hb=7c2059da9f662c629f53eca5cef10f66380f77b5;hp=cb83e7a16ea3ef2d105357b2af910336df3e6f54;hpb=e00d61acf4f772083500a04783a8bce56dc322bf;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 cb83e7a..705bc02 100644 --- a/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm +++ b/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm @@ -4,10 +4,15 @@ use strict; use warnings; use base 'DBIx::Class::Schema::Loader::DBI'; use mro 'c3'; +use Carp::Clan qw/^DBIx::Class/; use List::Util 'first'; +use List::MoreUtils 'any'; +use Try::Tiny; +use Scalar::Util 'blessed'; use namespace::clean; +use DBIx::Class::Schema::Loader::Table (); -our $VERSION = '0.07010'; +our $VERSION = '0.07022'; =head1 NAME @@ -30,6 +35,34 @@ sub _setup { if (not defined $self->preserve_case) { $self->preserve_case(0); } + + if ($self->db_schema && $self->db_schema->[0] eq '%') { + my @schemas = try { + $self->_show_databases; + } + catch { + croak "no SHOW DATABASES privileges: $_"; + }; + + @schemas = grep { + my $schema = $_; + not any { lc($schema) eq lc($_) } $self->_system_schemas + } @schemas; + + $self->db_schema(\@schemas); + } +} + +sub _show_databases { + my $self = shift; + + return map $_->[0], @{ $self->dbh->selectall_arrayref('SHOW DATABASES') }; +} + +sub _system_schemas { + my $self = shift; + + return ($self->next::method(@_), 'mysql'); } sub _tables_list { @@ -41,32 +74,60 @@ sub _tables_list { sub _table_fk_info { my ($self, $table) = @_; - my $dbh = $self->schema->storage->dbh; - - my $table_def_ref = eval { $dbh->selectrow_arrayref("SHOW CREATE TABLE `$table`") }; + my $table_def_ref = eval { $self->dbh->selectrow_arrayref("SHOW CREATE TABLE ".$table->sql_name) }; my $table_def = $table_def_ref->[1]; return [] if not $table_def; - my $qt = qr/["`]/; + my $qt = qr/["`]/; + my $nqt = qr/[^"`]/; my (@reldata) = ($table_def =~ - /CONSTRAINT $qt.*$qt FOREIGN KEY \($qt(.*)$qt\) REFERENCES $qt(.*)$qt \($qt(.*)$qt\)/ig + /CONSTRAINT ${qt}${nqt}+${qt} FOREIGN KEY \($qt(.*)$qt\) REFERENCES (?:$qt($nqt+)$qt\.)?$qt($nqt+)$qt \($qt(.+)$qt\)/ig ); my @rels; while (scalar @reldata > 0) { - my $cols = shift @reldata; - my $f_table = shift @reldata; - my $f_cols = shift @reldata; + my ($cols, $f_schema, $f_table, $f_cols) = splice @reldata, 0, 4; - my @cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; $self->_lc($_) } + my @cols = map { s/$qt//g; $self->_lc($_) } split(/$qt?\s*$qt?,$qt?\s*$qt?/, $cols); - my @f_cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; $self->_lc($_) } + my @f_cols = map { s/$qt//g; $self->_lc($_) } split(/$qt?\s*$qt?,$qt?\s*$qt?/, $f_cols); - my $remote_table = first { $_ =~ /^${f_table}\z/i } $self->_tables_list; + # Match case of remote schema to that in SHOW DATABASES, if it's there + # and we have permissions to run SHOW DATABASES. + if ($f_schema) { + my $matched = first { + lc($_) eq lc($f_schema) + } try { $self->_show_databases }; + + $f_schema = $matched if $matched; + } + + my $remote_table = do { + # Get ->tables_list to return tables from the remote schema, in case it is not in the db_schema list. + local $self->{db_schema} = [ $f_schema ] if $f_schema; + + first { + lc($_->name) eq lc($f_table) + && ((not $f_schema) || lc($_->schema) eq lc($f_schema)) + } $self->_tables_list; + }; + + # The table may not be in any database, or it may not have been found by the previous code block for whatever reason. + if (not $remote_table) { + my $remote_schema = $f_schema || $self->db_schema && @{ $self->db_schema } == 1 && $self->db_schema->[0]; + + $remote_table = DBIx::Class::Schema::Loader::Table->new( + loader => $self, + name => $f_table, + ($remote_schema ? ( + schema => $remote_schema, + ) : ()), + ); + } push(@rels, { local_columns => \@cols, @@ -83,10 +144,9 @@ sub _table_fk_info { sub _mysql_table_get_keys { my ($self, $table) = @_; - if(!exists($self->{_cache}->{_mysql_keys}->{$table})) { + if(!exists($self->{_cache}->{_mysql_keys}->{$table->sql_name})) { my %keydata; - my $dbh = $self->schema->storage->dbh; - my $sth = $dbh->prepare('SHOW INDEX FROM '.$self->_table_as_sql($table)); + my $sth = $self->dbh->prepare('SHOW INDEX FROM '.$table->sql_name); $sth->execute; while(my $row = $sth->fetchrow_hashref) { next if $row->{Non_unique}; @@ -99,10 +159,10 @@ sub _mysql_table_get_keys { @{$keydata{$keyname}}; $keydata{$keyname} = \@ordered_cols; } - $self->{_cache}->{_mysql_keys}->{$table} = \%keydata; + $self->{_cache}->{_mysql_keys}->{$table->sql_name} = \%keydata; } - return $self->{_cache}->{_mysql_keys}->{$table}; + return $self->{_cache}->{_mysql_keys}->{$table->sql_name}; } sub _table_pk_info { @@ -130,8 +190,6 @@ sub _columns_info_for { my $result = $self->next::method(@_); - my $dbh = $self->schema->storage->dbh; - while (my ($col, $info) = each %$result) { if ($info->{data_type} eq 'int') { $info->{data_type} = 'integer'; @@ -144,10 +202,10 @@ sub _columns_info_for { delete $info->{size} if $data_type !~ /^(?: (?:var)?(?:char(?:acter)?|binary) | bit | year)\z/ix; # information_schema is available in 5.0+ - my ($precision, $scale, $column_type, $default) = eval { $dbh->selectrow_array(<<'EOF', {}, $table, $col) }; + my ($precision, $scale, $column_type, $default) = eval { $self->dbh->selectrow_array(<<'EOF', {}, $table->name, lc($col)) }; SELECT numeric_precision, numeric_scale, column_type, column_default FROM information_schema.columns -WHERE table_name = ? AND column_name = ? +WHERE table_name = ? AND lower(column_name) = ? EOF my $has_information_schema = not $@; @@ -222,7 +280,8 @@ sub _extra_column_info { if ($dbi_info->{mysql_values}) { $extra_info{extra}{list} = $dbi_info->{mysql_values}; } - if ( lc($dbi_info->{COLUMN_DEF}) eq 'current_timestamp' + if ((not blessed $dbi_info) # isa $sth + && lc($dbi_info->{COLUMN_DEF}) eq 'current_timestamp' && lc($dbi_info->{mysql_type_name}) eq 'timestamp') { my $current_timestamp = 'current_timestamp'; @@ -241,6 +300,47 @@ sub _dbh_column_info { $self->next::method(@_); } +sub _table_comment { + my ( $self, $table ) = @_; + my $comment = $self->next::method($table); + if (not $comment) { + ($comment) = try { $self->schema->storage->dbh->selectrow_array( + qq{SELECT table_comment + FROM information_schema.tables + WHERE table_schema = schema() + AND table_name = ? + }, undef, $table->name); + }; + # InnoDB likes to auto-append crap. + if (not $comment) { + # Do nothing. + } + elsif ($comment =~ /^InnoDB free:/) { + $comment = undef; + } + else { + $comment =~ s/; InnoDB.*//; + } + } + return $comment; +} + +sub _column_comment { + my ( $self, $table, $column_number, $column_name ) = @_; + my $comment = $self->next::method($table, $column_number, $column_name); + if (not $comment) { + ($comment) = try { $self->schema->storage->dbh->selectrow_array( + qq{SELECT column_comment + FROM information_schema.columns + WHERE table_schema = schema() + AND table_name = ? + AND lower(column_name) = ? + }, undef, $table->name, lc($column_name)); + }; + } + return $comment; +} + =head1 SEE ALSO L, L,