use strict;
use warnings;
use base qw/DBIx::Class/;
-use Carp::Clan qw/^DBIx::Class/;
+use DBIx::Class::Carp;
use Try::Tiny;
use namespace::clean;
$self->next::method($column, $info, @rest);
- return unless defined($info->{data_type});
-
my $requested_type;
- for (qw/date datetime timestamp/) {
+ for (qw/datetime timestamp date/) {
my $key = "inflate_${_}";
+ if (exists $info->{$key}) {
- next unless exists $info->{$key};
-
- return if ! $info->{$key};
+ # this bailout is intentional
+ return unless $info->{$key};
- $requested_type = $_;
- last;
+ $requested_type = $_;
+ last;
+ }
}
- my $data_type = lc($info->{data_type} || '');
+ return if (!$requested_type and !$info->{data_type});
+
+ my $data_type = lc( $info->{data_type} || '' );
# _ic_dt_method will follow whatever the registration requests
# thus = instead of ||=
elsif ($data_type =~ /^ (?: date | datetime | timestamp ) $/x) {
$info->{_ic_dt_method} = $data_type;
}
- else {
+ elsif ($requested_type) {
$info->{_ic_dt_method} = $requested_type;
}
-
- return unless $info->{_ic_dt_method};
+ else {
+ return;
+ }
if ($info->{extra}) {
for my $slot (qw/timezone locale floating_tz_ok/) {
inflate => sub {
my ($value, $obj) = @_;
- my $dt = try
- { $obj->_inflate_to_datetime( $value, $infcopy ) }
- catch {
- $self->throw_exception ("Error while inflating ${value} for ${column} on ${self}: $_")
- unless $infcopy->{datetime_undef_if_invalid};
- undef; # rv
- };
+ # propagate for error reporting
+ $infcopy->{__dbic_colname} = $column;
+
+ my $dt = $obj->_inflate_to_datetime( $value, $infcopy );
return (defined $dt)
? $obj->_post_inflate_datetime( $dt, $infcopy )
my $parser = $self->_datetime_parser;
my $preferred_method = sprintf($method_fmt, $info->{ _ic_dt_method });
- my $method = $parser->can($preferred_method) ? $preferred_method : sprintf($method_fmt, 'datetime');
- return $parser->$method($value);
+ my $method = $parser->can($preferred_method) || sprintf($method_fmt, 'datetime');
+
+ return try {
+ $parser->$method($value);
+ }
+ catch {
+ $self->throw_exception ("Error while inflating '$value' for $info->{__dbic_colname} on ${self}: $_")
+ unless $info->{datetime_undef_if_invalid};
+ undef; # rv
+ };
}
sub _inflate_to_datetime {
can be found in the documentation for L<DBIx::Class::ResultSource>.
=item Further discussion of problems inherent to the Floating timezone:
- L<Floating DateTimes|DateTime/Floating_DateTimes>
+ L<Floating DateTimes|DateTime/Floating DateTimes>
and L<< $dt->set_time_zone|DateTime/"Set" Methods >>
=back