From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sun, 26 Sep 2010 16:59:57 +0000 (+0200)
Subject: Minor cleanup of memory cycle tracing and IC::DT inflator selector logic
X-Git-Tag: v0.08124~64
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=226d1c35c31ebc68b3214fe8b33912d06d2c5b2f;p=dbsrgits%2FDBIx-Class.git

Minor cleanup of memory cycle tracing and IC::DT inflator selector logic
---

diff --git a/lib/DBIx/Class/InflateColumn/DateTime.pm b/lib/DBIx/Class/InflateColumn/DateTime.pm
index dda4a10..1b0127d 100644
--- a/lib/DBIx/Class/InflateColumn/DateTime.pm
+++ b/lib/DBIx/Class/InflateColumn/DateTime.pm
@@ -135,64 +135,53 @@ sub register_column {
     } elsif ($type eq "smalldatetime") {
       $type = "datetime";
       $info->{_ic_dt_method} ||= "smalldatetime";
+    } else {
+      $info->{_ic_dt_method} ||= $type;
     }
   }
 
-  if ($info->{extra}) {
-    if ( defined $info->{extra}{timezone} ) {
-      carp "Putting timezone into extra => { timezone => '...' } has been deprecated, ".
-           "please put it directly into the '$column' column definition.";
-      $info->{timezone} = $info->{extra}{timezone} unless defined $info->{timezone};
-    }
+  return unless ($type eq 'datetime' || $type eq 'date' || $type eq 'timestamp');
 
-    if ( defined $info->{extra}{locale} ) {
-     carp "Putting locale into extra => { locale => '...' } has been deprecated, ".
-          "please put it directly into the '$column' column definition.";
-     $info->{locale} = $info->{extra}{locale} unless defined $info->{locale};
+  if ($info->{extra}) {
+    for my $slot (qw/timezone locale floating_tz_ok/) {
+      if ( defined $info->{extra}{$slot} ) {
+        carp "Putting $slot into extra => { $slot => '...' } has been deprecated, ".
+             "please put it directly into the '$column' column definition.";
+        $info->{$slot} = $info->{extra}{$slot} unless defined $info->{$slot};
+      }
     }
   }
 
-  my $undef_if_invalid = $info->{datetime_undef_if_invalid};
-
-  if ($type eq 'datetime' || $type eq 'date' || $type eq 'timestamp') {
-    # This shallow copy of %info avoids t/52_cycle.t treating
-    # the resulting deflator as a circular reference.
-    my %info = ( '_ic_dt_method' => $type , %{ $info } );
-
-    if (defined $info->{extra}{floating_tz_ok}) {
-      carp "Putting floating_tz_ok into extra => { floating_tz_ok => 1 } has been deprecated, ".
-           "please put it directly into the '$column' column definition.";
-      $info{floating_tz_ok} = $info->{extra}{floating_tz_ok};
-    }
-
-    $self->inflate_column(
-      $column =>
-        {
-          inflate => sub {
-            my ($value, $obj) = @_;
-
-            my $dt = try
-              { $obj->_inflate_to_datetime( $value, \%info ) }
-              catch {
-                $self->throw_exception ("Error while inflating ${value} for ${column} on ${self}: $_")
-                  unless $undef_if_invalid;
-                undef;  # rv
-              };
-
-            return (defined $dt)
-              ? $obj->_post_inflate_datetime( $dt, \%info )
-              : undef
-            ;
-          },
-          deflate => sub {
-            my ($value, $obj) = @_;
-
-            $value = $obj->_pre_deflate_datetime( $value, \%info );
-            $obj->_deflate_from_datetime( $value, \%info );
-          },
-        }
-    );
-  }
+  # shallow copy to avoid unfounded(?) Devel::Cycle complaints
+  my $infcopy = {%$info};
+
+  $self->inflate_column(
+    $column =>
+      {
+        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
+            };
+
+          return (defined $dt)
+            ? $obj->_post_inflate_datetime( $dt, $infcopy )
+            : undef
+          ;
+        },
+        deflate => sub {
+          my ($value, $obj) = @_;
+
+          $value = $obj->_pre_deflate_datetime( $value, $infcopy );
+          $obj->_deflate_from_datetime( $value, $infcopy );
+        },
+      }
+  );
 }
 
 sub _flate_or_fallback
diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index df4a3ac..e430d04 100644
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -114,7 +114,7 @@ my $reqs = {
     },
   },
 
-  test_cycle => {
+  test_leaks => {
     req => {
       'Test::Memory::Cycle'       => '0',
       'Devel::Cycle'              => '1.10',
diff --git a/t/52cycle.t b/t/52leaks.t
similarity index 92%
rename from t/52cycle.t
rename to t/52leaks.t
index d3d88d5..7ecec49 100644
--- a/t/52cycle.t
+++ b/t/52leaks.t
@@ -1,13 +1,14 @@
 use strict;
 use warnings;
+
 use Test::More;
 
 use lib qw(t/lib);
 
 BEGIN {
-  require DBIx::Class;
-  plan skip_all => 'Test needs: ' . DBIx::Class::Optional::Dependencies->req_missing_for ('test_cycle')
-    unless ( DBIx::Class::Optional::Dependencies->req_ok_for ('test_cycle') );
+  require DBIx::Class::Optional::Dependencies;
+  plan skip_all => 'Test needs: ' . DBIx::Class::Optional::Dependencies->req_missing_for ('test_leaks')
+    unless ( DBIx::Class::Optional::Dependencies->req_ok_for ('test_leaks') );
 }
 
 use DBICTest;