@@ -513,8 +513,8 @@ sub update {

 sub update_all {

     my ($self, $table, $update_params, $args) = @_;

+    # Allow all update

     $args ||= {};

-    

     $args->{allow_update_all} = 1;

     # Update all rows

@@ -582,8 +582,8 @@ sub delete {

 sub delete_all {

     my ($self, $table, $args) = @_;

+    # Allow all delete

     $args ||= {};

-    

     $args->{allow_delete_all} = 1;

     # Delete all rows

@@ -591,34 +591,40 @@ sub delete_all {

 }

 sub _select_usage { return << 'EOS' }

-Your select arguments is wrong.

-select usage:

+Select usage:

 $dbi->select(

-    $table,                # String or array ref

-    [@$columns],           # Array reference. this can be ommited

-    {%$where_params},      # Hash reference.  this can be ommited

-    $append_statement,     # String.          this can be ommited

-    $query_edit_callback   # Sub reference.   this can be ommited

+    $table,                   # String or array ref

+    {

+        columns => $columns   # Array reference

+        where   => $params    # Hash reference.

+        append  => $statement # String. 

+        query_edit_cb => $cb  # Sub reference

+    }

 );

 EOS

+our %VALID_SELECT_ARGS

+  = map { $_ => 1 } qw/columns where append query_edit_cb/;

+

+

 sub select {

-    my $self = shift;

-    

-    # Check argument

-    croak($self->_select_usage) unless @_;

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

-    # Arguments

-    my $tables = shift || '';

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

+    # Table

+    $tables ||= '';

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

-    my $columns          = ref $_[0] eq 'ARRAY' ? shift : [];

-    my $where_params     = ref $_[0] eq 'HASH'  ? shift : {};

-    my $append_statement = $_[0] && !ref $_[0]  ? shift : '';

-    my $query_edit_cb    = shift if ref $_[0] eq 'CODE';

+    # Check arguments

+    foreach my $name (keys %$args) {

+        croak "\"$name\" is invalid name"

+          unless $VALID_SELECT_ARGS{$name};

+    }

-    # Check rest argument

-    croak($self->_select_usage) if @_;

+    # Arguments

+    my $columns          = $args->{columns} || [];

+    my $where_params     = $args->{where} || {};

+    my $append_statement = $args->{append} || '';

+    my $query_edit_cb    = $args->{query_edit_cb};

     # SQL template for select statement

     my $template = 'select ';

@@ -624,19 +624,19 @@ $rows = $dbi->select('table1')->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 2},

                   {key1 => 3, key2 => 4}], "$test : table");

-$rows = $dbi->select('table1', ['key1'])->fetch_hash_all;

+$rows = $dbi->select('table1', {columns => ['key1']})->fetch_hash_all;

 is_deeply($rows, [{key1 => 1}, {key1 => 3}], "$test : table and columns and where key");

-$rows = $dbi->select('table1', {key1 => 1})->fetch_hash_all;

+$rows = $dbi->select('table1', {where => {key1 => 1}})->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 2}], "$test : table and columns and where key");

-$rows = $dbi->select('table1', ['key1'], {key1 => 3})->fetch_hash_all;

+$rows = $dbi->select('table1', {columns => ['key1'], where => {key1 => 3}})->fetch_hash_all;

 is_deeply($rows, [{key1 => 3}], "$test : table and columns and where key");

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

+$rows = $dbi->select('table1', {append => "order by key1 desc limit 1"})->fetch_hash_all;

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

-$rows = $dbi->select('table1', {key1 => 2}, sub {

+$rows = $dbi->select('table1', {where => {key1 => 2}, query_edit_cb =>sub {

     my $query = shift;

     $query->bind_filter(sub {

         my ($value, $table, $column, $dbi) = @_;

@@ -645,15 +645,18 @@ $rows = $dbi->select('table1', {key1 => 2}, sub {

         }

         return $value;

     });

-})->fetch_hash_all;

+}})->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 2}], "$test : query edit call back");

 $dbi->do($CREATE_TABLE->{2});

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

 $rows = $dbi->select([qw/table1 table2/],

-                     ['table1.key1 as table1_key1', 'table2.key1 as table2_key1', 'key2', 'key3'],

-                     {'table1.key2' => 2},

-                     "where table1.key1 = table2.key1")->fetch_hash_all;

+                      {

+                         columns => ['table1.key1 as table1_key1', 'table2.key1 as table2_key1', 'key2', 'key3'],

+                         where   => {'table1.key2' => 2},

+                         append  => "where table1.key1 = table2.key1"

+                      }

+                    )->fetch_hash_all;

 is_deeply($rows, [{table1_key1 => 1, table2_key1 => 1, key2 => 2, key3 => 5}], "$test : join");

 test 'Cache';

@@ -40,7 +40,7 @@ $dbi->connect_memory;

 $ret_val = $dbi->do($CREATE_TABLE->{0});

 ok(defined $ret_val, $test);

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

-$rows = $dbi->select('table1', {key1 => 'a'})->fetch_hash_all;

+$rows = $dbi->select('table1', {where => {key1 => 'a'}})->fetch_hash_all;

 is_deeply($rows, [{key1 => 'a', key2 => 2}], "$test : select rows");

 test 'connect_memory error';