@@ -24,9 +24,9 @@ sub parse {

     # Parse

     ($key || '') =~ /^(?:(.+?)\.)?(.+?)(?:@(.+))?$/;

-    $self->table($1);

-    $self->column($2);

-    $self->id($3);

+    $self->table($1 || '');

+    $self->column($2 || '');

+    $self->id($3 || '');

     return $self;

 }

@@ -177,7 +177,7 @@ sub _build_query {

             # Expand tag using tag processor

             my ($expand, $key_infos)

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

+              = $tag_processor->($tag_name, $tag_args, $self->table || '');

             # Check tag processor return value

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

@@ -53,17 +53,3 @@ $dbi = DBIx::Custom::Basic->new($NEW_ARGS->{0});

 ok($dbi->filters->{encode_utf8}, "$test : exists default_bind_filter");

 ok($dbi->filters->{decode_utf8}, "$test : exists default_fetch_filter");

-$ret_val = $dbi->utf8_filter_on;

-is($dbi->bind_filter, $dbi->filters->{encode_utf8}, 'default bind filter');

-is($dbi->fetch_filter, $dbi->filters->{decode_utf8}, 'default fetch filter');

-is(ref $ret_val, 'DBIx::Custom::Basic', "$test : retern value");

-

-$decoded_str = 'あ';

-$encoded_str = $dbi->bind_filter->($decoded_str);

-is($encoded_str, encode('UTF-8', $decoded_str), "$test : encode utf8");

-is($decoded_str, $dbi->fetch_filter->($encoded_str), "$test : fetch_filter");

-

-$decoded_str = 'a';

-$encoded_str = $dbi->bind_filter->($decoded_str);

-is($encoded_str, encode('UTF-8', $decoded_str), "$test : upgrade and encode utf8");

-is($decoded_str, $dbi->fetch_filter->($encoded_str), "$test : fetch_filter");

@@ -25,14 +25,14 @@ $datas = [

         tmpl            => "a {?  k1} b {=  k2} {<> k3} {>  k4} {<  k5} {>= k6} {<= k7} {like k8}", ,

         sql_expected    => "a ? b k2 = ? k3 <> ? k4 > ? k5 < ? k6 >= ? k7 <= ? k8 like ?;",

         key_infos_expected   => [

-            {original_key => 'k1', table => '', column => 'k1', access_keys => [['k1']]},

-            {original_key => 'k2', table => '', column => 'k2', access_keys => [['k2']]},

-            {original_key => 'k3', table => '', column => 'k3', access_keys => [['k3']]},

-            {original_key => 'k4', table => '', column => 'k4', access_keys => [['k4']]},

-            {original_key => 'k5', table => '', column => 'k5', access_keys => [['k5']]},

-            {original_key => 'k6', table => '', column => 'k6', access_keys => [['k6']]},

-            {original_key => 'k7', table => '', column => 'k7', access_keys => [['k7']]},

-            {original_key => 'k8', table => '', column => 'k8', access_keys => [['k8']]},

+            {table => '', column => 'k1', id => ''},

+            {table => '', column => 'k2', id => ''},

+            {table => '', column => 'k3', id => ''},

+            {table => '', column => 'k4', id => ''},

+            {table => '', column => 'k5', id => ''},

+            {table => '', column => 'k6', id => ''},

+            {table => '', column => 'k7', id => ''},

+            {table => '', column => 'k8', id => ''},

         ],

     },

     {

@@ -40,9 +40,9 @@ $datas = [

         tmpl            => "{in k1 3};",

         sql_expected    => "k1 in (?, ?, ?);",

         key_infos_expected   => [

-            {original_key => 'k1', table => '', column => 'k1', access_keys => [['k1', [0]]]},

-            {original_key => 'k1', table => '', column => 'k1', access_keys => [['k1', [1]]]},

-            {original_key => 'k1', table => '', column => 'k1', access_keys => [['k1', [2]]]},

+            {table => '', column => 'k1', id => '', pos => 0},

+            {table => '', column => 'k1', id => '', pos => 1},

+            {table => '', column => 'k1', id => '', pos => 2},

         ],

     },

@@ -52,8 +52,8 @@ $datas = [

         tmpl            => "{= a.k1} {= a.k2}",

         sql_expected    => "a.k1 = ? a.k2 = ?;",

         key_infos_expected  => [

-            {original_key => 'a.k1', table => 'a', column => 'k1', access_keys => [['a.k1'], ['a', 'k1']]},

-            {original_key => 'a.k2', table => 'a', column => 'k2', access_keys => [['a.k2'], ['a', 'k2']]},

+            {table => 'a', column => 'k1', id => ''},

+            {table => 'a', column => 'k2', id => ''},

         ],

     },

     {   

@@ -61,10 +61,10 @@ $datas = [

         tmpl            => "{in a.k1 2} {in b.k2 2}",

         sql_expected    => "a.k1 in (?, ?) b.k2 in (?, ?);",

         key_infos_expected  => [

-            {original_key => 'a.k1', table => 'a', column => 'k1', access_keys => [['a.k1', [0]], ['a', 'k1', [0]]]},

-            {original_key => 'a.k1', table => 'a', column => 'k1', access_keys => [['a.k1', [1]], ['a', 'k1', [1]]]},

-            {original_key => 'b.k2', table => 'b', column => 'k2', access_keys => [['b.k2', [0]], ['b', 'k2', [0]]]},

-            {original_key => 'b.k2', table => 'b', column => 'k2', access_keys => [['b.k2', [1]], ['b', 'k2', [1]]]},

+            {table => 'a', column => 'k1', id => '', pos => 0},

+            {table => 'a', column => 'k1', id => '', pos => 1},

+            {table => 'b', column => 'k2', id => '', pos => 0},

+            {table => 'b', column => 'k2', id => '', pos => 1},

         ],

     },

     {

@@ -39,10 +39,9 @@ $dbi = DBIx::Custom::SQLite->new;

 $dbi->connect_memory;

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

 ok(defined $ret_val, $test);

-$dbi->utf8_filter_on;

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

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

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

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

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

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

 test 'connect_memory error';

 eval{$dbi->connect_memory};