X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FPg.pm;h=36ae47d0dc008d56ee597e9198ca7c92be2d726d;hb=b065e3dfdba7c7e758e07c062129f317708d32fb;hp=3ad65caf74c9841038f0e9fc1a5604c5849082d0;hpb=d4d1a66537ac1f621fff581d33976722f0a9d1dc;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
index 3ad65ca..36ae47d 100644
--- a/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
+++ b/lib/DBIx/Class/Schema/Loader/DBI/Pg.pm
@@ -2,11 +2,14 @@ package DBIx::Class::Schema::Loader::DBI::Pg;
 
 use strict;
 use warnings;
-use base 'DBIx::Class::Schema::Loader::DBI';
+use base qw/
+    DBIx::Class::Schema::Loader::DBI::Component::QuotedDefault
+    DBIx::Class::Schema::Loader::DBI
+/;
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 
-our $VERSION = '0.04999_13';
+our $VERSION = '0.06000';
 
 =head1 NAME
 
@@ -139,7 +142,7 @@ sub _columns_info_for {
             delete $result->{$col}{size};
         }
 # for datetime types, check if it has a precision or not
-        elsif ($data_type =~ /^(?:interval|time|timestamp)\b/) {
+        elsif ($data_type =~ /^(?:interval|time|timestamp)\b/i) {
             my ($precision) = $self->schema->storage->dbh
                 ->selectrow_array(<<EOF, {}, $table, $col);
 SELECT datetime_precision
@@ -147,7 +150,26 @@ FROM information_schema.columns
 WHERE table_name = ? and column_name = ?
 EOF
 
-            if ((not $precision) || $precision !~ /^\d/) {
+            if ($data_type =~ /^time\b/i) {
+                if ((not $precision) || $precision !~ /^\d/) {
+                    delete $result->{$col}{size};
+                }
+                else {
+                    my ($integer_datetimes) = $self->schema->storage->dbh
+                        ->selectrow_array('show integer_datetimes');
+
+                    my $max_precision =
+                        $integer_datetimes =~ /^on\z/i ? 6 : 10;
+
+                    if ($precision == $max_precision) {
+                        delete $result->{$col}{size};
+                    }
+                    else {
+                        $result->{$col}{size} = $precision;
+                    }
+                }
+            }
+            elsif ((not $precision) || $precision !~ /^\d/ || $precision == 6) {
                 delete $result->{$col}{size};
             }
             else {
@@ -164,28 +186,23 @@ EOF
 
             $result->{$col}{size} = $precision;
         }
-        elsif ($data_type =~ /^(?:numeric|decimal)\z/i) {
-            my $size = $result->{$col}{size};
+        elsif ($data_type =~ /^(?:numeric|decimal)\z/i && (my $size = $result->{$col}{size})) {
             $size =~ s/\s*//g;
 
             my ($scale, $precision) = split /,/, $size;
 
             $result->{$col}{size} = [ $precision, $scale ];
         }
-    }
-
-    return $result;
-}
-
-sub _extra_column_info {
-    my ($self, $info) = @_;
-    my %extra_info;
 
-    if ($info->{COLUMN_DEF} && $info->{COLUMN_DEF} =~ /\bnextval\(/i) {
-        $extra_info{is_auto_increment} = 1;
+# process SERIAL columns
+        if (ref($result->{$col}{default_value}) eq 'SCALAR' && ${ $result->{$col}{default_value} } =~ /\bnextval\(['"](\w+)/i) {
+            $result->{$col}{is_auto_increment} = 1;
+            $result->{$col}{sequence}          = $1;
+            delete $result->{$col}{default_value};
+        }
     }
 
-    return \%extra_info;
+    return $result;
 }
 
 =head1 SEE ALSO