@@ -1088,24 +1088,12 @@ sub update {

     my $self = shift;

     # Arguments

-    my $param;

-    $param = shift if @_ % 2;

+    my $param = @_ % 2 ? shift : undef;

     my %opt = @_;

-    my $table = $opt{table} || '';

-    croak qq{"table" option must be specified } . _subname

-      unless $table;

-    my $p = $opt{param} || {};

-    $param  ||= $p;

+    warn "update param option is DEPRECATED!" if $opt{param};

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

     my $where = $opt{where} || {};

     my $where_param = $opt{where_param} || {};

-    my $allow_update_all = $opt{allow_update_all};

-    my $id = $opt{id};

-    my $primary_key = $opt{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';

-    my $prefix = $opt{prefix};

     # Timestamp

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

@@ -1116,12 +1104,12 @@ sub update {

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

     }

-    # Update clause

+    # Assign clause

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

     # Where

-    $where = $self->_id_to_param($id, $primary_key, $table)

-      if defined $id;

+    $where = $self->_id_to_param($opt{id}, $opt{primary_key}, $opt{table})

+      if defined $opt{id};

     my $where_clause = '';

     if (ref $where eq 'ARRAY' && !ref $where->[0]) {

         $where_clause = "where " . $where->[0];

@@ -1138,16 +1126,15 @@ sub update {

     }

     elsif ($where) { $where_clause = "where $where" }

     croak qq{"where" must be specified } . _subname

-      if "$where_clause" eq '' && !$allow_update_all;

+      if "$where_clause" eq '' && !$opt{allow_update_all};

     # Merge param

     $param = $self->merge_param($param, $where_param) if keys %$where_param;

     # Update statement

-    my $sql;

-    $sql .= "update ";

-    $sql .= "$prefix " if defined $prefix;

-    $sql .= $self->_q($table) . " set $assign_clause $where_clause ";

+    my $sql = "update ";

+    $sql .= "$opt{prefix} " if defined $opt{prefix};

+    $sql .= $self->_q($opt{table}) . " set $assign_clause $where_clause ";

     # Execute query

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

@@ -1664,8 +1664,6 @@ is($dbi->{_tags}->{b}->(), 2);

 test 'table not specify exception';

 $dbi = DBIx::Custom->connect;

-eval {$dbi->update};

-like($@, qr/table/);

 eval {$dbi->delete};

 like($@, qr/table/);

 eval {$dbi->select};

@@ -51,8 +51,8 @@ test 'prefix';

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute('create table table1 (key1 varchar, key2 varchar, primary key(key1));');

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

-$dbi->insert(table => 'table1', param => {key1 => 1, key2 => 4}, prefix => 'or replace');

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

+$dbi->insert({key1 => 1, key2 => 4}, table => 'table1', prefix => 'or replace');

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

 $rows   = $result->all;

 is_deeply($rows, [{key1 => 1, key2 => 4}], "basic");

@@ -60,8 +60,8 @@ is_deeply($rows, [{key1 => 1, key2 => 4}], "basic");

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute('create table table1 (key1 varchar, key2 varchar, primary key(key1));');

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

-$dbi->update(table => 'table1', param => {key2 => 4},

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

+$dbi->update({key2 => 4}, table => 'table1',

   where => {key1 => 1}, prefix => 'or replace');

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

 $rows   = $result->all;

@@ -74,7 +74,7 @@ $dbi->quote('"');

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

 $dbi->execute($create_table_reserved);

 $dbi->apply_filter('table', select => {out => sub { $_[0] * 2}});

-$dbi->insert(table => 'table', param => {select => 1});

+$dbi->insert({select => 1}, table => 'table');

 $dbi->delete(table => 'table', where => {select => 1});

 $result = $dbi->execute("select * from ${q}table$p");

 $rows   = $result->all;

@@ -154,7 +154,7 @@ $dbi = DBIx::Custom->connect(

 $binary = pack("I3", 1, 2, 3);

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

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

-$dbi->insert(table => 'table1', param => {key1 => $binary, key2 => 'あ'}, type => [key1 => DBI::SQL_BLOB]);

+$dbi->insert({key1 => $binary, key2 => 'あ'}, table => 'table1', type => [key1 => DBI::SQL_BLOB]);

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

 $row   = $result->one;

 is_deeply($row, {key1 => $binary, key2 => 'あ'}, "basic");

@@ -180,8 +180,8 @@ is($result->one->{key1}, 'A');

 test 'select limit';

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

 $dbi->execute($create_table1);

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

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

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

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

 $rows = $dbi->select(table => 'table1', append => "order by key1 desc limit 1")->all;

 is_deeply($rows, [{key1 => 3, key2 => 4}], "append statement");

@@ -198,8 +198,8 @@ $dbi->apply_filter('table3',

   name => {in => sub { uc $_[0] } }

 );

-$dbi->insert(table => 'table2', param => {id => 1, name => 'a', table3_id => 2});

-$dbi->insert(table => 'table3', param => {id => 2, name => 'b'});

+$dbi->insert({id => 1, name => 'a', table3_id => 2}, table => 'table2');

+$dbi->insert({id => 2, name => 'b'}, table => 'table3');

 $result = $dbi->select(

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

@@ -226,8 +226,8 @@ $dbi->reserved_word_quote('"');

 $dbi->execute($create_table_reserved);

 $dbi->apply_filter('table', select => {out => sub { $_[0] * 2}});

 $dbi->apply_filter('table', update => {out => sub { $_[0] * 3}});

-$dbi->insert(table => 'table', param => {select => 1});

-$dbi->update(table => 'table', where => {'table.select' => 1}, param => {update => 2});

+$dbi->insert({select => 1}, table => 'table');

+$dbi->update({update => 2}, table => 'table', where => {'table.select' => 1});

 $result = $dbi->execute("select * from ${q}table$p");

 $rows   = $result->all;

 is_deeply($rows, [{select => 2, update => 6}], "reserved word");

@@ -236,9 +236,9 @@ test 'limit tag';

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1);

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

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

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

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

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

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

 $dbi->register_tag(

     limit => sub {

         my ($count, $offset) = @_;

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

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

 $dbi->execute($create_table1);

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

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

-$dbi->insert(table => 'table2', param => {key1 => 1, key3 => 4});

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

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

+$dbi->insert({key1 => 1, key3 => 4}, table => 'table2');

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

 $result = $dbi->select(

     table => 'table1',

     column => [{table2 => ['key3']}],

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

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

 $dbi->execute($create_table1);

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

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

-$dbi->insert(table => 'table2', param => {key1 => 1, key3 => 4});

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

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

+$dbi->insert({key1 => 1, key3 => 4}, table => 'table2');

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

 $result = $dbi->select(

     table => 'table1',

     column => [{table2 => ['key3']}],