X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2Fmysql.pm;h=dae685c5c894f4f10addd9978794843c5b886b24;hb=5fc335ab21e8dcf1ddbc9801a8486e6c613bc643;hp=f62162d4252b681bb75dab61c3ef2781a05c0983;hpb=2fa86d8bd9376b6978fc964dabffbb8bff14d697;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 f62162d..dae685c 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
@@ -11,7 +11,7 @@ use Try::Tiny;
 use namespace::clean;
 use DBIx::Class::Schema::Loader::Table ();
 
-our $VERSION = '0.07010';
+our $VERSION = '0.07015';
 
 =head1 NAME
 
@@ -37,7 +37,7 @@ sub _setup {
 
     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: $_";
@@ -45,13 +45,19 @@ sub _setup {
 
         @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;
 
@@ -89,6 +95,16 @@ sub _table_fk_info {
         my @f_cols = map { s/$qt//g; $self->_lc($_) }
             split(/$qt?\s*$qt?,$qt?\s*$qt?/, $f_cols);
 
+        # 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;
@@ -127,7 +143,7 @@ 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 $sth = $self->dbh->prepare('SHOW INDEX FROM '.$table->sql_name);
         $sth->execute;
@@ -142,10 +158,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 {