@@ -1,5 +1,5 @@

 0.1648

-  add experimental each_table() method

+  add experimental update_at(), delete_at(), select_at()

   add experimental setup_model()

   add experimental DBIx::Custom::Model columns attirbute

   add experimental DBIx::Custom::Model foreign_key() attribute 

@@ -291,6 +291,45 @@ sub delete {

 sub delete_all { shift->delete(allow_delete_all => 1, @_) }

+our %VALID_DELETE_AT_ARGS

+  = map { $_ => 1 } qw/table where append filter query

+                       primary_key param/;

+

+sub delete_at {

+    my ($self, %args) = @_;

+    

+    # Check arguments

+    foreach my $name (keys %args) {

+        croak qq{"$name" is invalid argument}

+          unless $VALID_DELETE_AT_ARGS{$name};

+    }

+    

+    # Primary key

+    my $primary_keys = delete $args{primary_key};

+    $primary_keys = [$primary_keys] unless ref $primary_keys;

+    

+    # Where clause

+    my $where = {};

+    if (exists $args{where}) {

+        my $where_columns = delete $args{where};

+        $where_columns = [$where_columns] unless ref $where_columns;

+        

+        for(my $i = 0; $i < @$primary_keys; $i ++) {

+           $where->{$primary_keys->[$i]} = $where_columns->[$i];

+        }

+    }

+    elsif (exists $args{param}) {

+        my $param = delete $args{param};

+        

+        for(my $i = 0; $i < @$primary_keys; $i ++) {

+           $where->{$primary_keys->[$i]}

+             = delete $param->{$primary_keys->[$i]};

+        }

+    }

+    

+    return $self->delete(where => $where, %args);

+}

+

 sub DESTROY { }

 our %VALID_EXECUTE_ARGS = map { $_ => 1 } qw/param filter table/;

@@ -594,6 +633,44 @@ sub select {

     return $result;

 }

+our %VALID_SELECT_AT_ARGS

+  = map { $_ => 1 } qw/table column where append relation filter query selection

+                       param primary_key/;

+

+sub select_at {

+    my ($self, %args) = @_;

+    

+    # Check arguments

+    foreach my $name (keys %args) {

+        croak qq{"$name" is invalid argument}

+          unless $VALID_SELECT_AT_ARGS{$name};

+    }

+    

+    # Primary key

+    my $primary_keys = delete $args{primary_key};

+    $primary_keys = [$primary_keys] unless ref $primary_keys;

+    

+    # Where clause

+    my $where = {};

+    if (exists $args{where}) {

+        my $where_columns = delete $args{where};

+        $where_columns = [$where_columns] unless ref $where_columns;

+        

+        for(my $i = 0; $i < @$primary_keys; $i ++) {

+           $where->{$primary_keys->[$i]} = $where_columns->[$i];

+        }

+    }

+    elsif (exists $args{param}) {

+        my $param = delete $args{param};

+        for(my $i = 0; $i < @$primary_keys; $i ++) {

+           $where->{$primary_keys->[$i]}

+             = delete $param->{$primary_keys->[$i]};

+        }

+    }

+    

+    return $self->select(where => $where, %args);

+}

+

 sub model {

     my ($self, $name, $model) = @_;

@@ -778,6 +855,47 @@ sub update {

 sub update_all { shift->update(allow_update_all => 1, @_) };

+our %VALID_UPDATE_AT_ARGS

+  = map { $_ => 1 } qw/table param

+                       where append filter query

+                       primary_key param/;

+

+sub update_at {

+    my ($self, %args) = @_;

+    

+    # Check arguments

+    foreach my $name (keys %args) {

+        croak qq{"$name" is invalid argument}

+          unless $VALID_UPDATE_AT_ARGS{$name};

+    }

+    

+    # Primary key

+    my $primary_keys = delete $args{primary_key};

+    $primary_keys = [$primary_keys] unless ref $primary_keys;

+    

+    # Where clause

+    my $where = {};

+    my $param = {};

+    

+    if (exists $args{where}) {

+        my $where_columns = delete $args{where};

+        $where_columns = [$where_columns] unless ref $where_columns;

+        

+        for(my $i = 0; $i < @$primary_keys; $i ++) {

+           $where->{$primary_keys->[$i]} = $where_columns->[$i];

+        }

+    }

+    elsif (exists $args{param}) {

+        $param = delete $args{param};

+        for(my $i = 0; $i < @$primary_keys; $i ++) {

+           $where->{$primary_keys->[$i]}

+             = delete $param->{$primary_keys->[$i]};

+        }

+    }

+    

+    return $self->update(where => $where, param => $param, %args);

+}

+

 sub where {

     my $self = shift;

@@ -1212,6 +1330,27 @@ Arguments is same as C<delete> method,

 except that C<delete_all> don't have C<where> argument.

 Return value of C<delete_all()> is the count of affected rows.

+=head3 C<delete_at()>

+

+To delete row by using primary key, use C<delete_at()>

+

+    $dbi->delete_at(

+        table => 'book',

+        primary_key => ['id'],

+        where => ['123']

+    );

+

+In this example, row which id column is 123 is deleted.

+NOTE that you must pass array reference as C<where>.

+

+You can also write arguments like this.

+

+    $dbi->delete_at(

+        table => 'book',

+        primary_key => ['id'],

+        param => {id => '123'}

+    );

+

 =head2 C<insert>

     $dbi->insert(table  => $table, 

@@ -1401,6 +1540,15 @@ First element is a string. it contains tags,

 such as "{= title} or {like author}".

 Second element is paramters.

+=head3 C<select_at()>

+

+To select row by using primary key, use C<select_at()>.

+

+    $dbi->select_at(table => 'book', primary_key => ['id'], where => ['123']);

+

+In this example, row which id colunm is 123 is selected.

+NOTE that you must pass array reference as C<where>.

+

 =head2 C<update>

     $dbi->update(table  => $table, 

@@ -1453,6 +1601,22 @@ Arguments is same as C<update> method,

 except that C<update_all> don't have C<where> argument.

 Return value of C<update_all()> is the count of affected rows.

+=head3 C<update_at()>

+

+To update row by using primary key, use C<update_at()>

+

+    $dbi->update_at(

+        table => 'book',

+        primary_key => ['id'],

+        where => ['123'],

+        param => {name => 'Ken'}

+    );

+

+In this example, row which id column is 123 is updated.

+NOTE that you must pass array reference as C<where>.

+If C<param> contains primary key,

+the key and value is delete from C<param>.

+

 =head2 C<(experimental) where>

     my $where = $dbi->where;

@@ -380,6 +380,45 @@ You don't have to wirte last semicolon in C<execute()>.

     $dbi->execute('select * from book');

+=head3 Update by using primary key : C<update_at()>

+

+To update row by using primary key, use C<update_at()>

+

+    $dbi->update_at(

+        table => 'book', primary_key => ['id'],

+        where => ['123'], param => {name => 'Ken'}

+    );

+

+In this example, row which id column is 123 is updated.

+NOTE that you must pass array reference as C<where>.

+If C<param> contains primary key, the key and value is delete from C<param>.

+

+=head3 Delete by using primary key : C<delete_at()>

+

+To delete row by using primary key, use C<delete_at()>

+

+    $dbi->delete_at(table => 'book', primary_key => ['id'], where => ['123']);

+

+In this example, row which id column is 123 is deleted.

+NOTE that you must pass array reference as C<where>.

+

+You can also write arguments like this.

+

+    $dbi->delete_at(table => 'book', primary_key => ['id'], param => {id => '123'});

+

+=head3 Select by using primary key : C<select_at()>

+

+To select row by using primary key, use C<select_at()>.

+

+    $dbi->select_at(table => 'book', primary_key => ['id'], where => ['123']);

+

+In this example, row which id colunm is 123 is selected.

+NOTE that you must pass array reference as C<where>.

+

+You can also write arguments like this.

+

+    $dbi->select_at(table => 'book', primary_key => ['id'], param => {id => '123'});

+

 =head2 3. Fetch row

 Return value of C<select()> is L<DBIx::Custom::Result> object.

@@ -1073,11 +1112,15 @@ Model examples

     package MyModel::book;

     use base 'DBIx::Custom::Model';

+    __PACKAGE__->attr('primary_key' => sub { ['id'] };

+    

     sub insert { ... }

     sub list { ... }

     package MyModel::company;

     use base 'DBIx::Custom::Model';

+

+    __PACKAGE__->attr('primary_key' => sub { ['id'] };

     sub insert { ... }

     sub list { ... }

@@ -386,6 +386,45 @@ SQLを実行するにはC<execute()>を使用します。

     $dbi->execute('select * from book');

+=head3 プライマリーキーを利用した行の更新 C<update_at()>

+

+プライマリーを使用して行を更新するにはC<update_at()>を使用します。

+

+    $dbi->update_at(

+        table => 'book', primary_key => ['id'],

+        where => ['123'], param => {name => 'Ken'}

+    );

+

+この例ではidの列が123の行が更新されます。C<where>には、配列の

+リファレンスを渡す必要があることに注意してください。

+なおC<param>にプライマリーキーが含まれていた場合は、そのキーが削除さされます。

+

+=head3 プライマリーキーを利用した行の削除 C<delete_at()>

+

+プライマリーを使用して行を削除するにはC<delete_at()>を使用します。

+

+    $dbi->delete_at(table => 'book', primary_key => ['id'], where => ['123']);

+

+この例ではidの列が123の行が削除されます。C<where>には、配列の

+リファレンスを渡す必要があることに注意してください。

+

+また下のような記述方法も許されています。

+

+    $dbi->delete_at(table => 'book', primary_key => ['id'], param => {id => '123'});

+

+=head3 プライマリーキーを利用した行の選択 C<select_at()>

+

+プライマリーを使用して行を選択するにはC<select_at()>を使用します。

+

+    $dbi->select_at(table => 'book', primary_key => ['id'], where => ['123']);

+

+この例ではidの列が123の行が選択されます。C<where>には、配列の

+リファレンスを渡す必要があることに注意してください。

+

+また下のような記述方法も許されています。

+

+    $dbi->select_at(table => 'book', primary_key => ['id'], param => {id => '123'});

+

 =head2 3. 行のフェッチ

 C<select()>メソッドの戻り値はL<DBIx::Custom::Result>オブジェクトです。

@@ -1101,11 +1140,15 @@ C<select_at()>で利用されます。

     package MyModel::book;

     use base 'DBIx::Custom::Model';

+    __PACKAGE__->attr('primary_key' => sub { ['id'] };

+    

     sub insert { ... }

     sub list { ... }

     package MyModel::company;

     use base 'DBIx::Custom::Model';

+

+    __PACKAGE__->attr('primary_key' => sub { ['id'] };

     sub insert { ... }

     sub list { ... }

@@ -1394,3 +1394,109 @@ $dbi->execute('create table test (id, name, primary key (id, name));');

 $dbi->setup_model;

 is_deeply($dbi->model('book')->columns, ['id']);

 is_deeply($dbi->model('company')->columns, ['id', 'name']);

+

+test 'delete_at';

+$dbi = DBIx::Custom->connect($NEW_ARGS->{0});

+$dbi->execute($CREATE_TABLE->{1});

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

+$dbi->delete_at(

+    table => 'table1',

+    primary_key => ['key1', 'key2'],

+    where => [1, 2],

+);

+is_deeply($dbi->select(table => 'table1')->fetch_hash_all, []);

+

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

+$dbi->delete_at(

+    table => 'table1',

+    primary_key => 'key1',

+    where => 1,

+);

+is_deeply($dbi->select(table => 'table1')->fetch_hash_all, []);

+

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

+$dbi->delete_at(

+    table => 'table1',

+    primary_key => ['key1', 'key2'],

+    param => {key1 => 1, key2 => 2},

+);

+is_deeply($dbi->select(table => 'table1')->fetch_hash_all, []);

+

+

+test 'update_at';

+$dbi = DBIx::Custom->connect($NEW_ARGS->{0});

+$dbi->execute($CREATE_TABLE->{1});

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

+$dbi->update_at(

+    table => 'table1',

+    primary_key => ['key1', 'key2'],

+    where => [1, 2],

+    param => {key3 => 4}

+);

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

+is($dbi->select(table => 'table1')->fetch_hash_first->{key2}, 2);

+is($dbi->select(table => 'table1')->fetch_hash_first->{key3}, 4);

+

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

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

+$dbi->update_at(

+    table => 'table1',

+    primary_key => 'key1',

+    where => 1,

+    param => {key3 => 4}

+);

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

+is($dbi->select(table => 'table1')->fetch_hash_first->{key2}, 2);

+is($dbi->select(table => 'table1')->fetch_hash_first->{key3}, 4);

+

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

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

+$dbi->update_at(

+    table => 'table1',

+    primary_key => ['key1', 'key2'],

+    param => {key1 => 1, key2 => 2, key3 => 4},

+);

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

+is($dbi->select(table => 'table1')->fetch_hash_first->{key2}, 2);

+is($dbi->select(table => 'table1')->fetch_hash_first->{key3}, 4);

+

+

+test 'select_at';

+$dbi = DBIx::Custom->connect($NEW_ARGS->{0});

+$dbi->execute($CREATE_TABLE->{1});

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

+$result = $dbi->select_at(

+    table => 'table1',

+    primary_key => ['key1', 'key2'],

+    where => [1, 2]

+);

+$row = $result->fetch_hash_first;

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

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

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

+

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

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

+$result = $dbi->select_at(

+    table => 'table1',

+    primary_key => 'key1',

+    where => 1,

+);

+$row = $result->fetch_hash_first;

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

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

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

+

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

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

+$result = $dbi->select_at(

+    table => 'table1',

+    primary_key => ['key1', 'key2'],

+    param => {key1 => 1, key2 => 2},

+);

+$row = $result->fetch_hash_first;

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

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

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

+

+