@@ -1,3 +1,8 @@

+0.2106

+    - renamed DBIx::Custom::Result::fetch_hash_first to fethc_hash_one

+      because first is misleading name. fethc_hash_first is DEPRECATED!

+    - renamed DBIx::Custom::Result::fetch_first to fetch_one,

+      because first is misleading name. fetch_first is DEPRECATED!

 0.2105

     - added EXPERIMENTAL DBIx::Custom::Result::value method

     - added EXPERIMENTAL DBIx::Custom::Result::column method

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

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.2105';

+our $VERSION = '0.2106';

 use 5.008001;

 use Carp 'croak';

@@ -190,7 +190,7 @@ sub connect {

     return $self;

 }

-sub count { shift->select(column => 'count(*)', @_)->fetch_first->[0] }

+sub count { shift->select(column => 'count(*)', @_)->fetch_one->[0] }

 sub dbh {

     my $self = shift;

@@ -3619,6 +3619,8 @@ L<DBIx::Custom::Result>

     filter_check # will be removed at 2017/1/1

     # Methods

+    fetch_first # will be removed at 2017/2/1

+    fetch_hash_first # will be removed 2017/2/1

     filter_on # will be removed at 2017/1/1

     filter_off # will be removed at 2017/1/1

     end_filter # will be removed at 2017/1/1

@@ -162,19 +162,6 @@ sub fetch_all {

     return $rows;

 }

-sub fetch_first {

-    my $self = shift;

-    

-    # Fetch

-    my $row = $self->fetch;

-    return unless $row;

-    

-    # Finish statement handle

-    $self->sth->finish;

-    

-    return $row;

-}

-

 sub fetch_hash_all {

     my $self = shift;

@@ -185,7 +172,7 @@ sub fetch_hash_all {

     return $rows;

 }

-sub fetch_hash_first {

+sub fetch_hash_one {

     my $self = shift;

     # Fetch hash

@@ -245,9 +232,23 @@ sub fetch_multi {

     return $rows;

 }

+

+sub fetch_one {

+    my $self = shift;

+    

+    # Fetch

+    my $row = $self->fetch;

+    return unless $row;

+    

+    # Finish statement handle

+    $self->sth->finish;

+    

+    return $row;

+}

+

 sub header { shift->sth->{NAME} }

-*one = \&fetch_hash_first;

+*one = \&fetch_hash_one;

 sub type_rule {

     my $self = shift;

@@ -316,7 +317,7 @@ sub type_rule2_on {

 sub value {

     my $self = shift;

-    my $row = $self->fetch_first;

+    my $row = $self->fetch_one;

     my $value = $row ? $row->[0] : undef;

     return $value;

 }

@@ -338,6 +339,20 @@ sub _cache {

     $self->{_cache} = 1;

 }

+# DEPRECATED!

+sub fetch_hash_first {

+    my $self = shift;

+    warn "DBIx::Custom::Result::fetch_hash_first is DEPRECATED! use fetch_hash_one instead";

+    return $self->fetch_hash_one(@_);

+}

+

+# DEPRECATED!

+sub fetch_first {

+    my $self = shift;

+    warn "DBIx::Custom::Result::fetch_first is DEPRECATED! use fetch_one instead";

+    return $self->fetch_one(@_);

+}

+

 # DEPRECATED!

 sub filter_off {

     warn "filter_off method is DEPRECATED!";

@@ -435,7 +450,7 @@ DBIx::Custom::Result - Result of select statement

     }

     # Fetch only a first row and put it into array reference

-    my $row = $result->fetch_first;

+    my $row = $result->fetch_one;

     # Fetch all rows and put them into array of array reference

     my $rows = $result->fetch_all;

@@ -447,12 +462,12 @@ DBIx::Custom::Result - Result of select statement

     }

     # Fetch only a first row and put it into hash reference

-    my $row = $result->fetch_hash_first;

-    my $row = $result->one; # Same as fetch_hash_first

+    my $row = $result->fetch_hash_one;

+    my $row = $result->one; # Alias for "fetch_hash_one"

     # Fetch all rows and put them into array of hash reference

     my $rows = $result->fetch_hash_all;

-    my $rows = $result->all; # Same as fetch_hash_all

+    my $rows = $result->all; # Alias for "fetch_hash_all"

 =head1 ATTRIBUTES

@@ -501,9 +516,9 @@ Fetch a row and put it into array reference.

 Fetch all rows and put them into array of array reference.

-=head2 C<fetch_first>

+=head2 C<fetch_one>

-    my $row = $result->fetch_first;

+    my $row = $result->fetch_one;

 Fetch only a first row and put it into array reference,

 and finish statment handle.

@@ -520,9 +535,9 @@ Fetch a row and put it into hash reference.

 Fetch all rows and put them into array of hash reference.

-=head2 C<fetch_hash_first>

+=head2 C<fetch_hash_one>

-    my $row = $result->fetch_hash_first;

+    my $row = $result->fetch_hash_one;

 Fetch only a first row and put it into hash reference,

 and finish statment handle.

@@ -558,7 +573,7 @@ Get header column names.

     my $row = $result->one;

-Same as C<fetch_hash_first>.

+Alias for C<fetch_hash_one>.

 =head2 C<stash>

@@ -1197,6 +1197,12 @@ $dbi->execute($create_table1);

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

 $result = $dbi->select(column => [$key1, $key1, $key2], table => $table1);

 $result->filter({$key1 => 'three_times'});

+$row = $result->fetch_one;

+is_deeply($row, [3, 3, 4], "default_fetch_filter and filter");

+

+test 'fetch_first DEPRECATED!';

+$result = $dbi->select(column => [$key1, $key1, $key2], table => $table1);

+$result->filter({$key1 => 'three_times'});

 $row = $result->fetch_first;

 is_deeply($row, [3, 3, 4], "default_fetch_filter and filter");

@@ -1220,7 +1226,7 @@ $dbi->rollback;

 $dbi->dbh->{AutoCommit} = 1;

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

-ok(! $result->fetch_first, "rollback");

+ok(! $result->fetch_one, "rollback");

 $dbi = DBIx::Custom->connect;

@@ -1384,12 +1390,17 @@ $dbi->apply_filter(

               $key2 => {out => 'three_times', in => 'twice'});

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

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

-$row   = $result->fetch_hash_first;

+$row   = $result->fetch_hash_one;

 is_deeply($row, {$key1 => 2, $key2 => 6}, "insert");

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

 $row   = $result->one;

 is_deeply($row, {$key1 => 6, $key2 => 12}, "insert");

+test 'fetch_hash_first DEPRECATED!';

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

+$row   = $result->fetch_hash_first;

+is_deeply($row, {$key1 => 2, $key2 => 6}, "insert");

+

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1);

@@ -1533,7 +1544,7 @@ $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1);

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

 $result->filter($key1 => sub { $_[0] * 2 }, $key2 => sub { $_[0] * 4 });

 $result->end_filter($key1 => sub { $_[0] * 3 }, $key2 => sub { $_[0] * 5 });

-$row = $result->fetch_first;

+$row = $result->fetch_one;

 is_deeply($row, [6, 40]);

 $dbi = DBIx::Custom->connect;

@@ -1543,7 +1554,7 @@ $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1);

 $result = $dbi->select(column => [$key1, $key1, $key2], table => $table1);

 $result->filter($key1 => sub { $_[0] * 2 }, $key2 => sub { $_[0] * 4 });

 $result->end_filter($key1 => sub { $_[0] * 3 }, $key2 => sub { $_[0] * 5 });

-$row = $result->fetch_first;

+$row = $result->fetch_one;

 is_deeply($row, [6, 6, 40]);

 $dbi = DBIx::Custom->connect;

@@ -1553,7 +1564,7 @@ $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1);

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

 $result->filter([$key1, $key2] => sub { $_[0] * 2 });

 $result->end_filter([[$key1, $key2] => sub { $_[0] * 3 }]);

-$row = $result->fetch_first;

+$row = $result->fetch_one;

 is_deeply($row, [6, 12]);

 $dbi = DBIx::Custom->connect;

@@ -1563,7 +1574,7 @@ $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1);

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

 $result->filter([[$key1, $key2] => sub { $_[0] * 2 }]);

 $result->end_filter([$key1, $key2] => sub { $_[0] * 3 });

