@@ -1,3 +1,6 @@

+0.1605

+  changed arguments of tag processor

+  remaned DBIx::Custom::QueryBuilder::TagProcessors functions

 0.1604

   changed argument of tag processor(not backword compatible)

   renamed default_query_filter to default_bind_filter(not backword compatible)

@@ -450,7 +450,7 @@ DBIx::Custom - DBI with hash parameter binding and filtering system

 =cut

-our $VERSION = '0.1604';

+our $VERSION = '0.1605';

 =head1 STABILITY

@@ -11,17 +11,17 @@ use DBIx::Custom::QueryBuilder::TagProcessor;

 __PACKAGE__->dual_attr('tag_processors', default => sub { {} }, inherit => 'hash_copy');

 __PACKAGE__->register_tag_processor(

-    '?'      => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_placeholder_tag,

-    '='      => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_equal_tag,

-    '<>'     => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_not_equal_tag,

-    '>'      => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_greater_than_tag,

-    '<'      => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_lower_than_tag,

-    '>='     => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_greater_than_equal_tag,

-    '<='     => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_lower_than_equal_tag,

-    'like'   => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_like_tag,

-    'in'     => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_in_tag,

-    'insert' => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_insert_tag,

-    'update' => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_update_tag

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

+    '='      => \&DBIx::Custom::QueryBuilder::TagProcessors::equal,

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

+    '>'      => \&DBIx::Custom::QueryBuilder::TagProcessors::greater_than,

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

+    '>='     => \&DBIx::Custom::QueryBuilder::TagProcessors::greater_than_equal,

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

+    'like'   => \&DBIx::Custom::QueryBuilder::TagProcessors::like,

+    'in'     => \&DBIx::Custom::QueryBuilder::TagProcessors::in,

+    'insert' => \&DBIx::Custom::QueryBuilder::TagProcessors::insert,

+    'update' => \&DBIx::Custom::QueryBuilder::TagProcessors::update

 );

 __PACKAGE__->attr(tag_start => '{');

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

               unless ref $tag_processor eq 'CODE';

             # Expand tag using tag processor

-            my ($expand, $columns) = @{$tag_processor->($tag_args)};

+            my ($expand, $columns) = @{$tag_processor->(@$tag_args)};

             # Check tag processor return value

             croak qq{Tag processor "$tag_name" must return [\$expand, \$columns]}

@@ -5,11 +5,8 @@ use warnings;

 use Carp 'croak';

-sub expand_basic_tag {

-    my ($name, $args) = @_;

-    

-    # Column

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

+sub _basic {

+    my ($name, $column) = @_;

     # Check arguments

     croak qq{Column must be specified in tag "{$name }"}

@@ -18,19 +15,16 @@ sub expand_basic_tag {

     return ["$column $name ?", [$column]];

 }

-sub expand_equal_tag              { expand_basic_tag('=', @_) }

-sub expand_not_equal_tag          { expand_basic_tag('<>', @_) }

-sub expand_greater_than_tag       { expand_basic_tag('>', @_) }

-sub expand_lower_than_tag         { expand_basic_tag('<', @_) }

-sub expand_greater_than_equal_tag { expand_basic_tag('>=', @_) }

-sub expand_lower_than_equal_tag   { expand_basic_tag('<=', @_) }

-sub expand_like_tag               { expand_basic_tag('like', @_) }

+sub equal              { _basic('=',    @_) }

+sub not_equal          { _basic('<>',   @_) }

+sub greater_than       { _basic('>',    @_) }

+sub lower_than         { _basic('<',    @_) }

+sub greater_than_equal { _basic('>=',   @_) }

+sub lower_than_equal   { _basic('<=',   @_) }

+sub like               { _basic('like', @_) }

-sub expand_placeholder_tag {

-    my $tag_args = shift;

-    

-    # Column

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

+sub placeholder {

+    my $column = shift;

     # Check arguments

     croak qq{Column must be specified in tag "{? }"}

@@ -39,8 +33,8 @@ sub expand_placeholder_tag {

     return ['?', [$column]];

 }

-sub expand_in_tag {

-    my ($column, $count) = @{$_[0]};

+sub in {

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

     # Check arguments

     croak qq{Column and count of values must be specified in tag "{in }"}

@@ -61,31 +55,31 @@ sub expand_in_tag {

     return [$expand, $columns];

 }

-sub expand_insert_tag {

-    my $columns = shift;

+sub insert {

+    my @columns = @_;

     # Insert

     my $expand = '(';

-    $expand .= "$_, " for @$columns;

+    $expand .= "$_, " for @columns;

     $expand =~ s/, $//;

     $expand .= ') ';

     $expand .= 'values (';

-    $expand .= "?, " for @$columns;

+    $expand .= "?, " for @columns;

     $expand =~ s/, $//;

     $expand .= ')';

-    return [$expand, [@$columns]];

+    return [$expand, \@columns];

 }

-sub expand_update_tag {

-    my $columns = shift;

+sub update {

+    my @columns = @_;

     # Update

     my $expand = 'set ';

-    $expand .= "$_ = ?, " for @$columns;

+    $expand .= "$_ = ?, " for @columns;

     $expand =~ s/, $//;

-    return [$expand, [@$columns]];

+    return [$expand, \@columns];

 }

 1;

@@ -96,25 +90,25 @@ DBIx::Custom::SQLBuilder::TagProcessors - Tag processor

 =head1 FUNCTIONS

-=head2 C<expand_basic_tag>

+=head2 C<placeholder>

-=head2 C<expand_equal_tag>

+=head2 C<equal>

-=head2 C<expand_not_equal_tag>

+=head2 C<not_equal>

-=head2 C<expand_greater_than_tag>

+=head2 C<greater_than>

-=head2 C<expand_lower_than_tag>

+=head2 C<lower_than>

-=head2 C<expand_greater_than_equal_tag>

+=head2 C<greater_than_equal>

-=head2 C<expand_lower_than_equal_tag>

+=head2 C<lower_than_equal>

-=head2 C<expand_like_tag>

+=head2 C<like>

-=head2 C<expand_in_tag>

+=head2 C<in>

-=head2 C<expand_insert_tag>

+=head2 C<insert>

-=head2 C<expand_update_tag>

+=head2 C<update>