@@ -302,8 +302,15 @@ sub delete {

     my $allow_delete_all = delete $args{allow_delete_all};

     my $query_return     = delete $args{query};

     my $where_param      = delete $args{where_param} || {};

-

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

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

+    croak "update method primary_key option " .

+          "must be specified when id is specified " . _subname

+      if defined $id && !defined $primary_key;

+    $primary_key = [$primary_key] unless ref $primary_key eq 'ARRAY';

+    

     # Where

+    $where = $self->_create_param_from_id($id, $primary_key) if $id;

     my $where_clause = '';

     if (ref $where) {

         $where = $self->_where_to_obj($where);

@@ -340,28 +347,6 @@ sub delete {

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

-our %DELETE_AT_ARGS = (%DELETE_ARGS, where => 1, primary_key => 1);

-

-sub delete_at {

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

-    

-    # Arguments

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

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

-    my $where = delete $args{where};

-    

-    # Check arguments

-    foreach my $name (keys %args) {

-        croak qq{"$name" is wrong option } . _subname

-          unless $DELETE_AT_ARGS{$name};

-    }

-    

-    # Create where parameter

-    my $where_param = $self->_create_param_from_id($where, $primary_keys);

-    

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

-}

-

 sub DESTROY { }

 sub create_model {

@@ -1331,6 +1316,28 @@ sub _where_to_obj {

     return $obj;

 }

+# DEPRECATED!

+our %DELETE_AT_ARGS = (%DELETE_ARGS, where => 1, primary_key => 1);

+sub delete_at {

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

+    

+    # Arguments

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

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

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

+    

+    # Check arguments

+    foreach my $name (keys %args) {

+        croak qq{"$name" is wrong option } . _subname

+          unless $DELETE_AT_ARGS{$name};

+    }

+    

+    # Create where parameter

+    my $where_param = $self->_create_param_from_id($where, $primary_keys);

+    

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

+}

+

 # DEPRECATED!

 our %UPDATE_AT_ARGS = (%UPDATE_ARGS, where => 1, primary_key => 1);

 sub update_at {

@@ -2416,7 +2416,7 @@ is($dbi->select(table => 'table1')->one->{key2}, 2);

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

-test 'model update_at';

+test 'model update and id option';

 $dbi = MyDBI6->connect($NEW_ARGS->{0});

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

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

@@ -2430,4 +2430,40 @@ is($row->{key1}, 1);

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

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

+

+test 'delete and id option';

+$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(

+    table => 'table1',

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

+    id => [1, 2],

+);

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

+

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

+$dbi->delete(

+    table => 'table1',

+    primary_key => 'key1',

+    id => 1,

+);

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

+

+

+test 'model delete and id option';

+$dbi = MyDBI6->connect($NEW_ARGS->{0});

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

+$dbi->execute("create table table2 (key1, key2, key3)");

+$dbi->execute("create table table3 (key1, key2, key3)");

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

+$dbi->model('table1')->delete(id => [1, 2]);

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

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

+$dbi->model('table1_1')->delete(id => [1, 2]);

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

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

+$dbi->model('table1_3')->delete(id => [1, 2]);

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

+

 =cut