X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2Fmysql.pm;h=79515a7446f2a5d3c80f941fa86801acc52280a9;hb=3de915bcc13aef740372ed107c3076f1a8062d3d;hp=f102b3f7d5bcaa2c56262ff45e6877a1bcc11b8d;hpb=45be2ce774dc5af71a60397db33bc952c22aa489;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 f102b3f..79515a7 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/mysql.pm
@@ -6,7 +6,7 @@ use base 'DBIx::Class::Schema::Loader::DBI';
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.05003';
+our $VERSION = '0.06001';
 
 =head1 NAME
 
@@ -28,18 +28,23 @@ See L<DBIx::Class::Schema::Loader::Base>.
 =cut
 
 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] || '';
+
+    local $dbh->{RaiseError} = 0;
+    local $dbh->{PrintError} = 0;
+
+    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/["`]/;
 
@@ -115,6 +120,58 @@ 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) {
+        delete $info->{size}
+            unless $info->{data_type} =~ /^(?: (?:var)?(?:char(?:acter)?|binary) | bit | year)\z/ix;
+
+        if ($info->{data_type} eq 'int') {
+            $info->{data_type} = 'integer';
+        }
+        elsif ($info->{data_type} eq 'double') {
+            $info->{data_type} = 'double precision';
+        }
+
+        my ($precision, $scale, $column_type) = eval { $dbh->selectrow_array(<<'EOF', {}, lc $table, lc $col) };
+SELECT numeric_precision, numeric_scale, column_type
+FROM information_schema.columns
+WHERE lower(table_name) = ? AND lower(column_name) = ?
+EOF
+        $column_type = '' if not defined $column_type;
+
+        if ($info->{data_type} eq 'bit' && (not exists $info->{size})) {
+            $info->{size} = $precision if defined $precision;
+        }
+        elsif ($info->{data_type} =~ /^(?:float|double precision|decimal)\z/) {
+            if (defined $precision && defined $scale) {
+                if ($precision == 10 && $scale == 0) {
+                    delete $info->{size};
+                }
+                else {
+                    $info->{size} = [$precision,$scale];
+                }
+            }
+        }
+        elsif ($info->{data_type} eq 'year') {
+            if ($column_type =~ /\(2\)/) {
+                $info->{size} = 2;
+            }
+            elsif ($column_type =~ /\(4\)/ || $info->{size} == 4) {
+                delete $info->{size};
+            }
+        }
+    }
+
+    return $result;
+}
+
 sub _extra_column_info {
     no warnings 'uninitialized';
     my ($self, $table, $col, $info, $dbi_info) = @_;
@@ -155,3 +212,4 @@ the same terms as Perl itself.
 =cut
 
 1;
+# vim:et sw=4 sts=4 tw=0: