Merge branch 'master' into custom_column_info

[dbsrgits/DBIx-Class-Schema-Loader.git] / lib / DBIx / Class / Schema / Loader / Base.pm

diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm
index 33642f0..4f57523 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@ -1545,9 +1545,11 @@ sub _make_pod {
            $self->_pod( $class,
                         join "\n", map {
                             my $s = $attrs->{$_};
-                            $s = !defined $s      ? 'undef'          :
-                                 length($s) == 0  ? '(empty string)' :
-                                                     $s;
+                            $s = !defined $s         ? 'undef'          :
+                                  length($s) == 0     ? '(empty string)' :
+                                  ref($s) eq 'SCALAR' ? $$s              :
+                                                        $s
+                                  ;
 
                             "  $_: $s"
                         } sort keys %$attrs,
@@ -1611,19 +1613,18 @@ sub _quote_table_name {
 sub _is_case_sensitive { 0 }
 
 sub _custom_column_info {
-    my ( $self, $info ) = @_;
+    my ( $self, $table_name, $column_name, $column_info ) = @_;
 
     if( ref $self->custom_column_info eq 'CODE' ) {
-        return $self->custom_column_info->($info);
+        return $self->custom_column_info->( $table_name, $column_name, $column_info );
     }
     return {};
 }
 
 sub _datetime_column_info {
-    my ( $self, $info, $column_info) = @_;
+    my ( $self, $table_name, $column_name, $column_info ) = @_;
     my $return = {};
-    my $type = lc ( $info->{TYPE_NAME} );
-
+    my $type = lc ( $column_info->{data_type} );
     if (
         ( defined $column_info->{inflate_datetime} and $column_info->{inflate_datetime} )
         or ( defined $column_info->{inflate_date} and $column_info->{inflate_date} )