-$row = $result->fetch_first;

+$row = $result->fetch_one;

 is_deeply($row, [6, 12]);

 $dbi->register_filter(five_times => sub { $_[0] * 5 });

@@ -1613,7 +1624,7 @@ $row = $result

        ->remove_filter

        ->end_filter($key1 => sub { $_[0] * 3 }, $key2 => sub { $_[0] * 5 })

        ->remove_end_filter

-       ->fetch_first;

+       ->fetch_one;

 is_deeply($row, [1, 2]);

 test 'empty where select';

@@ -4066,7 +4077,7 @@ $dbi->insert({$key1 => '2010-01-03'},

   table => $table1, filter => {$key1 => sub { my $v = shift || ''; $v =~ s/3/4/; return $v }});

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

 $result->filter($key1 => sub { my $v = shift || ''; $v =~ s/8/9/; return $v });

-like($result->fetch_first->[0], qr/^2010-01-09/);

+like($result->fetch_one->[0], qr/^2010-01-09/);

 $dbi = DBIx::Custom->connect;

@@ -4093,7 +4104,7 @@ $result->type_rule(

     }

 );

 $result->filter($key1 => sub { my $v = shift || ''; $v =~ s/8/9/; return $v });

-like($result->fetch_first->[0], qr/^2010-01-09/);

+like($result->fetch_one->[0], qr/^2010-01-09/);

 test 'type_rule_off';

 $dbi = DBIx::Custom->connect;

@@ -4333,9 +4344,9 @@ $dbi->type_rule(

 );

 $dbi->insert({$key1 => '2010-01-03'}, table => $table1, type_rule_off => 1);

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

-like($result->type_rule_off->fetch_first->[0], qr/^2010-01-03/);

+like($result->type_rule_off->fetch_one->[0], qr/^2010-01-03/);

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

