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

 0.1643

+  add table tag

   fix  bug : filter can't overwirite undef value.

   add feature to apply_filter(). you can apply end filter.

   add feature to apply_filter(). TABLE__COLUMN is filterded now.

@@ -183,7 +183,10 @@ sub create_query {

         my $q = $self->cache_method->($self, $source);

         # Create query

-        $query = DBIx::Custom::Query->new($q) if $q;

+        if ($q) {

+            $query = DBIx::Custom::Query->new($q);

+            $query->filters($self->filters);

+        }

     }

     unless ($query) {

@@ -197,7 +200,8 @@ sub create_query {

         # Cache query

         $self->cache_method->($self, $source,

                              {sql     => $query->sql, 

-                              columns => $query->columns})

+                              columns => $query->columns,

+                              tables  => $query->tables})

           if $cache;

     }

@@ -299,11 +303,13 @@ sub execute{

     $query = $self->create_query($query)

       unless ref $query;

-    # Auto filter

+    # Applied filter

     my $filter = {};

-    my $tables = $args{table} || [];

-    $tables = [$tables]

-      unless ref $tables eq 'ARRAY';

+    my $tables = $query->tables;

+    my $arg_tables = $args{table} || [];

+    $arg_tables = [$arg_tables]

+      unless ref $arg_tables eq 'ARRAY';

+    push @$tables, @$arg_tables;

     foreach my $table (@$tables) {

         $filter = {

             %$filter,

@@ -1316,6 +1322,14 @@ Method to set and get caches.

 The following tags is available.

+=head2 C<table>

+

+Table tag

+

+    {table TABLE}    ->    TABLE

+

+This is used to teach what is applied table to C<execute()>.

+

 =head2 C<?>

 Placeholder tag.

@@ -7,7 +7,7 @@ use base 'Object::Simple';

 use Carp 'croak';

-__PACKAGE__->attr([qw/columns sql sth filters/]);

+__PACKAGE__->attr([qw/columns sql sth filters tables/]);

 sub filter {

     my $self = shift;

@@ -46,6 +46,9 @@ sub _build_query {

     # All Columns

     my $all_columns = [];

+    # Tables

+    my $tables = [];

+    

     # Build SQL 

     foreach my $node (@$tree) {

@@ -61,6 +64,14 @@ sub _build_query {

             # Tag arguments

             my $tag_args = $node->{tag_args};

+            # Table

+            if ($tag_name eq 'table') {

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

+                push @$tables, $table;

+                $sql .= $table;

+                next;

+            }

+

             # Get tag

             my $tag = $self->tag_processors->{$tag_name}

                              || $self->tags->{$tag_name};

@@ -101,7 +112,11 @@ sub _build_query {

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

     # Query

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

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

+        sql => $sql,

+        columns => $all_columns,

+        tables => $tables

+    );

     return $query;

 }

@@ -481,7 +481,7 @@ $dbi->execute($CREATE_TABLE->{0});

 $source = 'select * from table1 where {= key1} and {= key2};';

 $dbi->create_query($source);

 is_deeply($dbi->{_cached}->{$source}, 

-          {sql => "select * from table1 where key1 = ? and key2 = ?;", columns => ['key1', 'key2']}, "cache");

+          {sql => "select * from table1 where key1 = ? and key2 = ?;", columns => ['key1', 'key2'], tables => []}, "cache");

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

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

@@ -664,6 +664,18 @@ $result = $dbi->execute("select * from table1 where {= key1} and {= key2};",

 $rows   = $result->fetch_hash_all;

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

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

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

+$dbi->register_filter(twice => sub { $_[0] * 2 });

+$dbi->apply_filter(

+    'table1', 'key1' => {out => 'twice', in => 'twice'}

+);

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

+$result = $dbi->execute("select * from {table table1} where {= key1} and {= key2};",

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

+$rows   = $result->fetch_hash_all;

+is_deeply($rows, [{key1 => 4, key2 => 2}], "execute table tag");

+

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

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

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