Changeset 21707 for lang/perl/DBIx-Class-TimeStamp-Auto

Timestamp:

10/20/08 22:26:15 (5 years ago)

Author:

kamipo

Message:

lang/perl/DBIx-Class-TimeStamp?-Auto: bug fix

Files:

• lang/perl/DBIx-Class-TimeStamp-Auto/lib/DBIx/Class/TimeStamp/Auto.pm (modified) (4 diffs)

lang/perl/DBIx-Class-TimeStamp-Auto/lib/DBIx/Class/TimeStamp/Auto.pm

@@ -11 +11 @@
 sub import {
     my $class = shift;
-    my %columns = @_;
+    my %columns = ref $_[0] eq 'HASH' ? %{$_[0]} : @_;
 
     if (my $create = $columns{auto_create_datetime_columns}) {
@@ -39 +39 @@
     return if ref $attrs ne 'HASH';
 
+    my $now;
     my $timestamp_class = $self->timestamp_class;
-    my $now = $timestamp_class->get_current_datetime;
 
-    defined $attrs->{$_} || $self->is_inflate_datetime_column($_)
-        and $attrs->{$_} = $now for
+    for (
         @{$timestamp_class->auto_create_datetime_columns},
-        @{$timestamp_class->auto_update_datetime_columns};
+        @{$timestamp_class->auto_update_datetime_columns}
+    ) {
+        $attrs->{$_} = $now ||= $timestamp_class->get_current_datetime
+            if !defined $attrs->{$_} and $self->is_inflate_datetime_column($_);
+    }
 };
 
@@ -53 +56 @@
     return if ref $attrs ne 'HASH';
 
+    my $now;
     my $timestamp_class = $self->timestamp_class;
-    my $now = $timestamp_class->get_current_datetime;
 
-    defined $attrs->{$_} || $self->is_inflate_datetime_column($_)
-        and $attrs->{$_} = $now for
-        @{$timestamp_class->auto_update_datetime_columns};
+    for (
+        @{$timestamp_class->auto_update_datetime_columns}
+    ) {
+        $attrs->{$_} = $now ||= $timestamp_class->get_current_datetime
+            if !defined $attrs->{$_} and $self->is_inflate_datetime_column($_);
+    }
 };
 
@@ -87 +93 @@
  
  use base 'DBIx::Class::Schema';
- use DBIx::Class::TimeStamp::Auto
+ use DBIx::Class::TimeStamp::Auto {
      auto_create_datetime_columns => [qw/created_at/],
      auto_update_datetime_columns => [qw/updated_at/],
-     datetime_timezone => 'Asia/Tokyo';
+     datetime_timezone => 'Asia/Tokyo'
+ };
  
  __PACKAGE__->load_classes;