X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2Fmysql.pm;h=cb83e7a16ea3ef2d105357b2af910336df3e6f54;hb=e00d61acf4f772083500a04783a8bce56dc322bf;hp=c70ff8d941afca2b58cdbcdada04bf765511b457;hpb=04e60ed2698d8c8cf2d817cace84f94827bbbc4f;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 c70ff8d..cb83e7a 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
@@ -3,43 +3,50 @@ package DBIx::Class::Schema::Loader::DBI::mysql;
 use strict;
 use warnings;
 use base 'DBIx::Class::Schema::Loader::DBI';
-use Carp::Clan qw/^DBIx::Class/;
-use Class::C3;
+use mro 'c3';
+use List::Util 'first';
+use namespace::clean;
 
-our $VERSION = '0.04999_14';
+our $VERSION = '0.07010';
 
 =head1 NAME
 
 DBIx::Class::Schema::Loader::DBI::mysql - DBIx::Class::Schema::Loader::DBI mysql Implementation.
 
-=head1 SYNOPSIS
+=head1 DESCRIPTION
 
-  package My::Schema;
-  use base qw/DBIx::Class::Schema::Loader/;
+See L<DBIx::Class::Schema::Loader> and L<DBIx::Class::Schema::Loader::Base>.
 
-  __PACKAGE__->loader_options( debug => 1 );
+=cut
 
-  1;
+sub _setup {
+    my $self = shift;
 
-=head1 DESCRIPTION
+    $self->schema->storage->sql_maker->quote_char("`");
+    $self->schema->storage->sql_maker->name_sep(".");
 
-See L<DBIx::Class::Schema::Loader::Base>.
+    $self->next::method(@_);
 
-=cut
+    if (not defined $self->preserve_case) {
+        $self->preserve_case(0);
+    }
+}
 
 sub _tables_list { 
-    my $self = shift;
+    my ($self, $opts) = @_;
 
-    return $self->next::method(undef, undef);
+    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 $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/["`]/;
 
@@ -53,16 +60,18 @@ sub _table_fk_info {
         my $f_table = shift @reldata;
         my $f_cols = shift @reldata;
 
-        my @cols   = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; 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 | $qt )//x; $self->_lc($_) }
+            split(/$qt?\s*$qt?,$qt?\s*$qt?/, $f_cols);
 
-        my @f_cols = map { s/(?: \Q$self->{_quoter}\E | $qt )//x; lc $_ }
-            split(/\s*,\s*/, $f_cols);
+        my $remote_table = first { $_ =~ /^${f_table}\z/i } $self->_tables_list;
 
         push(@rels, {
             local_columns => \@cols,
             remote_columns => \@f_cols,
-            remote_table => $f_table
+            remote_table => $remote_table,
         });
     }
 
@@ -82,7 +91,7 @@ sub _mysql_table_get_keys {
         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) {
@@ -115,29 +124,123 @@ 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) {
+        if ($info->{data_type} eq 'int') {
+            $info->{data_type} = 'integer';
+        }
+        elsif ($info->{data_type} eq 'double') {
+            $info->{data_type} = 'double precision';
+        }
+        my $data_type = $info->{data_type};
+
+        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) };
+SELECT numeric_precision, numeric_scale, column_type, column_default
+FROM information_schema.columns
+WHERE table_name = ? AND column_name = ?
+EOF
+        my $has_information_schema = not $@;
+
+        $column_type = '' if not defined $column_type;
+
+        if ($data_type eq 'bit' && (not exists $info->{size})) {
+            $info->{size} = $precision if defined $precision;
+        }
+        elsif ($data_type =~ /^(?:float|double precision|decimal)\z/i) {
+            if (defined $precision && defined $scale) {
+                if ($precision == 10 && $scale == 0) {
+                    delete $info->{size};
+                }
+                else {
+                    $info->{size} = [$precision,$scale];
+                }
+            }
+        }
+        elsif ($data_type eq 'year') {
+            if ($column_type =~ /\(2\)/) {
+                $info->{size} = 2;
+            }
+            elsif ($column_type =~ /\(4\)/ || $info->{size} == 4) {
+                delete $info->{size};
+            }
+        }
+        elsif ($data_type =~ /^(?:date(?:time)?|timestamp)\z/) {
+            if (not (defined $self->datetime_undef_if_invalid && $self->datetime_undef_if_invalid == 0)) {
+                $info->{datetime_undef_if_invalid} = 1;
+            }
+        }
+        elsif ($data_type =~ /^(?:enum|set)\z/ && $has_information_schema
+               && $column_type =~ /^(?:enum|set)\(/) {
+
+            delete $info->{extra}{list};
+
+            while ($column_type =~ /'((?:[^']* (?:''|\\')* [^']*)* [^\\'])',?/xg) {
+                my $el = $1;
+                $el =~ s/''/'/g;
+                push @{ $info->{extra}{list} }, $el;
+            }
+        }
+
+        # Sometimes apparently there's a bug where default_value gets set to ''
+        # for things that don't actually have or support that default (like ints.)
+        if (exists $info->{default_value} && $info->{default_value} eq '') {
+            if ($has_information_schema) {
+                if (not defined $default) {
+                    delete $info->{default_value};
+                }
+            }
+            else { # just check if it's a char/text type, otherwise remove
+                delete $info->{default_value} unless $data_type =~ /char|text/i;
+            }
+        }
+    }
+
+    return $result;
+}
+
 sub _extra_column_info {
     no warnings 'uninitialized';
-    my ($self, $info) = @_;
+    my ($self, $table, $col, $info, $dbi_info) = @_;
     my %extra_info;
 
-    if ($info->{mysql_is_auto_increment}) {
+    if ($dbi_info->{mysql_is_auto_increment}) {
         $extra_info{is_auto_increment} = 1
     }
-    if ($info->{mysql_type_name} =~ /\bunsigned\b/i) {
+    if ($dbi_info->{mysql_type_name} =~ /\bunsigned\b/i) {
         $extra_info{extra}{unsigned} = 1;
     }
-    if ($info->{mysql_values}) {
-        $extra_info{extra}{list} = $info->{mysql_values};
+    if ($dbi_info->{mysql_values}) {
+        $extra_info{extra}{list} = $dbi_info->{mysql_values};
     }
-# XXX we need to distinguish between DEFAULT CURRENT_TIMESTAMP and DEFAULT 'foo'
-# somehow, but DBI column_info doesn't preserve quotes.
-    if ($info->{COLUMN_DEF} =~ /^CURRENT_TIMESTAMP\z/i) {
-        $extra_info{default_value} = \'CURRENT_TIMESTAMP';
+    if (   lc($dbi_info->{COLUMN_DEF})      eq 'current_timestamp'
+        && lc($dbi_info->{mysql_type_name}) eq 'timestamp') {
+
+        my $current_timestamp = 'current_timestamp';
+        $extra_info{default_value} = \$current_timestamp;
     }
 
     return \%extra_info;
 }
 
+sub _dbh_column_info {
+    my $self = shift;
+
+    local $SIG{__WARN__} = sub { warn @_
+        unless $_[0] =~ /^column_info: unrecognized column type/ };
+
+    $self->next::method(@_);
+}
+
 =head1 SEE ALSO
 
 L<DBIx::Class::Schema::Loader>, L<DBIx::Class::Schema::Loader::Base>,
@@ -155,3 +258,4 @@ the same terms as Perl itself.
 =cut
 
 1;
+# vim:et sw=4 sts=4 tw=0: