@@ -8,10 +8,10 @@

     - update_timestamp method is DEPRECATED!

       use use now method

     - added EXPEREIMTNAL now method

-    - added EXPERIMENTAL execute created_at method

-    - added EXPERIMETNAL execute updated_at method

+    - added EXPERIMENTAL insert created_at option

+    - added EXPERIMETNAL insert updated_at option

+    - added EXPERIMETNAL update updated_at option

     - added new timestamp system using the above methods and options

-     

 0.1738

     - micro optimization

     - removed example that query pass execute method in documentation

@@ -57,7 +57,9 @@ has [qw/connector dsn password quote user exclude_table user_table_info

             my ($sec, $min, $hour, $mday, $mon, $year) = localtime;

             $mon++;

             $year += 1900;

-            return sprintf("%04d-%02d-%02d %02d:%02d:%02d");

+            my $now = sprintf("%04d-%02d-%02d %02d:%02d:%02d",

+              $year, $mon, $mday, $hour, $min, $sec);

+            return $now;

         }

     },

     query_builder => sub {

@@ -371,6 +373,7 @@ sub execute {

     # Merge second parameter

     my @cleanup;

+    my $saved_param;

     if (ref $param eq 'ARRAY') {

         my $param2 = $param->[1];

         $param = $param->[0];

@@ -382,7 +385,9 @@ sub execute {

             else {

                 delete $param->{$_} for @cleanup;

                 @cleanup = ();

+                $saved_param  = $param;

                 $param = $self->merge_param($param, $param2);

+                delete $saved_param->{$_} for (@{$opt{cleanup} || []});

                 last;

             }

         }

@@ -436,19 +441,6 @@ sub execute {

         }

     }

-    # Created time and updated time

-    if (defined $opt{created_at} || defined $opt{updated_at}) {

-        my $now = $self->now->();

-        if (defined $opt{create_at}) {

-            $param->{$opt{created_at}} = $now;

-            push @cleanup, $opt{created_at};

-        }

-        if (defined $opt{updated_at}) {

-            $param->{$opt{updated_at}} = $now;

-            push @cleanup, $opt{updated_at};

-        }

-    }

-    

     # Cleanup tables(DEPRECATED!)

     $tables = $self->_remove_duplicate_table($tables, $main_table)

       if @$tables > 1;

@@ -527,8 +519,7 @@ sub execute {

       . qq{$query->{sql}\n} . _subname) if $@;

     # Remove id from parameter

-    delete $param->{$_} for @cleanup;

-

+    delete $param->{$_} for (@cleanup, @{$opt{cleanup} || []});

     # DEBUG message

     if ($ENV{DBIX_CUSTOM_DEBUG}) {

@@ -626,7 +617,7 @@ sub insert {

     warn "insert method param option is DEPRECATED!" if $opt{param};

     $param ||= delete $opt{param} || {};

-    # Timestamp

+    # Timestamp(DEPRECATED!)

     if ($opt{timestamp} && (my $insert_timestamp = $self->insert_timestamp)) {

         warn "insert timestamp option is DEPRECATED! use created_at with now attribute";

         my $columns = $insert_timestamp->[0];

@@ -635,6 +626,20 @@ sub insert {

         $value = $value->() if ref $value eq 'CODE';

         $param->{$_} = $value for @$columns;

     }

+

+    # Created time and updated time

+    my @timestamp_cleanup;

+    if (defined $opt{created_at} || defined $opt{updated_at}) {

+        my $now = $self->now->();

+        if (defined $opt{created_at}) {

+            $param->{$opt{created_at}} = $now;

+            push @timestamp_cleanup, $opt{created_at};

+        }

+        if (defined $opt{updated_at}) {

+            $param->{$opt{updated_at}} = $now;

+            push @timestamp_cleanup, $opt{updated_at};

+        }

+    }

     # Merge id to parameter

     my @cleanup;

@@ -663,6 +668,7 @@ sub insert {

     # Execute query

     $opt{statement} = 'insert';

+    $opt{cleanup} = \@timestamp_cleanup;

     $self->execute($sql, $param, %opt);

 }

@@ -1085,7 +1091,7 @@ sub update {

     croak qq{update method where option must be specified } . _subname

       if !$opt{where} && !defined $opt{id} && !$opt{allow_update_all};

-    # Timestamp

+    # Timestamp(DEPRECATED!)

     if ($opt{timestamp} && (my $update_timestamp = $self->update_timestamp)) {

         warn "update timestamp option is DEPRECATED! use updated_at and now method";

         my $columns = $update_timestamp->[0];

@@ -1095,6 +1101,13 @@ sub update {

         $param->{$_} = $value for @$columns;

     }

+    # Created time and updated time

+    my @timestamp_cleanup;

+    if (defined $opt{updated_at}) {

+        $param->{$opt{updated_at}} = $self->now->();

+        push @timestamp_cleanup, $opt{updated_at};

+    }

+

     # Assign clause

     my $assign_clause = $self->assign_clause($param, {wrap => $opt{wrap}});

@@ -1109,6 +1122,7 @@ sub update {

     # Execute query

     $opt{statement} = 'update';

+    $opt{cleanup} = \@timestamp_cleanup;

     $self->execute($sql, [$param, $w->{param}], %opt);

 }

@@ -2596,14 +2610,6 @@ This is used to bind parameter by C<bind_param> of statment handle.

     $sth->bind_param($pos, $value, DBI::SQL_BLOB);

-=item C<created_at EXPERIMETNAL>

-

-    created_at => 'created_datetime'

-

-Created timestamp column name. time when row is created is set to the column.

-default time format is "YYYY-mm-dd HH:MM:SS", which can be changed by

-C<now> attribute.

-

 =item C<filter>

     filter => {

@@ -2721,14 +2727,6 @@ Turn C<into1> type rule off.

 Turn C<into2> type rule off.

-=item C<updated_at EXPERIMETNAL>

-

-    updated_at => 'updated_datetime'

-

-Updated timestamp column name. time when row is updated is set to the column.

-default time format is C<YYYY-mm-dd HH:MM:SS>, which can be changed by

-C<now> attribute.

-

 =back

 =head2 C<get_column_info>

@@ -2794,6 +2792,14 @@ and use the following new ones.

 =over 4

+=item C<created_at EXPERIMETNAL>

+

+    created_at => 'created_datetime'

+

+Created timestamp column name. time when row is created is set to the column.

+default time format is "YYYY-mm-dd HH:MM:SS", which can be changed by

+C<now> attribute.

+

 =item C<id>

     id => 4

@@ -2830,6 +2836,10 @@ prefix before table name section

 Table name.

+=item C<updated_at EXPERIMENTAL>

+

+This option is same as C<update> method C<updated_at> option.

+

 =item C<wrap>

     wrap => {price => sub { "max($_[0])" }}

@@ -3307,6 +3317,14 @@ is executed, the following SQL is executed.

     update book set price =  ? + 5;

+=item C<updated_at EXPERIMETNAL>

+

+    updated_at => 'updated_datetime'

+

+Updated timestamp column name. time when row is updated is set to the column.

+default time format is C<YYYY-mm-dd HH:MM:SS>, which can be changed by

+C<now> attribute.

+

 =back

 =head2 C<update_all>

@@ -546,6 +546,38 @@ $result = $dbi->execute("select * from $table1");

 $rows   = $result->all;

 is($rows->[0]->{$key1}, $rows->[0]->{$key2});

+eval { $dbi->execute("drop table $table1") };

+$dbi->execute($create_table1_2);

+$param = {$key1 => 1};

+$dbi->insert(table => $table1, param => $param, created_at => $key2);

+$result = $dbi->select(table => $table1);

+is_deeply($param, {$key1 => 1});

+$row   = $result->one;

+is($row->{$key1}, 1);

+like($row->{$key2}, qr/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/);

+

+eval { $dbi->execute("drop table $table1") };

+$dbi->execute($create_table1_2);

+$param = {$key1 => 1};

+$dbi->insert(table => $table1, param => $param, updated_at => $key3);

+$result = $dbi->select(table => $table1);

+is_deeply($param, {$key1 => 1});

+$row   = $result->one;

+is($row->{$key1}, 1);

+like($row->{$key3}, qr/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/);

+

+eval { $dbi->execute("drop table $table1") };

+$dbi->execute($create_table1_2);

+$param = {$key1 => 1};

+$dbi->insert(table => $table1, param => $param, created_at => $key2, updated_at => $key3);

+$result = $dbi->select(table => $table1);

+is_deeply($param, {$key1 => 1});

+$row   = $result->one;

+is($row->{$key1}, 1);

+like($row->{$key2}, qr/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/);

+like($row->{$key3}, qr/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/);

+is($row->{$key2}, $row->{$key3});

+

 test 'update_or_insert';

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1);

@@ -793,6 +825,28 @@ is_deeply($rows, [{$key1 => 1, $key2 => 11, $key3 => 3, $key4 => 4, $key5 => 5},

                   {$key1 => 6, $key2 => 7,  $key3 => 8, $key4 => 9, $key5 => 10}],

                   "basic");

+eval { $dbi->execute("drop table $table1") };

+$dbi->execute($create_table1_2);

+$param = {$key3 => 4};

+$dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2, $key3 => 3});

+$dbi->update(table => $table1, param => $param, updated_at => $key2, where => {$key1 => 1});

+$result = $dbi->select(table => $table1);

+is_deeply($param, {$key3 => 4});

+$row   = $result->one;

+is($row->{$key3}, 4);

+like($row->{$key2}, qr/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/);

+

+eval { $dbi->execute("drop table $table1") };

+$dbi->execute($create_table1_2);

+$param = {$key3 => 4};

+$dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2, $key3 => 3});

+$dbi->update(table => $table1, param => $param, updated_at => $key2, where => {$key3 => 3});

+$result = $dbi->select(table => $table1);

+is_deeply($param, {$key3 => 4});

+$row   = $result->one;

+is($row->{$key3}, 4);

+like($row->{$key2}, qr/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/);

+

 test 'update_all';

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_2);