use warnings;
use base 'DBIx::Class::Schema::Loader::DBI';
use Carp::Clan qw/^DBIx::Class/;
-use Class::C3;
+use mro 'c3';
-our $VERSION = '0.07000';
+our $VERSION = '0.07005';
=head1 NAME
my $dbh = $self->schema->storage->dbh;
while (my ($col, $info) = each %$result) {
- delete $info->{size}
- unless $info->{data_type} =~ /^(?: (?:var)?(?:char(?:acter)?|binary) | bit | year)\z/ix;
+ delete $info->{size} if $info->{data_type} !~ /^(?: (?:var)?(?:char(?:acter)?|binary) | bit | year)\z/ix;
if ($info->{data_type} eq 'int') {
$info->{data_type} = 'integer';
$info->{data_type} = 'double precision';
}
- my ($precision, $scale, $column_type) = eval { $dbh->selectrow_array(<<'EOF', {}, lc $table, lc $col) };
-SELECT numeric_precision, numeric_scale, column_type
+ # information_schema is available in 5.0+
+ my ($precision, $scale, $column_type, $default) = eval { $dbh->selectrow_array(<<'EOF', {}, $table, $col) };
+SELECT numeric_precision, numeric_scale, column_type, column_default
FROM information_schema.columns
-WHERE lower(table_name) = ? AND lower(column_name) = ?
+WHERE table_name = ? AND column_name = ?
EOF
+ my $has_information_schema = not defined $@;
+
$column_type = '' if not defined $column_type;
if ($info->{data_type} eq 'bit' && (not exists $info->{size})) {
$info->{size} = $precision if defined $precision;
}
- elsif ($info->{data_type} =~ /^(?:float|double precision|decimal)\z/) {
+ elsif ($info->{data_type} =~ /^(?:float|double precision|decimal)\z/i) {
if (defined $precision && defined $scale) {
if ($precision == 10 && $scale == 0) {
delete $info->{size};
delete $info->{size};
}
}
+ elsif ($info->{data_type} =~ /^(?:date(?:time)?|timestamp)\z/) {
+ if (not (defined $self->datetime_undef_if_invalid && $self->datetime_undef_if_invalid == 0)) {
+ $info->{datetime_undef_if_invalid} = 1;
+ }
+ }
+
+ # Sometimes apparently there's a bug where default_value gets set to ''
+ # for things that don't actually have or support that default (like ints.)
+ if (exists $info->{default_value} && $info->{default_value} eq '') {
+ if ($has_information_schema) {
+ if (not defined $default) {
+ delete $info->{default_value};
+ }
+ }
+ else { # just check if it's a char/text type, otherwise remove
+ delete $info->{default_value} unless $info->{data_type} =~ /char|text/i;
+ }
+ }
}
return $result;
if ( lc($dbi_info->{COLUMN_DEF}) eq 'current_timestamp'
&& lc($dbi_info->{mysql_type_name}) eq 'timestamp') {
- $extra_info{default_value} = \'CURRENT_TIMESTAMP';
+ my $current_timestamp = 'current_timestamp';
+ $extra_info{default_value} = \$current_timestamp;
}
return \%extra_info;
}
+sub _dbh_column_info {
+ my $self = shift;
+
+ local $SIG{__WARN__} = sub { warn @_
+ unless $_[0] =~ /^column_info: unrecognized column type/ };
+
+ $self->next::method(@_);
+}
+
=head1 SEE ALSO
L<DBIx::Class::Schema::Loader>, L<DBIx::Class::Schema::Loader::Base>,