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

 0.1604

+  changed argument of tag processor(not backword compatible)

   renamed default_query_filter to default_bind_filter(not backword compatible)

   renamed DBIx::Custom::SQLTemplate to DBIx::Custom::SQLBuilder(not backword compatible)

   renamed create_query to build_query(not backword compatible)

@@ -77,7 +77,7 @@ sub connect {

 sub register_filter {

     my $invocant = shift;

-    # Add filter

+    # Register filter

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

     $invocant->filters({%{$invocant->filters}, %$filters});

@@ -91,7 +91,7 @@ sub insert {

     # Check arguments

     foreach my $name (keys %args) {

-        croak "\"$name\" is invalid name"

+        croak qq{"$name" is invalid name}

           unless $VALID_INSERT_ARGS{$name};

     }

@@ -104,10 +104,6 @@ sub insert {

     # Insert keys

     my @insert_keys = keys %$param;

-    # Not exists insert keys

-    croak("Key-value pairs for insert must be specified to 'insert' second argument")

-      unless @insert_keys;

-    

     # Templte for insert

     my $source = "insert into $table {insert "

                    . join(' ', @insert_keys) . '}';

@@ -128,7 +124,7 @@ sub update {

     # Check arguments

     foreach my $name (keys %args) {

-        croak "\"$name\" is invalid name"

+        croak qq{"$name" is invalid name}

           unless $VALID_UPDATE_ARGS{$name};

     }

@@ -143,15 +139,11 @@ sub update {

     # Update keys

     my @update_keys = keys %$param;

-    # Not exists update kyes

-    croak("Key-value pairs for update must be specified to 'update' second argument")

-      unless @update_keys;

-    

     # Where keys

     my @where_keys = keys %$where;

     # Not exists where keys

-    croak("Key-value pairs for where clause must be specified to 'update' third argument")

+    croak qq{"where" must contain column-value pair}

       if !@where_keys && !$allow_update_all;

     # Update clause

@@ -174,7 +166,7 @@ sub update {

     my $source = "update $table $update_clause $where_clause";

     $source .= " $append_statement" if $append_statement;

-    # Rearrange parammeters

+    # Rearrange parameters

     foreach my $wkey (@where_keys) {

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

@@ -205,7 +197,7 @@ sub delete {

     # Check arguments

     foreach my $name (keys %args) {

-        croak "\"$name\" is invalid name"

+        croak qq{"$name" is invalid name}

           unless $VALID_DELETE_ARGS{$name};

     }

@@ -220,7 +212,7 @@ sub delete {

     my @where_keys = keys %$where;

     # Not exists where keys

-    croak("Key-value pairs for where clause must be specified to 'delete' second argument")

+    croak qq{Key-value pairs for where clause must be specified to "delete" second argument}

       if !@where_keys && !$allow_delete_all;

     # Where clause

@@ -254,7 +246,7 @@ sub select {

     # Check arguments

     foreach my $name (keys %args) {

-        croak "\"$name\" is invalid name"

+        croak qq{"$name" is invalid name}

           unless $VALID_SELECT_ARGS{$name};

     }

@@ -342,7 +334,7 @@ sub build_query {

         # Create query

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

-        croak($@) if $@;

+        croak $@ if $@;

         # Cache query

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

@@ -368,23 +360,15 @@ sub execute{

     # Check arguments

     foreach my $name (keys %args) {

-        croak "\"$name\" is invalid name"

+        croak qq{"$name" is invalid name}

           unless $VALID_EXECUTE_ARGS{$name};

     }

     my $params = $args{param} || {};

     # First argument is SQL template

-    unless (ref $query eq 'DBIx::Custom::Query') {

-        my $source;

-        

-        if (ref $query eq 'ARRAY') {

-            $source = $query->[0];

-        }

-        else { $source = $query }

-        

-        $query = $self->build_query($source);

-    }

+    $query = $self->build_query($query)

+      unless ref $query;

     my $filter = $args{filter} || $query->filter || {};

@@ -421,7 +405,7 @@ sub _build_bind_values {

     my $count = {};

     foreach my $column (@{$query->columns}) {

-        croak "\"$column\" is not exists in params"

+        croak qq{"$column" is not exists in params}

           unless exists $params->{$column};

         # Value

@@ -443,7 +427,7 @@ sub _build_bind_values {

             }

             else {

                 my $filters = $self->filters;

-                croak "Not exists filter \"$fname\""

+                croak qq{Not exists filter "$fname"}

                   unless exists $filters->{$fname};

                 $filter_func = $filters->{$fname};

             }            

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

 use base 'DBIx::Custom';

-use Carp 'croak';

-

 __PACKAGE__->attr([qw/database host port/]);

 sub connect {

@@ -12,13 +12,13 @@ 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_basic_tag,

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

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

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

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

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

-    'like'   => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_basic_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

@@ -29,26 +29,29 @@ __PACKAGE__->attr(tag_end   => '}');

 __PACKAGE__->attr('tag_syntax' => <<'EOS');

 [tag]                     [expand]

-{? name}                  ?

-{= name}                  name = ?

-{<> name}                 name <> ?

+{? NAME}                  ?

+{= NAME}                  NAME = ?

+{<> NAME}                 NAME <> ?

-{< name}                  name < ?

-{> name}                  name > ?

-{>= name}                 name >= ?

-{<= name}                 name <= ?

+{< NAME}                  NAME < ?

+{> NAME}                  NAME > ?

+{>= NAME}                 NAME >= ?

+{<= NAME}                 NAME <= ?

-{like name}               name like ?

-{in name number}          name in [?, ?, ..]

+{like NAME}               NAME like ?

+{in NAME number}          NAME in [?, ?, ..]

-{insert key1 key2} (key1, key2) values (?, ?)

-{update key1 key2}    set key1 = ?, key2 = ?

+{insert NAME1 NAME2}      (NAME1, NAME2) values (?, ?)

+{update NAME1 NAME2}      set NAME1 = ?, NAME2 = ?

 EOS

 sub register_tag_processor {

     my $self = shift;

+    

+    # Merge

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

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

+    

     return $self;

 }

@@ -67,9 +70,6 @@ sub build_query {

 sub _parse {

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

-    if (ref $source eq 'ARRAY') {

-        $source = $source->[1];

-    }

     $source ||= '';

     my $tree = [];

@@ -99,17 +99,18 @@ sub _parse {

             # Tag processor is exist?

             unless ($self->tag_processors->{$tag_name}) {

                 my $tag_syntax = $self->tag_syntax;

-                croak("Tag '{$tag}' is not registerd.\n\n" .

+                croak qq{Tag "{$tag}" is not registerd.\n\n} .

                       "<SQL builder syntax>\n" .

                       "$tag_syntax\n" .

                       "<Your source>\n" .

-                      "$original\n\n");

+                      "$original\n\n";

             }

             # Check tag arguments

             foreach my $tag_arg (@tag_args) {

+            

                 # Cannot cantain placehosder '?'

-                croak("Tag '{t }' arguments cannot contain '?'")

+                croak qq{Tag cannot contain "?"}

                   if $tag_arg =~ /\?/;

             }

@@ -130,7 +131,7 @@ sub _build_query {

     # SQL

     my $sql = '';

-    # All parameter key infomation

+    # All Columns

     my $all_columns = [];

     # Build SQL 

@@ -154,22 +155,21 @@ sub _build_query {

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

             # Tag processor is code ref?

-            croak("Tag processor '$tag_name' must be code reference")

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

               unless ref $tag_processor eq 'CODE';

             # Expand tag using tag processor

-            my ($expand, $columns) = $tag_processor->($tag_name, $tag_args);

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

             # Check tag processor return value

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

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

               if !defined $expand || ref $columns ne 'ARRAY';

             # Check placeholder count

-            croak("Placeholder count in SQL created by tag processor '$tag_name' " .

-                  "must be same as key informations count")

+            croak qq{Count of Placeholder must be same as count of columns in "$tag_name"}

               unless $self->_placeholder_count($expand) eq @$columns;

-            # Add key information

+            # Add columns

             push @$all_columns, @$columns;

             # Join expand tag to SQL

@@ -188,8 +188,9 @@ sub _build_query {

 sub _placeholder_count {

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

-    $expand ||= '';

+    # Count

+    $expand ||= '';

     my $count = 0;

     my $pos   = -1;

     while (($pos = index($expand, '?', $pos + 1)) != -1) {

@@ -6,53 +6,51 @@ use warnings;

 use Carp 'croak';

 sub expand_basic_tag {

-    my ($tag_name, $tag_args) = @_;

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

-    # Key

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

+    # Column

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

-    # Key is not exist

-    croak("You must be pass key as argument to tag '{$tag_name }'")

+    # Check arguments

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

       unless $column;

-    # Expand

-    return ("$column $tag_name ?", [$column]);

+    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 expand_placeholder_tag {

-    my ($tag_name, $tag_args) = @_;

+    my $tag_args = shift;

-    # Key

+    # Column

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

-    # Key is not exist

-    croak("You must be pass key as argument to tag '{$tag_name }'")

+    # Check arguments

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

       unless $column;

-    # Expand

-    return ('?', [$column]);

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

 }

 sub expand_in_tag {

-    my ($tag_name, $tag_args) = @_;

-    my ($column, $count) = @$tag_args;

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

-    # Key must be specified

-    croak("You must be pass key as first argument of tag '{in }'\n" . 

-          "Usage: {in \$key \$count}")

-      unless $column;

-    

-    # Place holder count must be specified

-    croak("You must be pass value count as second argument of tag '{in }'\n" . 

-          "Usage: {in \$key \$count}")

-      if !$count || $count =~ /\D/;

+    # Check arguments

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

+      unless $column && $count && $count =~ /^\d+$/;

-    # Expand tag

-    my $expand = "$column $tag_name (";

+    # Expand

+    my $expand = "$column in (";

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

         $expand .= '?, ';

     }

-    

     $expand =~ s/, $//;

     $expand .= ')';

@@ -60,57 +58,34 @@ sub expand_in_tag {

     my $columns = [];

     push @$columns, $column for (0 .. $count - 1);

-    return ($expand, $columns);

+    return [$expand, $columns];

 }

 sub expand_insert_tag {

-    my ($tag_name, $columns) = @_;

-    

-    # Insert key (k1, k2, k3, ..)

-    my $insert_keys = '(';

-    

-    # placeholder (?, ?, ?, ..)

-    my $place_holders = '(';

-    

-    foreach my $column (@$columns) {

-        

-        # Join insert column

-        $insert_keys   .= "$column, ";

-        

-        # Join place holder

-        $place_holders .= "?, ";

-    }

-    

-    # Delete last ', '

-    $insert_keys =~ s/, $//;

-    

-    # Close 

-    $insert_keys .= ')';

-    $place_holders =~ s/, $//;

-    $place_holders .= ')';

+    my $columns = shift;

-    # Expand tag

-    my $expand = "$insert_keys values $place_holders";

+    # Insert

+    my $expand = '(';

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

+    $expand =~ s/, $//;

+    $expand .= ') ';

+    $expand .= 'values (';

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

+    $expand =~ s/, $//;

+    $expand .= ')';

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

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

 }

 sub expand_update_tag {

-    my ($tag_name, $columns) = @_;

+    my $columns = shift;

-    # Expanded tag

+    # Update

     my $expand = 'set ';

-    

-    foreach my $column (@$columns) {

-

-        # Join key and placeholder

-        $expand .= "$column = ?, ";

-    }

-    

-    # Delete last ', '

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

     $expand =~ s/, $//;

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

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

 }

 1;

@@ -123,6 +98,20 @@ DBIx::Custom::SQLBuilder::TagProcessors - Tag processor

 =head2 C<expand_basic_tag>

+=head2 C<expand_equal_tag>

+

+=head2 C<expand_not_equal_tag>

+

+=head2 C<expand_greater_than_tag>

+

+=head2 C<expand_lower_than_tag>

+

+=head2 C<expand_greater_than_equal_tag>

+

+=head2 C<expand_lower_than_equal_tag>

+

+=head2 C<expand_like_tag>

+

 =head2 C<expand_in_tag>

 =head2 C<expand_insert_tag>

@@ -10,29 +10,29 @@ use Carp 'croak';

 __PACKAGE__->attr([qw/sth filters default_filter filter/]);

 sub fetch {

-

-    $_[0]->{filters} ||= {};

-    $_[0]->{filter}  ||= {};

+    my $self = shift;

+    

+    $self->{filters} ||= {};

+    $self->{filter}  ||= {};

     # Fetch

-    my @row = $_[0]->{sth}->fetchrow_array;

+    my @row = $self->{sth}->fetchrow_array;

     # Cannot fetch

     return unless @row;

     # Filter

-    for (my $i = 0; $i < @{$_[0]->{sth}->{NAME_lc}}; $i++) {

-        my $fname  = $_[0]->{filter}->{$_[0]->{sth}->{NAME_lc}->[$i]} 

-                  || $_[0]->{default_filter};

+    for (my $i = 0; $i < @{$self->{sth}->{NAME_lc}}; $i++) {

-        croak "Filter \"$fname\" is not registered."

-          if $fname && ! exists $_[0]->{filters}->{$fname};

+        # Filter name

+        my $column = $self->{sth}->{NAME_lc}->[$i];

+        my $fname  = exists $self->{filter}->{$column}

+                   ? $self->{filter}->{$column}

+                   : $self->{default_filter};

-        next unless $fname;

-        

-        $row[$i] = ref $fname

-                   ? $fname->($row[$i]) 

-                   : $_[0]->{filters}->{$fname}->($row[$i]);

+        # Filter

+        $row[$i] = $self->{filters}->{$fname}->($row[$i])

+          if $fname;

     }

     return \@row;

@@ -57,7 +57,7 @@ sub fetch_multi {

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

     # Not specified Row count

-    croak("Row count must be specified")

+    croak 'Row count must be specified'

       unless $count;

     # Fetch multi rows

@@ -86,30 +86,31 @@ sub fetch_all {

 }

 sub fetch_hash {

-

-    $_[0]->{filters} ||= {};

-    $_[0]->{filter}  ||= {};

+    my $self = shift;

+    

+    $self->{filters} ||= {};

+    $self->{filter}  ||= {};

     # Fetch

-    my $row = $_[0]->{sth}->fetchrow_arrayref;

+    my $row = $self->{sth}->fetchrow_arrayref;

     # Cannot fetch

     return unless $row;

     # Filter

     my $row_hash = {};

-    for (my $i = 0; $i < @{$_[0]->{sth}->{NAME_lc}}; $i++) {

+    for (my $i = 0; $i < @{$self->{sth}->{NAME_lc}}; $i++) {

-        my $fname  = $_[0]->{filter}->{$_[0]->{sth}->{NAME_lc}->[$i]}

-                  || $_[0]->{default_filter};

+        # Filter name

+        my $column = $self->{sth}->{NAME_lc}->[$i];

+        my $fname  = exists $self->{filter}->{$column}

+                   ? $self->{filter}->{$column}

+                   : $self->{default_filter};

-        croak "Filter \"$fname\" is not registered."

-          if $fname && ! exists $_[0]->{filters}->{$fname};

-        

-        $row_hash->{$_[0]->{sth}->{NAME_lc}->[$i]}

-          = !$fname    ? $row->[$i] :

-            ref $fname ? $fname->($row->[$i]) :

-            $_[0]->{filters}->{$fname}->($row->[$i]);

+        # Filter

+        $row_hash->{$column}

+          = $fname ? $self->{filters}->{$fname}->($row->[$i]) 

+                   : $row->[$i];

     }

     return $row_hash;

@@ -134,7 +135,7 @@ sub fetch_hash_multi {

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

     # Not specified Row count

-    croak("Row count must be specified")

+    croak 'Row count must be specified'

       unless $count;

     # Fetch multi rows

@@ -159,6 +160,7 @@ sub fetch_hash_all {

     while(my $row = $self->fetch_hash) {

         push @$rows, $row;

     }

+    

     return $rows;

 }

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

 use base 'DBIx::Custom';

-use Carp 'croak';

-

 __PACKAGE__->attr('database');

 sub connect {

@@ -227,6 +227,10 @@ $dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2}, append => '   '

 $rows = $dbi->select(table => 'table1')->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 2}], 'insert append');

+eval{$dbi->insert(table => 'table1', noexist => 1)};

+like($@, qr/noexist/, "$test: invalid name");

+

+

 test 'update';

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

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

@@ -261,9 +265,15 @@ is_deeply($rows, [{key1 => 1, key2 => 22, key3 => 3, key4 => 4, key5 => 5},

                   {key1 => 6, key2 => 7,  key3 => 8, key4 => 9, key5 => 10}],

                   "$test : filter");

-

 $result = $dbi->update(table => 'table1', param => {key2 => 11}, where => {key1 => 1}, append => '   ');

+eval{$dbi->update(table => 'table1', noexist => 1)};

+like($@, qr/noexist/, "$test: invalid name");

+

+eval{$dbi->update(table => 'table1')};

+like($@, qr/where/, "$test: not contain where");

+

+

 test 'update_all';

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

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

@@ -306,11 +316,15 @@ $dbi->delete(table => 'table1', where => {key1 => 1, key2 => 2});

 $rows = $dbi->select(table => 'table1')->fetch_hash_all;

 is_deeply($rows, [{key1 => 3, key2 => 4}], "$test : delete multi key");

+eval{$dbi->delete(table => 'table1', noexist => 1)};

+like($@, qr/noexist/, "$test: invalid name");

+

+

 test 'delete error';

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

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

 eval{$dbi->delete(table => 'table1')};

-like($@, qr/Key-value pairs for where clause must be specified to 'delete' second argument/,

+like($@, qr/Key-value pairs for where clause must be specified to "delete" second argument/,

          "$test : where key-value pairs not specified");

 test 'delete_all';

@@ -367,6 +381,10 @@ $rows = $dbi->select(

 )->fetch_hash_all;

 is_deeply($rows, [{table1_key1 => 1, table2_key1 => 1, key2 => 2, key3 => 5}], "$test : relation : no exists where");

+eval{$dbi->select(table => 'table1', noexist => 1)};

+like($@, qr/noexist/, "$test: invalid name");

+

+

 test 'fetch filter';

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

 $dbi->register_filter(

@@ -425,3 +443,4 @@ $dbi->cache(0);

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

 is(scalar keys %{$dbi->{_cached}}, 0, 'not cache');

+

@@ -100,3 +100,7 @@ test 'register_filters';

 $dbi = DBIx::Custom->new;

 $dbi->register_filter(a => sub {1});

 is($dbi->filters->{a}->(), 1, $test);

+$dbi->register_filter({b => sub {2}});

+is($dbi->filters->{b}->(), 2, $test);

+

+