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_12';
+our $VERSION = '0.05001';
=head1 NAME
}
# Make sure data_type's that don't need it don't have a 'size' column_info, and
-# set the correct precision for datetime types.
+# set the correct precision for datetime and varbit types.
sub _columns_info_for {
my $self = shift;
my ($table) = @_;
/^(?:bigint|int8|bigserial|serial8|bit|boolean|bool|box|bytea|cidr|circle|date|double precision|float8|inet|integer|int|int4|line|lseg|macaddr|money|path|point|polygon|real|float4|smallint|int2|serial|serial4|text)\z/i) {
delete $result->{$col}{size};
}
-
- # for datetime types, check if it has a precision or not
- if ($data_type =~ /^(?:interval|time|timestamp)\b/) {
+# for datetime types, check if it has a precision or not
+ elsif ($data_type =~ /^(?:interval|time|timestamp)\b/i) {
my ($precision) = $self->schema->storage->dbh
->selectrow_array(<<EOF, {}, $table, $col);
SELECT datetime_precision
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 {
$result->{$col}{size} = $precision;
}
}
+ elsif ($data_type =~ /^(?:bit varying|varbit)\z/i) {
+ my ($precision) = $self->schema->storage->dbh
+ ->selectrow_array(<<EOF, {}, $table, $col);
+SELECT character_maximum_length
+FROM information_schema.columns
+WHERE table_name = ? and column_name = ?
+EOF
+
+ $result->{$col}{size} = $precision;
+ }
+ 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;