-like($result->type_rule_on->fetch_first->[0], qr/^2010-01-07/);

+like($result->type_rule_on->fetch_one->[0], qr/^2010-01-07/);

 $dbi = DBIx::Custom->connect;

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

@@ -4357,9 +4368,9 @@ $dbi->type_rule(

 );

 $dbi->insert({$key1 => '2010-01-03'}, table => $table1, type_rule1_off => 1);

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

-like($result->type_rule1_off->fetch_first->[0], qr/^2010-01-05/);

+like($result->type_rule1_off->fetch_one->[0], qr/^2010-01-05/);

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

-like($result->type_rule1_on->fetch_first->[0], qr/^2010-01-07/);

+like($result->type_rule1_on->fetch_one->[0], qr/^2010-01-07/);

 $dbi = DBIx::Custom->connect;

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

@@ -4381,9 +4392,9 @@ $dbi->type_rule(

 );

 $dbi->insert({$key1 => '2010-01-03'}, table => $table1, type_rule2_off => 1);

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

-like($result->type_rule2_off->fetch_first->[0], qr/^2010-01-06/);

+like($result->type_rule2_off->fetch_one->[0], qr/^2010-01-06/);

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

-like($result->type_rule2_on->fetch_first->[0], qr/^2010-01-07/);

+like($result->type_rule2_on->fetch_one->[0], qr/^2010-01-07/);

 test 'join';

 $dbi = DBIx::Custom->connect;

@@ -209,7 +209,7 @@ test 'dbh';

     my $dbi = DBIx::Custom->connect(connector => $connector);

     $dbi->delete_all(table => 'table1');

     $dbi->do('insert into table1 (key1, key2) values (1, 2)');

-    is($dbi->select(table => 'table1')->fetch_hash_first->{key1}, 1);

+    is($dbi->select(table => 'table1')->fetch_hash_one->{key1}, 1);

     $dbi = DBIx::Custom->new;

     $dbi->dbh('a');

@@ -293,12 +293,12 @@ test 'fork';

     if ($pid) {

         # Parent

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

-        is_deeply($result->fetch_hash_first, {key1 => 1, key2 => 2});

+        is_deeply($result->fetch_hash_one, {key1 => 1, key2 => 2});

     }

     else {

         # Child

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

-        die "Not OK" unless $result->fetch_hash_first->{key1} == 1;

+        die "Not OK" unless $result->fetch_hash_one->{key1} == 1;

     }

 }

@@ -54,12 +54,12 @@ test 'connector => 1';

     if ($pid) {

         # Parent

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

-        is_deeply($result->fetch_hash_first, {key1 => 1, key2 => 2});

+        is_deeply($result->fetch_hash_one, {key1 => 1, key2 => 2});

     }

     else {

         # Child

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

-        die "Not OK" unless $result->fetch_hash_first->{key1} == 1;

+        die "Not OK" unless $result->fetch_hash_one->{key1} == 1;

     }

 }

@@ -157,20 +157,20 @@ $dbi->insert({key1 => 1, key2 => 2}, table => 'table1');

 $dbi->insert({key1 => 3, key2 => 4}, table => 'table1');

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

-$row = $result->fetch_first;

+$row = $result->fetch_one;

 is_deeply($row, [1, 2], "row");

 $row = $result->fetch;

 ok(!$row, "finished");

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

-$row = $result->fetch_hash_first;

+$row = $result->fetch_hash_one;

 is_deeply($row, {key1 => 1, key2 => 2}, "row");

 $row = $result->fetch_hash;

 ok(!$row, "finished");

 $dbi->execute('create table table2 (key1, key2);');

 $result = $dbi->select(table => 'table2');

-$row = $result->fetch_hash_first;

+$row = $result->fetch_hash_one;

 ok(!$row, "no row fetch");

 $dbi = DBIx::Custom->connect;

@@ -254,7 +254,7 @@ $dbi->type_rule(

 $dbi->execute("create table table1 (key1 Date, key2 datetime)");

 $dbi->insert({key1 => 'a'}, table => 'table1');

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

-is($result->fetch_first->[0], 'A');

+is($result->fetch_one->[0], 'A');

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

 is($result->one->{key1}, 'A');

@@ -287,19 +287,19 @@ $result = $dbi->select(

     table => ['table2', 'table3'], relation => {'table2.table3_id' => 'table3.id'},

     column => ['table3.name as table3__name']

 );

-is($result->fetch_first->[0], 'B');

+is($result->fetch_one->[0], 'B');

 $result = $dbi->select(

     table => 'table2', relation => {'table2.table3_id' => 'table3.id'},

     column => ['table3.name as table3__name']

 );

-is($result->fetch_first->[0], 'B');

+is($result->fetch_one->[0], 'B');

 $result = $dbi->select(

     table => 'table2', relation => {'table2.table3_id' => 'table3.id'},

     column => ['table3.name as "table3.name"']

 );

-is($result->fetch_first->[0], 'B');

+is($result->fetch_one->[0], 'B');

 test 'reserved_word_quote';

 $dbi = DBIx::Custom->connect;