@@ -1,4 +1,8 @@

+0.2111

+  - "created_at" option is renamed to "ctime" option

+  - "updated_at" option is renamed to "mtime" option

 0.2110

+  - Perl 5.008007 is required.

   - added EXPERIMETNAL aysnc_conf attribute

 0.2109

   - select method can be called even if table name is not specified

@@ -1,7 +1,8 @@

+use 5.008007;

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.2110';

+our $VERSION = '0.2111';

 use 5.008001;

 use Carp 'croak';

@@ -684,7 +685,7 @@ sub insert {

   # Timestamp(DEPRECATED!)

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

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

+    warn "insert timestamp option is DEPRECATED! use ctime option";

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

     $columns = [$columns] unless ref $columns eq 'ARRAY';

     my $value = $insert_timestamp->[1];

@@ -694,16 +695,24 @@ sub insert {

   # Created time and updated time

   my @timestamp_cleanup;

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

+  warn "insert method created_at option is DEPRECATED! "

+      . "use ctime option instead. " . _subname

+    if $opt{created_at};

+  warn "insert method updated_at option is DEPRECATED! "

+      . "use mtime option instead. " . _subname

+    if $opt{updated_at};

+  $opt{ctime} ||= $opt{created_at};

+  $opt{mtime} ||= $opt{updated_at};

+  if (defined $opt{ctime} || defined $opt{mtime}) {

     my $now = $self->now;

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

-    if (defined $opt{created_at}) {

-      $_->{$opt{created_at}} = $now for @$params;

-      push @timestamp_cleanup, $opt{created_at};

+    if (defined $opt{ctime}) {

+      $_->{$opt{ctime}} = $now for @$params;

+      push @timestamp_cleanup, $opt{ctime};

     }

-    if (defined $opt{updated_at}) {

-      $_->{$opt{updated_at}} = $now for @$params;

-      push @timestamp_cleanup, $opt{updated_at};

+    if (defined $opt{mtime}) {

+      $_->{$opt{mtime}} = $now for @$params;

+      push @timestamp_cleanup, $opt{mtime};

     }

   }

@@ -775,8 +784,7 @@ sub include_model {

     croak qq{"$name_space" is invalid class name } . _subname

       if $name_space =~ /[^\w:]/;

     eval "use $name_space";

-    croak qq{Name space module "$name_space.pm" is needed. $@ }

-        . _subname

+    croak qq{Name space module "$name_space.pm" is needed. $@ } . _subname

       if $@;

     # Search model modules

@@ -1193,7 +1201,7 @@ sub update {

   # Timestamp(DEPRECATED!)

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

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

+    warn "update timestamp option is DEPRECATED! use mtime";

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

     $columns = [$columns] unless ref $columns eq 'ARRAY';

     my $value = $update_timestamp->[1];

@@ -1203,11 +1211,15 @@ sub update {

   # Created time and updated time

   my @timestamp_cleanup;

-  if (defined $opt{updated_at}) {

+  warn "update method update_at option is DEPRECATED! "

+      . "use mtime option instead " . _subname

+    if $opt{updated_at};

+  $opt{mtime} ||= $opt{updated_at};

+  if (defined $opt{mtime}) {

     my $now = $self->now;

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

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

-    push @timestamp_cleanup, $opt{updated_at};

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

+    push @timestamp_cleanup, $opt{mtime};

   }

   # Assign clause

@@ -2946,11 +2958,11 @@ The SQL like the following one is executed.

   insert into book (id, title) values (?, ?), (?, ?);

-=item C<created_at>

+=item C<ctime>

-  created_at => 'created_datetime'

+  ctime => 'created_time'

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

+Created time 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.

@@ -2990,9 +3002,9 @@ prefix before table name section

 Table name.

-=item C<updated_at>

+=item C<mtime>

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

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

 =item C<wrap>

@@ -3471,11 +3483,11 @@ is executed, the following SQL is executed.

   update book set price =  ? + 5;

-=item C<updated_at>

+=item C<mtime>

-  updated_at => 'updated_datetime'

+  mtime => 'modified_time'

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

+Modified time column name. time 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.

@@ -3649,6 +3661,8 @@ L<DBIx::Custom>

   update_param_tag # will be removed at 2017/1/1

   # Options

+  insert method created_at option # will be removed 2017/3/1

+  update method updated_at option # will be removed 2017/3/1

   select column option [COLUMN => ALIAS] syntax # will be removed 2017/1/1

   execute method id option # will be removed 2017/1/1

   update timestamp option # will be removed 2017/1/1

@@ -7,7 +7,7 @@ use DBIx::Custom::Util '_subname';

 # Carp trust relationship

 push @DBIx::Custom::CARP_NOT, __PACKAGE__;

-has [qw/dbi table created_at updated_at bind_type join primary_key/],

+has [qw/dbi table ctime mtime bind_type join primary_key/],

   columns => sub { [] };

 our $AUTOLOAD;

@@ -47,8 +47,8 @@ for my $method (@methods) {

   my @attrs = qw/table type primary_key bind_type/;

-  my @insert_attrs = qw/created_at updated_at/;

-  my @update_attrs = qw/updated_at/;

+  my @insert_attrs = qw/created_at updated_at ctime mtime/;

+  my @update_attrs = qw/updated_at mtime/;

   my @select_attrs = qw/join/;

   if ($method eq 'insert') { push @attrs, @insert_attrs }

   elsif ($method eq 'update') { push @attrs, @update_attrs }

@@ -144,7 +144,7 @@ sub new {

   }

   # Cache

-  for my $attr (qw/dbi table created_at updated_at bind_type join primary_key/) {

+  for my $attr (qw/dbi table created_at updated_at ctime mtime bind_type join primary_key/) {

     $self->$attr;

     $self->{$attr} = undef unless exists $self->{$attr};

   }

@@ -157,6 +157,8 @@ sub new {

 has 'filter';

 has 'name';

 has 'type';

+has 'created_at';

+has 'updated_at'; 

 # DEPRECATED!

 sub method {

@@ -185,10 +187,10 @@ my $model = DBIx::Custom::Model->new(table => 'books');

 L<DBIx::Custom> object.

-=head2 C<created_at>

+=head2 C<ctime>

-  my $created_at = $model->created_at;

-  $model = $model->created_at('created_datatime');

+  my $ctime = $model->ctime;

+  $model = $model->ctime('created_time');

 Create timestamp column, this is passed to C<insert> or C<update> method.

@@ -225,10 +227,10 @@ Database data type, this is used as type optioon of C<insert>,

 C<update>, C<update_all>, C<delete>, C<delete_all>,

 and C<select> method

-=head2 C<updated_at>

+=head2 C<mtime>

-  my $updated_at = $model->updated_at;

-  $model = $model->updated_at('updated_datatime');

+  my $mtime = $model->mtime;

+  $model = $model->mtime('modified_time');

 Updated timestamp column, this is passed to C<update> method.

@@ -590,6 +590,16 @@ $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($param, table => $table1, ctime => $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};

@@ -600,6 +610,16 @@ $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($param, table => $table1, mtime => $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};

@@ -612,6 +632,42 @@ 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});

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

+$dbi->execute($create_table1_2);

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

+$dbi->insert($param, table => $table1, created_at => $key2, mtime => $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});

+

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

+$dbi->execute($create_table1_2);

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

+$dbi->insert($param, table => $table1, ctime => $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});

+

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

+$dbi->execute($create_table1_2);

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

+$dbi->insert($param, table => $table1, ctime => $key2, mtime => $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});

+

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

 $dbi->execute($create_table1_2);

 $model = $dbi->create_model(table => $table1, created_at => $key2);

@@ -623,6 +679,17 @@ $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);

+$model = $dbi->create_model(table => $table1, ctime => $key2);

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

+$model->insert($param);

+$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};

@@ -634,6 +701,17 @@ $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};

+$model = $dbi->create_model(table => $table1, mtime => $key3);

+$model->insert($param);

+$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};

@@ -647,6 +725,45 @@ 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});

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

+$dbi->execute($create_table1_2);

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

+$model = $dbi->create_model(table => $table1, created_at => $key2, mtime => $key3);

+$model->insert($param);

+$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});

