use List::MoreUtils 'any';
use Try::Tiny;
use namespace::clean;
+use DBIx::Class::Schema::Loader::Table ();
-our $VERSION = '0.07010';
+our $VERSION = '0.07011';
=head1 NAME
if ($self->db_schema && $self->db_schema->[0] eq '%') {
my @schemas = try {
- map $_->[0], @{ $self->dbh->selectall_arrayref('SHOW DATABASES') };
+ $self->_show_databases;
}
catch {
croak "no SHOW DATABASES privileges: $_";
@schemas = grep {
my $schema = $_;
- not any { $schema eq $_ } $self->_system_schemas
+ 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;
my @f_cols = map { s/$qt//g; $self->_lc($_) }
split(/$qt?\s*$qt?,$qt?\s*$qt?/, $f_cols);
- my $remote_table = first {
- lc($_->name) eq lc($f_table)
- && ((not $f_schema) || lc($_->schema) eq lc($f_schema))
- } $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,
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 $sth = $self->dbh->prepare('SHOW INDEX FROM '.$table->sql_name);
$sth->execute;
@{$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 {