Fix to columns_info_for for type(size)

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI.pm

diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm
index 0da5731..ded90f5 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@ -521,43 +521,57 @@ Returns database type info for a given table columns.
 
 =cut
 
-# override this in a subclass if your DBD ->can('column_info'),
-#  but the call itself is horribly broken.
-sub _column_info_broken { 0 }
-
 sub columns_info_for {
     my ($self, $table) = @_;
 
+    if ($self->dbh->can('column_info')) {
+        my %result;
+        my $old_raise_err = $self->dbh->{RaiseError};
+        my $old_print_err = $self->dbh->{PrintError};
+        $self->dbh->{RaiseError} = 1;
+        $self->dbh->{PrintError} = 0;
+        eval {
+            my $sth = $self->dbh->column_info( undef, undef, $table, '%' );
+            $sth->execute();
+            while ( my $info = $sth->fetchrow_hashref() ){
+                my %column_info;
+                $column_info{data_type}     = $info->{TYPE_NAME};
+                $column_info{size}          = $info->{COLUMN_SIZE};
+                $column_info{is_nullable}   = $info->{NULLABLE} ? 1 : 0;
+                $column_info{default_value} = $info->{COLUMN_DEF};
+
+                $result{$info->{COLUMN_NAME}} = \%column_info;
+            }
+        };
+        $self->dbh->{RaiseError} = $old_raise_err;
+        $self->dbh->{PrintError} = $old_print_err;
+        return \%result if !$@;
+    }
+
     my %result;
-    if ( $self->dbh->can( 'column_info' ) && !$self->_column_info_broken){
-        my $sth = $self->dbh->column_info( undef, undef, $table, '%' );
-        $sth->execute();
-        while ( my $info = $sth->fetchrow_hashref() ){
-            my %column_info;
-            $column_info{data_type} = $info->{TYPE_NAME};
-            $column_info{size} = $info->{COLUMN_SIZE};
-            $column_info{is_nullable} = $info->{NULLABLE} ? 1 : 0;
-            $column_info{default_value} = $info->{COLUMN_DEF};
-            $result{$info->{COLUMN_NAME}} = \%column_info;
+    my $sth = $self->dbh->prepare("SELECT * FROM $table WHERE 1=0");
+    $sth->execute;
+    my @columns = @{$sth->{NAME_lc}};
+    for my $i ( 0 .. $#columns ){
+        my %column_info;
+        my $type_num = $sth->{TYPE}->[$i];
+        my $type_name;
+        if(defined $type_num && $self->dbh->can('type_info')) {
+            my $type_info = $self->dbh->type_info($type_num);
+            $type_name = $type_info->{TYPE_NAME} if $type_info;
         }
-    } else {
-        my $sth = $self->dbh->prepare("SELECT * FROM $table WHERE 1=0");
-        $sth->execute;
-        my @columns = @{$sth->{NAME_lc}};
-        for my $i ( 0 .. $#columns ){
-            my %column_info;
-            my $type_num = $sth->{TYPE}->[$i];
-            my $type_name;
-            if(defined $type_num && $self->dbh->can('type_info')) {
-                my $type_info = $self->dbh->type_info($type_num);
-                $type_name = $type_info->{TYPE_NAME} if $type_info;
-            }
-            $column_info{data_type} = $type_name ? $type_name : $type_num;
-            $column_info{size} = $sth->{PRECISION}->[$i];
-            $column_info{is_nullable} = $sth->{NULLABLE}->[$i] ? 1 : 0;
-            $result{$columns[$i]} = \%column_info;
+        $column_info{data_type} = $type_name ? $type_name : $type_num;
+        $column_info{size} = $sth->{PRECISION}->[$i];
+        $column_info{is_nullable} = $sth->{NULLABLE}->[$i] ? 1 : 0;
+
+        if ($column_info{data_type} =~ m/^(.*?)\((.*?)\)$/) {
+            $column_info{data_type} = $1;
+            $column_info{size}      = $2;
         }
+
+        $result{$columns[$i]} = \%column_info;
     }
+
     return \%result;
 }