+

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

+$dbi->execute($create_table1_2);

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

+$model = $dbi->create_model(table => $table1, ctime=> $key2, updated_at => $key3);

+$model->insert($param);

+$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});

+

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

+$dbi->execute($create_table1_2);

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

+$model = $dbi->create_model(table => $table1, ctime=> $key2, mtime => $key3);

+$model->insert($param);

+$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});

+

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

 $dbi->execute($create_table1);

 $dbi->insert([{$key1 => 1, $key2 => 2}, {$key1 => 3, $key2 => 4}] , table => $table1);

@@ -657,9 +774,25 @@ is_deeply($rows, [{$key1 => 1, $key2 => 2}, {$key1 => 3, $key2 => 4}], "basic");

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

 $dbi->execute($create_table1_2);

 $dbi->insert([{$key1 => 1}, {$key1 => 3}] ,

-table => $table1,

-updated_at => $key2,

-created_at => $key3

+  table => $table1,

+  updated_at => $key2,

+  created_at => $key3

+);

+$result = $dbi->execute("select * from $table1");

+$rows   = $result->all;

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

+is($rows->[1]->{$key1}, 3);

+like($rows->[0]->{$key2}, qr/\d{2}:/);

+like($rows->[1]->{$key2}, qr/\d{2}:/);

+like($rows->[0]->{$key3}, qr/\d{2}:/);

+like($rows->[1]->{$key3}, qr/\d{2}:/);

+

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

+$dbi->execute($create_table1_2);

+$dbi->insert([{$key1 => 1}, {$key1 => 3}] ,

+  table => $table1,

+  mtime => $key2,

+  ctime => $key3

 );

 $result = $dbi->execute("select * from $table1");

 $rows   = $result->all;

@@ -998,6 +1131,17 @@ $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({$key1 => 1, $key2 => 2, $key3 => 3}, table => $table1);

+$dbi->update($param, table => $table1, mtime => $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};

@@ -1009,6 +1153,17 @@ $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({$key1 => 1, $key2 => 2, $key3 => 3}, table => $table1);

+$dbi->update($param, table => $table1, mtime => $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}$/);

+

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

 $dbi->execute($create_table1_2);

 $model = $dbi->create_model(table => $table1, updated_at => $key2);

@@ -1021,6 +1176,18 @@ $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);

+$model = $dbi->create_model(table => $table1, mtime => $key2);

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

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

+$model->update($param, 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}$/);

+

 test 'update_all';

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

 $dbi->execute($create_table1_2);