X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FDBI%2FPg.pm;h=d06d7c9fbd4023773bc4573949c5bc6d512f5acf;hb=dc767cd32c6728d4d9c3504acd259c0b2f19da2b;hp=80cc8d67dfb70577dcea2258e874f2b039f18fd9;hpb=43b982eac92d69cfcc6cf330679bfe72320c6bf7;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 80cc8d6..d06d7c9 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_14'; +our $VERSION = '0.05001'; =head1 NAME @@ -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 {