@@ -186,7 +186,7 @@ sub create_query {

     if ($cached_query) {

         $query = DBIx::Custom::Query->new(

             sql       => $cached_query->sql,

-            key_infos => $cached_query->key_infos

+            columns => $cached_query->columns

         );

     }

     else {

@@ -238,7 +238,6 @@ sub query{

     if (my $execute_error = $@) {

         require Data::Dumper;

         my $sql              = $query->{sql} || '';

-        my $key_infos_dump   = Data::Dumper->Dump([$query->key_infos], ['*key_infos']);

         my $params_dump      = Data::Dumper->Dump([$params], ['*params']);

         croak("$execute_error" . 

@@ -265,28 +264,32 @@ sub query{

 sub _build_bind_values {

     my ($self, $query, $params, $filter) = @_;

-    my $key_infos      = $query->key_infos;

-    my $default_filter = $self->default_query_filter || '';

-    my $filters        = $self->filters;

-    $filter            ||= {};

     # binding values

     my @bind_values;

     # Build bind values

-    foreach my $key_info (@$key_infos) {

-        my $column       = $key_info->{column};

-        my $pos          = $key_info->{pos};

+    my $count = {};

+    foreach my $column (@{$query->columns}) {

         # Value

-        my $value = defined $pos ? $params->{$column}->[$pos] : $params->{$column};

+        my $value = ref $params->{$column}

+                  ? $params->{$column}->[$count->{$column} || 0]

+                  : $params->{$column};

         # Filter

-        my $fname = $filter->{$column} || $default_filter || '';

+        $filter ||= {};

+        # Filter name

+        my $fname = $filter->{$column} || $self->default_query_filter || '';

+        

+        my $filters = $self->filters;

         push @bind_values, $filters->{$fname}

                          ? $filters->{$fname}->($value)

                          : $value;

+        

+        # Count up 

+        $count->{$column}++;

     }

     return \@bind_values;

@@ -420,7 +423,7 @@ our %VALID_UPDATE_ARGS

   = map { $_ => 1 } qw/where append filter allow_update_all/;

 sub update {

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

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

     # Check arguments

     foreach my $name (keys %$args) {

@@ -435,7 +438,7 @@ sub update {

     my $allow_update_all = $args->{allow_update_all};

     # Update keys

-    my @update_keys = keys %$update_params;

+    my @update_keys = keys %$params;

     # Not exists update kyes

     croak("Key-value pairs for update must be specified to 'update' second argument")

@@ -453,15 +456,13 @@ sub update {

     # Where clause

     my $where_clause = '';

-    my $new_where_params = {};

+    my $new_where = {};

     if (@where_keys) {

         $where_clause = 'where ';

         foreach my $where_key (@where_keys) {

-            $new_where_params->{"$where_key@where"}

-              = $where_params->{$where_key};

-

-            $where_clause .= "{= $where_key@where} and ";

+            

+            $where_clause .= "{= $where_key} and ";

         }

         $where_clause =~ s/ and $//;

     }

@@ -471,7 +472,15 @@ sub update {

     $template .= " $append_statement" if $append_statement;

     # Rearrange parammeters

-    my $params = {%$update_params, %$new_where_params};

+    foreach my $where_key (@where_keys) {

+        

+        if (exists $params->{$where_key}) {

+            $params->{$where_key} = [$params->{$where_key}]

+              unless ref $params->{$where_key} eq 'ARRAY';

+            

+            push @{$params->{$where_key}}, $where_params->{$where_key}};

+        }

+    }

     # Execute query

     my $ret_val = $self->query($template, $params, {filter => $filter});

@@ -595,23 +604,11 @@ sub select {

     # Where clause keys

     my @where_keys = keys %$where_params;

-    my $where_params_new = {};

-    

     # Join where clause

     if (@where_keys) {

         $template .= 'where ';

         foreach my $where_key (@where_keys) {

-            my $key_info = DBIx::Custom::KeyInfo->new($where_key);

-            

-            my $table_new = $key_info->table || $tables->[0];

-            my $column = $table_new . '.' . $key_info->column

-                         . '#' . $table_new;

-                      

             $template .= "{= $column} and ";

-            

-            $where_params_new->{$table_new} ||= {};

-            $where_params_new->{$table_new}->{$key_info->column}

-              = $where_params->{$where_key};

         }

     }

     $template =~ s/ and $//;

@@ -630,7 +627,7 @@ sub select {

     }

     # Execute query

-    my $result = $self->query($template, $where_params_new, {filter => $filter});

+    my $result = $self->query($template, $where_params, {filter => $filter});

     return $result;

 }

@@ -5,7 +5,7 @@ use warnings;

 use base 'Object::Simple';

-__PACKAGE__->attr([qw/sql key_infos default_filter filter sth/]);

+__PACKAGE__->attr([qw/sql columns default_filter filter sth/]);

 1;

@@ -51,12 +51,12 @@ Filter excuted when value is bind

     $query  = $query->filter($filter);

     $filter = $query->filter;

-=head2 key_infos

+=head2 columns

 Key informations

-    $query     = $query->key_infos($key_infos);

-    $key_infos = $query->key_infos;

+    $query   = $query->columns($columns);

+    $columns = $query->columns;

 =head1 METHODS

@@ -4,8 +4,10 @@ use strict;

 use warnings;

 use base 'Object::Simple';

+

 use Carp 'croak';

 use DBIx::Custom::Query;

+use DBIx::Custom::SQLTemplate::TagProcessors;

 __PACKAGE__->dual_attr('tag_processors', default => sub { {} },

                                          inherit => 'hash_copy');

@@ -15,7 +17,7 @@ __PACKAGE__->dual_attr('tag_end',   default => '}', inherit => 'scalar_copy');

 __PACKAGE__->dual_attr('tag_syntax', inherit => 'scalar_copy');

-__PACKAGE__->add_tag_processor(

+__PACKAGE__->resist_tag_processor(

     '?'      => \&DBIx::Custom::SQLTemplate::TagProcessors::expand_basic_tag,

     '='      => \&DBIx::Custom::SQLTemplate::TagProcessors::expand_basic_tag,

     '<>'     => \&DBIx::Custom::SQLTemplate::TagProcessors::expand_basic_tag,

@@ -48,7 +50,7 @@ __PACKAGE__->tag_syntax(<< 'EOS');

 EOS

-sub add_tag_processor {

+sub resist_tag_processor {

     my $invocant = shift;

     my $tag_processors = ref $_[0] eq 'HASH' ? $_[0] : {@_};

     $invocant->tag_processors({%{$invocant->tag_processors}, %{$tag_processors}});

@@ -146,7 +148,7 @@ sub _build_query {

     my $sql = '';

     # All parameter key infomation

-    my $all_key_infos = [];

+    my $all_columns = [];

     # Build SQL 

     foreach my $node (@$tree) {

@@ -173,20 +175,19 @@ sub _build_query {

               unless ref $tag_processor eq 'CODE';

             # Expand tag using tag processor

-            my ($expand, $key_infos)

-              = $tag_processor->($tag_name, $tag_args);

+            my ($expand, $columns) = $tag_processor->($tag_name, $tag_args);

             # Check tag processor return value

-            croak("Tag processor '$tag_name' must return (\$expand, \$key_infos)")

-              if !defined $expand || ref $key_infos ne 'ARRAY';

+            croak("Tag processor '$tag_name' must return (\$expand, \$columns)")

+              if !defined $expand || ref $columns ne 'ARRAY';

             # Check placeholder count

             croak("Placeholder count in SQL created by tag processor '$tag_name' " .

                   "must be same as key informations count")

-              unless $self->_placeholder_count($expand) eq @$key_infos;

+              unless $self->_placeholder_count($expand) eq @$columns;

             # Add key information

-            push @$all_key_infos, @$key_infos;

+            push @$all_columns, @$columns;

             # Join expand tag to SQL

             $sql .= $expand;

@@ -197,7 +198,7 @@ sub _build_query {

     $sql .= ';' unless $sql =~ /;$/;

     # Query

-    my $query = DBIx::Custom::Query->new(sql => $sql, key_infos => $all_key_infos);

+    my $query = DBIx::Custom::Query->new(sql => $sql, columns => $all_columns);

     return $query;

 }

@@ -216,134 +217,6 @@ sub _placeholder_count {

 1;

-package DBIx::Custom::SQLTemplate::TagProcessors;

-

-use strict;

-use warnings;

-

-use Carp 'croak';

-use DBIx::Custom::KeyInfo;

-

-sub expand_basic_tag {

-    my ($tag_name, $tag_args) = @_;

-    

-    # Key

-    my $column = $tag_args->[0];

-    

-    # Key is not exist

-    croak("You must be pass key as argument to tag '{$tag_name }'")

-      unless $column;

-    

-    # delete ID

-    

-    

-    # Expanded tag

-    my $expand = $tag_name eq '?'

-               ? '?'

-               : "$column $tag_name ?";

-

-    return ($expand, [{column => $column}]);

-}

-

-sub expand_in_tag {

-    my ($tag_name, $tag_args) = @_;

-    my ($column, $placeholder_count) = @$tag_args;

-    

-    # Key must be specified

-    croak("You must be pass key as first argument of tag '{$tag_name }'\n" . 

-          "Usage: {$tag_name \$key \$placeholder_count}")

-      unless $column;

-    

-    # Place holder count must be specified

-    croak("You must be pass placeholder count as second argument of tag '{$tag_name }'\n" . 

-          "Usage: {$tag_name \$key \$placeholder_count}")

-      if !$placeholder_count || $placeholder_count =~ /\D/;

-

-    # Expand tag

-    my $expand = "$column $tag_name (";

-    for (my $i = 0; $i < $placeholder_count; $i++) {

-        $expand .= '?, ';

-    }

-    

-    $expand =~ s/, $//;

-    $expand .= ')';

-    

-    # Create parameter key infomations

-    my $key_infos = [];

-    for (my $i = 0; $i < $placeholder_count; $i++) {

-        

-        # Add parameter key infos

-        push @$key_infos, {column => $column, pos => $i};

-    }

-    

-    return ($expand, $key_infos);

-}

-

-sub expand_insert_tag {

-    my ($tag_name, $columns) = @_;

-    

-    # Insert key (k1, k2, k3, ..)

-    my $insert_keys = '(';

-    

-    # placeholder (?, ?, ?, ..)

-    my $place_holders = '(';

-    

-    foreach my $column (@$columns) {

-        

-        # Join insert column

-        $insert_keys   .= "$column, ";

-        

-        # Join place holder

-        $place_holders .= "?, ";

-    }

-    

-    # Delete last ', '

-    $insert_keys =~ s/, $//;

-    

-    # Close 

-    $insert_keys .= ')';

-    $place_holders =~ s/, $//;

-    $place_holders .= ')';

-    

-    # Expand tag

-    my $expand = "$insert_keys values $place_holders";

-    

-    # Create parameter key infomations

-    my $key_infos = [];

-    foreach my $column (@$columns) {

-        push @$key_infos, {column => $column};

-    }

-    

-    return ($expand, $key_infos);

-}

-

-sub expand_update_tag {

-    my ($tag_name, $columns) = @_;

-    

-    # Expanded tag

-    my $expand = 'set ';

-    

-    foreach my $column (@$columns) {

-

-        # Join key and placeholder

-        $expand .= "$column = ?, ";

-    }

-    

-    # Delete last ', '

-    $expand =~ s/, $//;

-    

-    my $key_infos = [];

-    foreach my $column (@$columns) {

-        push @$key_infos, {column => $column};

-    }

-    

-    return ($expand, $key_infos);

-}

-

-package DBIx::Custom::SQLTemplate;

-

-1;

-

 =head1 NAME

 DBIx::Custom::SQLTemplate - DBIx::Custom SQL Template

@@ -420,15 +293,15 @@ query has two infomation

     1. sql       : SQL

     2. key_infos : Parameter access key information

-=head2 add_tag_processor

+=head2 resist_tag_processor

 Add tag processor

-    $sql_tmpl = $sql_tmpl->add_tag_processor($tag_processor);

+    $sql_tmpl = $sql_tmpl->resist_tag_processor($tag_processor);

-The following is add_tag_processor sample

+The following is resist_tag_processor sample

-    $sql_tmpl->add_tag_processor(

+    $sql_tmpl->resist_tag_processor(

         '?' => sub {

             my ($tag_name, $tag_args) = @_;

@@ -0,0 +1,131 @@

+package DBIx::Custom::SQLTemplate::TagProcessors;

+

+use strict;

+use warnings;

+

+use Carp 'croak';

+

+sub expand_basic_tag {

+    my ($tag_name, $tag_args) = @_;

+    

+    # Key

+    my $column = $tag_args->[0];

+    

+    # Key is not exist

+    croak("You must be pass key as argument to tag '{$tag_name }'")

+      unless $column;

+    

+    # Expand

+    return ("$column $tag_name ?", [$column]);

+}

+

+sub expand_placeholder_tag {

+    my ($tag_name, $tag_args) = @_;

+    

+    # Key

+    my $column = $tag_args->[0];

+    

+    # Key is not exist

+    croak("You must be pass key as argument to tag '{$tag_name }'")

+      unless $column;

+    

+    # Expand

+    return ('?', [$column]);

+}

+

+sub expand_in_tag {

+    my ($tag_name, $tag_args) = @_;

+    my ($column, $count) = @$tag_args;

+    

+    # Key must be specified

+    croak("You must be pass key as first argument of tag '{$tag_name }'\n" . 

+          "Usage: {$tag_name \$key \$count}")

+      unless $column;

+    

+    # Place holder count must be specified

+    croak("You must be pass placeholder count as second argument of tag '{$tag_name }'\n" . 

+          "Usage: {$tag_name \$key \$count}")

+      if !$count || $count =~ /\D/;

+

+    # Expand tag

+    my $expand = "$column $tag_name (";

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

+        $expand .= '?, ';

+    }

+    

+    $expand =~ s/, $//;

+    $expand .= ')';

+    

+    # Columns

+    my $columns = [];

+    puhs @$columns, $column for (0 .. $count - 1);

+    

+    return ($expand, $columns);

+}

+

+sub expand_insert_tag {

+    my ($tag_name, $columns) = @_;

+    

+    # Insert key (k1, k2, k3, ..)

+    my $insert_keys = '(';

+    

+    # placeholder (?, ?, ?, ..)

+    my $place_holders = '(';

+    

+    foreach my $column (@$columns) {

+        

+        # Join insert column

+        $insert_keys   .= "$column, ";

+        

+        # Join place holder

+        $place_holders .= "?, ";

+    }

+    

+    # Delete last ', '

+    $insert_keys =~ s/, $//;

+    

+    # Close 

+    $insert_keys .= ')';

+    $place_holders =~ s/, $//;

+    $place_holders .= ')';

+    

+    # Expand tag

+    my $expand = "$insert_keys values $place_holders";

+    

+    return ($expand, [@$columns]);

+}

+

+sub expand_update_tag {

+    my ($tag_name, $columns) = @_;

+    

+    # Expanded tag

+    my $expand = 'set ';

+    

+    foreach my $column (@$columns) {

+

+        # Join key and placeholder

+        $expand .= "$column = ?, ";

+    }

+    

+    # Delete last ', '

+    $expand =~ s/, $//;

+    

+    return ($expand, [@$columns]);

+}

+

+1;

+

+=head1 NAME

+

+DBIx::Custom::SQLTemplate::TagProcessor - Tag processor

+

+=head1 FUNCTIONS

+

+=head2 expand_basic_tag

+

+=head2 expand_in_tag

+

+=head2 expand_insert_tag

+

+=head2 expand_update_tag

+

@@ -87,7 +87,7 @@ for (my $i = 0; $i < @$datas; $i++) {

 test 'Original tag processor';

 $sql_tmpl = DBIx::Custom::SQLTemplate->new;

-$ret_val = $sql_tmpl->add_tag_processor(

+$ret_val = $sql_tmpl->resist_tag_processor(

     p => sub {

         my ($tag_name, $args) = @_;

@@ -98,8 +98,8 @@ $ret_val = $sql_tmpl->add_tag_processor(

 );

 $query = $sql_tmpl->create_query("{p a b}");

-is($query->{sql}, "p ? a b;", "$test : add_tag_processor sql");

-is_deeply($query->{key_infos}, [2], "$test : add_tag_processor key_infos");

+is($query->{sql}, "p ? a b;", "$test : resist_tag_processor sql");

+is_deeply($query->{key_infos}, [2], "$test : resist_tag_processor key_infos");

 isa_ok($ret_val, 'DBIx::Custom::SQLTemplate');

@@ -110,28 +110,28 @@ $sql_tmpl = DBIx::Custom::SQLTemplate->new;

 eval{$sql_tmpl->create_query("{a }")};

 like($@, qr/Tag '{a }' in SQL template is not exist/, "$test : tag_processor not exist");

-$sql_tmpl->add_tag_processor({

+$sql_tmpl->resist_tag_processor({

     q => 'string'

 });

 eval{$sql_tmpl->create_query("{q}", {})};

 like($@, qr/Tag processor 'q' must be code reference/, "$test : tag_processor not code ref");

-$sql_tmpl->add_tag_processor({

+$sql_tmpl->resist_tag_processor({

    r => sub {} 

 });

 eval{$sql_tmpl->create_query("{r}")};

 like($@, qr/\QTag processor 'r' must return (\E\$expand\Q, \E\$key_infos\Q)/, "$test : tag processor return noting");

-$sql_tmpl->add_tag_processor({

+$sql_tmpl->resist_tag_processor({

    s => sub { return ("a", "")} 

 });

 eval{$sql_tmpl->create_query("{s}")};

 like($@, qr/\QTag processor 's' must return (\E\$expand\Q, \E\$key_infos\Q)/, "$test : tag processor return not array key_infos");

-$sql_tmpl->add_tag_processor(

+$sql_tmpl->resist_tag_processor(

     t => sub {return ("a", [])}

 );

@@ -141,7 +141,7 @@ like($@, qr/Tag '{t }' arguments cannot contain '?'/, "$test : cannot contain '?

 test 'General error case';

 $sql_tmpl = DBIx::Custom::SQLTemplate->new;

-$sql_tmpl->add_tag_processor(

+$sql_tmpl->resist_tag_processor(

     a => sub {

         return ("? ? ?", [[],[]]);

     }