X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2Fmysql.pm;h=7ab0596b12bc6942e5c7176f477ab714c67d05f1;hb=c819561ab07117cbe62d10cd64988ca811ad9149;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..7ab0596 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
@@ -8,10 +8,11 @@ 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.07024';
 
 =head1 NAME
 
@@ -37,7 +38,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 +46,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 +96,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 +144,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 +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 {
@@ -185,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 { $self->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 $@;
 
@@ -263,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';
@@ -291,7 +309,7 @@ sub _table_comment {
                 FROM information_schema.tables
                 WHERE table_schema = schema()
                   AND table_name = ?
-            }, undef, $table);
+            }, undef, $table->name);
         };
         # InnoDB likes to auto-append crap.
         if (not $comment) {
@@ -316,8 +334,8 @@ sub _column_comment {
                 FROM information_schema.columns
                 WHERE table_schema = schema()
                   AND table_name = ?
-                  AND column_name = ?
-            }, undef, $table, $column_name);
+                  AND lower(column_name) = ?
+            }, undef, $table->name, lc($column_name));
         };
     }
     return $comment;