@@ -1,5 +1,10 @@

 0.1637

   renamed dbi_options to dbi_option. dbi_options is available, but deprecated.

+  renamed DBIx::Custom::TagProcessor to DBIx::Custom::Tag, and function names is cleanuped.

+  renamed register_tag_processor to register_tag. register_tag_processor is available, but deprecated.

+  renamed tag_processors to tags. tag_prosessors is available, but deprecated.

+  improved error message

+  build all clause if param is undefined.

 0.1636

   added tests and cleanup

 0.1635

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

 package DBIx::Custom;

-our $VERSION = '0.1636';

+our $VERSION = '0.1637';

 use 5.008001;

 use strict;

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

     # Prepare statement handle

     my $sth;

     eval { $sth = $self->dbh->prepare($query->{sql})};

-    $self->_croak($@, qq{. SQL: "$query->{sql}"}) if $@;

+    $self->_croak($@, qq{. Following SQL is executed. "$query->{sql}"}) if $@;

     # Set statement handle

     $query->sth($sth);

@@ -339,7 +339,7 @@ sub execute{

     my $sth      = $query->sth;

     my $affected;

     eval {$affected = $sth->execute(@$binds)};

-    $self->_croak($@) if $@;

+    $self->_croak($@, qq{. Following SQL is executed. "$query->{sql}"}) if $@;

     # Return resultset if select statement is executed

     if ($sth->{NUM_OF_FIELDS}) {

@@ -465,9 +465,7 @@ sub register_filter {

     return $invocant;

 }

-sub register_tag_processor {

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

-}

+sub register_tag { shift->query_builder->register_tag(@_) }

 our %VALID_SELECT_ARGS

   = map { $_ => 1 } qw/table column where append relation filter query/;

@@ -730,7 +728,7 @@ sub _croak {

     }

 }

-# DEPRECATED!

+# Following methos are DEPRECATED!

 __PACKAGE__->attr(

     dbi_options => sub { {} },

     filter_check  => 1

@@ -779,6 +777,10 @@ sub default_fetch_filter {

     return $self->{default_in_filter};

 }

+sub register_tag_processor {

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

+}

+

 1;

 =head1 NAME

@@ -1180,9 +1182,9 @@ C<default_filter> and C<filter> of C<DBIx::Custom::Result>

 =back

-=head2 C<register_tag_processor>

+=head2 C<register_tag>

-    $dbi->register_tag_processor(

+    $dbi->register_tag(

         limit => sub {

             ...;

         }

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

 use Carp 'croak';

 use DBIx::Custom::Query;

-use DBIx::Custom::TagProcessor;

+use DBIx::Custom::Tag;

 # Carp trust relationship

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

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

-

 # Attributes

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

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

     {

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

-        '='     => \&DBIx::Custom::TagProcessor::expand_equal_tag,

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

-        '>'     => \&DBIx::Custom::TagProcessor::expand_greater_than_tag,

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

-        '>='    => \&DBIx::Custom::TagProcessor::expand_greater_than_equal_tag,

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

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

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

-        'insert_param' => \&DBIx::Custom::TagProcessor::expand_insert_param_tag,

-        'update_param' => \&DBIx::Custom::TagProcessor::expand_update_param_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

     }

 });

@@ -43,12 +42,12 @@ sub build_query {

     return $query;

 }

-sub register_tag_processor {

+sub register_tag {

     my $self = shift;

     # Merge tag processor

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

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

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

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

     return $self;

 }

@@ -78,7 +77,8 @@ sub _build_query {

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

             # Get tag processor

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

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

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

             # Tag processor is not registered

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

@@ -275,6 +275,19 @@ sub _placeholder_count {

     return $count;

 }

+# Follwoing methods are DEPRECATED!

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

+

+sub register_tag_processor {

+    my $self = shift;

+    

+    # Merge tag processor

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

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

+    

+    return $self;

+}

+

 1;

 =head1 NAME

@@ -290,10 +303,10 @@ DBIx::Custom::QueryBuilder - Query builder

 =head1 ATTRIBUTES

-=head2 C<tag_processors>

+=head2 C<tags>

-    my $tag_processors = $builder->tag_processors;

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

+    my $tags = $builder->tags;

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

 Tag processors.

@@ -328,10 +341,10 @@ Query

         columns => ['title', 'author', 'price']

     }

-=head2 C<register_tag_processor>

+=head2 C<register_tag>

-    $builder->register_tag_processor(\%tag_processors);

-    $builder->register_tag_processor(%tag_processors);

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

+    $builder->register_tag(%tags);

 Register tag processor.

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

-package DBIx::Custom::TagProcessor;

+package DBIx::Custom::Tag;

 use strict;

 use warnings;

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

 # Carp trust relationship

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

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

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

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

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

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

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

-sub expand_in_tag {

+sub in {

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

     # Check arguments

@@ -34,7 +34,7 @@ sub expand_in_tag {

     return [$s, $columns];

 }

-sub expand_insert_param_tag {

+sub insert_param {

     my @columns = @_;

     # Insert parameters

@@ -50,12 +50,12 @@ sub expand_insert_param_tag {

     return [$s, \@columns];

 }

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

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

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

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

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

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

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

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

-sub expand_placeholder_tag {

+sub placeholder {

     my $column = shift;

     # Check arguments

@@ -65,7 +65,7 @@ sub expand_placeholder_tag {

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

 }

-sub expand_update_param_tag {

+sub update_param {

     my @columns = @_;

     # Update paramters

@@ -76,7 +76,7 @@ sub expand_update_param_tag {

     return [$s, \@columns];

 }

-sub _expand_basic_tag {

+sub _basic {

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

     # Check arguments

@@ -90,5 +90,4 @@ sub _expand_basic_tag {

 =head1 NAME

-DBIx::Custom::TagProcessor - Tag processor

-

+DBIx::Custom::Tag - Tag processor

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

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

 __PACKAGE__->attr(

-  'query_builder',

+  [qw/param query_builder/],

   clause => sub { [] },

-  param => sub { {} }

 );

 sub to_string {

@@ -65,11 +64,8 @@ sub _parse {

             pop @$where;

             pop @$where;

         }

-        

         # End

-        else {

-            push @$where, ')';

-        }

+        else { push @$where, ')' }

     }

     # String

@@ -87,15 +83,21 @@ sub _parse {

         # Push

         my $param = $self->param;

         my $pushed;

-        if (exists $param->{$column}) {

-            if (ref $param->{$column} eq 'ARRAY') {

-                $pushed = 1 if exists $param->{$column}->[$count - 1];

-            }

-            elsif ($count == 1) {

-                $pushed = 1;

+        if (defined $param) {

+            if (exists $param->{$column}) {

+                if (ref $param->{$column} eq 'ARRAY') {

+                    $pushed = 1 if exists $param->{$column}->[$count - 1];

+                }

+                elsif ($count == 1) {

+                    $pushed = 1;

+                }

             }

+            push @$where, $clause if $pushed;

+        }

+        else {

+            push @$where, $clause;

+            $pushed = 1;

         }

-        push @$where, $clause if $pushed;

         return $pushed;

     }

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

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

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

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

-$dbi->query_builder->register_tag_processor(

+$dbi->register_tag(

     limit => sub {

         my ($count, $offset) = @_;

@@ -825,6 +825,9 @@ $dbi = DBIx::Custom->connect($NEW_ARGS->{0});

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

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

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

+$where = $dbi->where->clause(['and', '{= key1}', '{= key2}']);

+is("$where", "where ( {= key1} and {= key2} )", 'no param');

+

 $where = $dbi->where

              ->clause(['and', '{= key1}', '{= key2}'])

              ->param({key1 => 1});

@@ -944,6 +947,13 @@ $dbi->register_tag_processor(

 );

 is($dbi->query_builder->tag_processors->{a}->(), 1);

+test 'register_tag';

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

+$dbi->register_tag(

+    b => sub { 2 }

+);

+is($dbi->query_builder->tags->{b}->(), 2);

+

 test 'table not specify exception';

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

 eval {$dbi->insert};