@@ -15,6 +15,7 @@ use DBIx::Custom::Query;

 use DBIx::Custom::QueryBuilder;

 use DBIx::Custom::Where;

 use DBIx::Custom::Table;

+use DBIx::Custom::Tag;

 use Encode qw/encode_utf8 decode_utf8/;

 __PACKAGE__->attr(

@@ -156,7 +157,7 @@ sub method {

 }

 sub connect {

-    my $self = ref $_[0] ? shift : shift->SUPER::new(@_);;

+    my $self = ref $_[0] ? shift : shift->new(@_);;

     # Attributes

     my $data_source = $self->data_source;

@@ -451,6 +452,20 @@ sub new {

         croak qq{"$attr" is invalid attribute name}

           unless $self->can($attr);

     }

+

+    $self->register_tag(

+        '?'     => \&DBIx::Custom::Tag::placeholder,

+        '='     => \&DBIx::Custom::Tag::equal,

+        '<>'    => \&DBIx::Custom::Tag::not_equal,

+        '>'     => \&DBIx::Custom::Tag::greater_than,

+        '<'     => \&DBIx::Custom::Tag::lower_than,

+        '>='    => \&DBIx::Custom::Tag::greater_than_equal,

+        '<='    => \&DBIx::Custom::Tag::lower_than_equal,

+        'like'  => \&DBIx::Custom::Tag::like,

+        'in'    => \&DBIx::Custom::Tag::in,

+        'insert_param' => \&DBIx::Custom::Tag::insert_param,

+        'update_param' => \&DBIx::Custom::Tag::update_param

+    );

     return $self;

 }

@@ -676,8 +691,9 @@ sub update {

 sub update_all { shift->update(allow_update_all => 1, @_) };

-sub where { DBIx::Custom::Where->new(

-              query_builder => shift->query_builder) }

+sub where {

+    return DBIx::Custom::Where->new(query_builder => shift->query_builder)

+}

 sub _build_binds {

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

@@ -725,12 +741,13 @@ sub _croak {

     }

 }

-# Following methos are DEPRECATED!

+# DEPRECATED!

 __PACKAGE__->attr(

     dbi_options => sub { {} },

     filter_check  => 1

 );

+# DEPRECATED!

 sub default_bind_filter {

     my $self = shift;

@@ -752,6 +769,7 @@ sub default_bind_filter {

     return $self->{default_out_filter};

 }

+# DEPRECATED!

 sub default_fetch_filter {

     my $self = shift;

@@ -774,6 +792,7 @@ sub default_fetch_filter {

     return $self->{default_in_filter};

 }

+# DEPRECATED!

 sub register_tag_processor {

     return shift->query_builder->register_tag_processor(@_);

 }

@@ -924,14 +943,6 @@ Default filter when row is fetched.

     my $filters = $dbi->filters;

     $dbi        = $dbi->filters(\%filters);

-=head2 C<filter_check>

-

-    my $filter_check = $dbi->filter_check;

-    $dbi             = $dbi->filter_check(0);

-

-B<this attribute is now deprecated and has no mean

-because check is always done>. 

-

 =head2 C<password>

     my $password = $dbi->password;

@@ -970,7 +981,7 @@ C<connect()> method use this value to connect the database.

 L<DBIx::Custom> inherits all methods from L<Object::Simple>

 and implements the following new ones.

-=head2 C<(experimental) apply_filter >

+=head2 C<(experimental) apply_filter>

     $dbi->apply_filter(

         $table,

@@ -1056,8 +1067,6 @@ is expanded to

 This is used in C<select()>

-

-    

 =head2 C<delete>

     $dbi->delete(table  => $table,

@@ -1187,7 +1196,7 @@ C<default_filter> and C<filter> of C<DBIx::Custom::Result>

         }

     );

-Register tag processor.

+Register tag.

 =head2 C<rollback>

@@ -1282,16 +1291,87 @@ Return value of C<update_all()> is the count of affected rows.

 Create a new L<DBIx::Custom::Where> object.

-=head2 C<(deprecated) cache_method>

+=head2 C<cache_method>

     $dbi          = $dbi->cache_method(\&cache_method);

     $cache_method = $dbi->cache_method

 Method to set and get caches.

+=head1 Tags

+

+The following tags is available.

+

+=head2 C<?>

+

+Placeholder tag.

+

+    {? NAME}    ->   ?

+

+=head2 C<=>

+

+Equal tag.

+

+    {= NAME}    ->   NAME = ?

+

+=head2 C<E<lt>E<gt>>

+

+Not equal tag.

+

+    {<> NAME}   ->   NAME <> ?

+

+=head2 C<E<lt>>

+

+Lower than tag

+

+    {< NAME}    ->   NAME < ?

+

+=head2 C<E<gt>>

+

+Greater than tag

+

+    {> NAME}    ->   NAME > ?

+

+=head2 C<E<gt>=>

+

+Greater than or equal tag

+

+    {>= NAME}   ->   NAME >= ?

+

+=head2 C<E<lt>=>

+

+Lower than or equal tag

+

+    {<= NAME}   ->   NAME <= ?

+

+=head2 C<like>

+

+Like tag

+

+    {like NAME}   ->   NAME like ?

+

+=head2 C<in>

+

+In tag.

+

+    {in NAME COUNT}   ->   NAME in [?, ?, ..]

+

+=head2 C<insert_param>

+

+Insert parameter tag.

+

+    {insert_param NAME1 NAME2}   ->   (NAME1, NAME2) values (?, ?)

+

+=head2 C<update_param>

+

+Updata parameter tag.

+

+    {update_param NAME1 NAME2}   ->   set NAME1 = ?, NAME2 = ?

+

 =head1 STABILITY

-L<DBIx::Custom> is now stable. APIs keep backword compatible in the feature.

+L<DBIx::Custom> is stable. APIs keep backword compatible

+except experimental one in the feature.

 =head1 BUGS

@@ -1307,7 +1387,7 @@ Yuki Kimoto, C<< <kimoto.yuki at gmail.com> >>

 =head1 COPYRIGHT & LICENSE

-Copyright 2009 Yuki Kimoto, all rights reserved.

+Copyright 2009-2011 Yuki Kimoto, all rights reserved.

 This program is free software; you can redistribute it and/or modify it

 under the same terms as Perl itself.

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

 use Carp 'croak';

 use DBIx::Custom::Query;

-use DBIx::Custom::Tag;

 # Carp trust relationship

 push @DBIx::Custom::CARP_NOT, __PACKAGE__;

 push @DBIx::Custom::Where::CARP_NOT, __PACKAGE__;

 # Attributes

-__PACKAGE__->attr('tags' => sub {

-    {

-        '?'     => \&DBIx::Custom::Tag::placeholder,

-        '='     => \&DBIx::Custom::Tag::equal,

-        '<>'    => \&DBIx::Custom::Tag::not_equal,

-        '>'     => \&DBIx::Custom::Tag::greater_than,

-        '<'     => \&DBIx::Custom::Tag::lower_than,

-        '>='    => \&DBIx::Custom::Tag::greater_than_equal,

-        '<='    => \&DBIx::Custom::Tag::lower_than_equal,

-        'like'  => \&DBIx::Custom::Tag::like,

-        'in'    => \&DBIx::Custom::Tag::in,

-        'insert_param' => \&DBIx::Custom::Tag::insert_param,

-        'update_param' => \&DBIx::Custom::Tag::update_param

-    }

-});

+__PACKAGE__->attr('tags' => sub { {} });

 sub build_query {

     my ($self, $source)  = @_;

@@ -45,7 +30,7 @@ sub build_query {

 sub register_tag {

     my $self = shift;

-    # Merge tag processor

+    # Merge tag

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

     $self->tags({%{$self->tags}, %$tags});

@@ -76,23 +61,23 @@ sub _build_query {

             # Tag arguments

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

-            # Get tag processor

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

+            # Get tag

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

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

-            # Tag processor is not registered

+            # Tag is not registered

             croak qq{Tag "$tag_name" in "{a }" is not registered}

-              unless $tag_processor;

+              unless $tag;

-            # Tag processor not sub reference

-            croak qq{Tag processor "$tag_name" must be sub reference}

-              unless ref $tag_processor eq 'CODE';

+            # Tag not sub reference

+            croak qq{Tag "$tag_name" must be sub reference}

+              unless ref $tag eq 'CODE';

-            # Execute tag processor

-            my $r = $tag_processor->(@$tag_args);

+            # Execute tag

+            my $r = $tag->(@$tag_args);

-            # Check tag processor return value

-            croak qq{Tag processor "$tag_name" must return [STRING, ARRAY_REFERENCE]}

+            # Check tag return value

+            croak qq{Tag "$tag_name" must return [STRING, ARRAY_REFERENCE]}

               unless ref $r eq 'ARRAY' && defined $r->[0] && ref $r->[1] eq 'ARRAY';

             # Part of SQL statement and colum names

@@ -275,13 +260,14 @@ sub _placeholder_count {

     return $count;

 }

-# Follwoing methods are DEPRECATED!

+# DEPRECATED!

 __PACKAGE__->attr('tag_processors' => sub { {} });

+# DEPRECATED!

 sub register_tag_processor {

     my $self = shift;

-    # Merge tag processor

+    # Merge tag

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

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

@@ -306,9 +292,9 @@ DBIx::Custom::QueryBuilder - Query builder

 =head2 C<tags>

     my $tags = $builder->tags;

-    $builder           = $builder->tags(\%tags);

+    $builder = $builder->tags(\%tags);

-Tag processors.

+Tags.

 =head1 METHODS

@@ -346,11 +332,11 @@ Query

     $builder->register_tag(\%tags);

     $builder->register_tag(%tags);

-Register tag processor.

+Register tag.

 B<Example:>

-    $builder->register_tag_processor(

+    $builder->register_tag(

         '?' => sub {

             my $column = shift;

@@ -358,74 +344,5 @@ B<Example:>

         }

     );

-See also L<DBIx::Custom::QueryBuilder::TagProcessors> to know tag processor.

-

-=head1 Tags

-

-The following tags is available.

-

-=head2 C<?>

-

-Placeholder tag.

-

-    {? NAME}    ->   ?

-

-=head2 C<=>

-

-Equal tag.

-

-    {= NAME}    ->   NAME = ?

-

-=head2 C<E<lt>E<gt>>

-

-Not equal tag.

-

-    {<> NAME}   ->   NAME <> ?

-

-=head2 C<E<lt>>

-

-Lower than tag

-

-    {< NAME}    ->   NAME < ?

-

-=head2 C<E<gt>>

-

-Greater than tag

-

-    {> NAME}    ->   NAME > ?

-

-=head2 C<E<gt>=>

-

-Greater than or equal tag

-

-    {>= NAME}   ->   NAME >= ?

-

-=head2 C<E<lt>=>

-

-Lower than or equal tag

-

-    {<= NAME}   ->   NAME <= ?

-

-=head2 C<like>

-

-Like tag

-

-    {like NAME}   ->   NAME like ?

-

-=head2 C<in>

-

-In tag.

-

-    {in NAME COUNT}   ->   NAME in [?, ?, ..]

-

-=head2 C<insert_param>

-

-Insert parameter tag.

-

-    {insert_param NAME1 NAME2}   ->   (NAME1, NAME2) values (?, ?)

-

-=head2 C<update_param>

-

-Updata parameter tag.

+See also L<DBIx::Custom::Tag> to know tag.

-    {update_param NAME1 NAME2}   ->   set NAME1 = ?, NAME2 = ?

@@ -14,8 +14,8 @@ use Carp 'croak';

 push @DBIx::Custom::CARP_NOT, __PACKAGE__;

 __PACKAGE__->attr(

-  [qw/param query_builder/],

-  clause => sub { [] },

+    [qw/param query_builder/],

+    clause => sub { [] },

 );

 sub to_string {

@@ -37,7 +37,6 @@ sub to_string {

 }

 our %VALID_OPERATIONS = map { $_ => 1 } qw/and or/;

-

 sub _parse {

     my ($self, $clause, $where, $count, $op) = @_;

@@ -764,7 +764,7 @@ test 'connect super';

     }

     sub new {

-        my $self = shift->SUPER::connect(@_);

+        my $self = shift->SUPER::new(@_);

         return $self;

     }

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

 is($dbi->select(table => 'table1')->fetch_hash_first->{key1}, 1);

 $dbi = MyDBI->new($NEW_ARGS->{0});

+$dbi->connect;

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

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

 is($dbi->select(table => 'table1')->fetch_hash_first->{key1}, 1);

+{

+    package MyDBI2;

+    

+    use base 'DBIx::Custom';

+    sub connect {

+        my $self = shift->SUPER::new(@_);

+        $self->connect;

+        

+        return $self;

+    }

+}

+

+$dbi = MyDBI->connect($NEW_ARGS->{0});

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

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

+is($dbi->select(table => 'table1')->fetch_hash_first->{key1}, 1);

 test 'end_filter';

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

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

 use Test::More 'no_plan';

-use DBIx::Custom::QueryBuilder;

+use DBIx::Custom;

 # Function for test name

 sub test{ print "# $_[0]\n" }

@@ -54,17 +54,17 @@ $datas = [

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

     my $data = $datas->[$i];

-    my $builder = DBIx::Custom::QueryBuilder->new;

+    my $builder = DBIx::Custom->new->query_builder;

     my $query = $builder->build_query($data->{source});

     is($query->{sql}, $data->{sql_expected}, "$data->{name} : sql");

     is_deeply($query->{columns}, $data->{columns_expected}, "$data->{name} : columns");

 }

-test 'Original tag processor';

-$builder = DBIx::Custom::QueryBuilder->new;

+test 'Original tag';

+$builder = DBIx::Custom->new->query_builder;

-$ret_val = $builder->register_tag_processor(

+$ret_val = $builder->register_tag(

     p => sub {

         my @args = @_;

@@ -75,49 +75,49 @@ $ret_val = $builder->register_tag_processor(

 );

 $query = $builder->build_query("{p a b}");

-is($query->{sql}, "? a b;", "register_tag_processor sql");

-is_deeply($query->{columns}, [2], "register_tag_processor columns");

+is($query->{sql}, "? a b;", "register_tag sql");

+is_deeply($query->{columns}, [2], "register_tag columns");

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

-test "Tag processor error case";

-$builder = DBIx::Custom::QueryBuilder->new;

+test "Tag error case";

+$builder = DBIx::Custom->new->query_builder;

 eval{$builder->build_query('{? }')};

 like($@, qr/\QColumn name must be specified in tag "{? }"/, "? not arguments");

 eval{$builder->build_query("{a }")};

-like($@, qr/\QTag "a" in "{a }" is not registered/, "tag_processor not exist");

+like($@, qr/\QTag "a" in "{a }" is not registered/, "tag not exist");

-$builder->register_tag_processor({

+$builder->register_tag({

     q => 'string'

 });

 eval{$builder->build_query("{q}", {})};

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

+like($@, qr/Tag "q" must be sub reference/, "tag not code ref");

-$builder->register_tag_processor({

+$builder->register_tag({

    r => sub {} 

 });

 eval{$builder->build_query("{r}")};

-like($@, qr/\QTag processor "r" must return [STRING, ARRAY_REFERENCE]/, "tag processor return noting");

+like($@, qr/\QTag "r" must return [STRING, ARRAY_REFERENCE]/, "tag return noting");

-$builder->register_tag_processor({

+$builder->register_tag({

    s => sub { return ["a", ""]} 

 });

 eval{$builder->build_query("{s}")};

-like($@, qr/\QTag processor "s" must return [STRING, ARRAY_REFERENCE]/, "tag processor return not array columns");

+like($@, qr/\QTag "s" must return [STRING, ARRAY_REFERENCE]/, "tag return not array columns");

-$builder->register_tag_processor(

+$builder->register_tag(

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

 );

 test 'General error case';

-$builder = DBIx::Custom::QueryBuilder->new;

-$builder->register_tag_processor(

+$builder = DBIx::Custom->new->query_builder;

+$builder->register_tag(

     a => sub {

         return ["? ? ?", ['']];

     }

@@ -126,7 +126,7 @@ eval{$builder->build_query("{a}")};

 like($@, qr/\QPlaceholder count in "? ? ?" must be same as column count 1/, "placeholder count is invalid");

-test 'Default tag processor Error case';

+test 'Default tag Error case';

 eval{$builder->build_query("{= }")};

 like($@, qr/Column name must be specified in tag "{= }"/, "basic '=' : key not exist");