@@ -1,3 +1,7 @@

+0.1711

+    - renamed EXPERIMENTAL available_type_name to available_typename

+    - renamed EXPERIMENTAL available_data_type to available_datatype

+    - added EXPERIMENTAL DBIx::Custom::Where map_if method

 0.1710

     - use more DBIx::Custom information in sub modules to decrease bugs

       (very sorry, this change can't keep backword compatible,

@@ -905,7 +905,7 @@ sub setup_model {

     return $self;

 }

-sub available_data_type {

+sub available_datatype {

     my $self = shift;

     my $data_types = '';

@@ -921,7 +921,7 @@ sub available_data_type {

     return $data_types;

 }

-sub available_type_name {

+sub available_typename {

     my $self = shift;

     # Type Names

@@ -2004,16 +2004,16 @@ L<DBIx::Custom> inherits all methods from L<Object::Simple>

 and use all methods of L<DBI>

 and implements the following new ones.

-=head2 C<available_data_type> EXPERIMENTAL

+=head2 C<available_datatype> EXPERIMENTAL

-    print $dbi->available_data_type;

+    print $dbi->available_datatype;

 Get available data types. You can use these data types

 in C<type rule>'s C<from1> and C<from2> section.

-=head2 C<available_type_name> EXPERIMENTAL

+=head2 C<available_typename> EXPERIMENTAL

-    print $dbi->available_type_name;

+    print $dbi->available_typename;

 Get available type names. You can use these type names in

 C<type_rule>'s C<into1> and C<into2> section.

@@ -2709,15 +2709,15 @@ This need C<table> option in each method.

 =back

-You get all type name used in database by C<available_type_name>.

+You get all type name used in database by C<available_typename>.

-    print $dbi->available_type_name;

+    print $dbi->available_typename;

 In C<from1> and C<from2> you specify data type, not type name.

 C<from2> is executed after C<from1>.

-You get all data type by C<available_data_type>.

+You get all data type by C<available_datatype>.

-    print $dbi->available_data_type;

+    print $dbi->available_datatype;

 You can also specify multiple types at once.

@@ -10,7 +10,8 @@ use overload '""' => sub { shift->to_string }, fallback => 1;

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

 has [qw/dbi param/],

-    clause => sub { [] };

+    clause => sub { [] },

+    map_if => 'exists';

 sub new {

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

@@ -40,7 +41,19 @@ sub to_string {

     my $clause = $self->clause;

     $clause = ['and', $clause] unless ref $clause eq 'ARRAY';

     $clause->[0] = 'and' unless @$clause;

-

+    

+    # Map condition

+    my $map_if = $self->map_if || '';

+    $map_if = $map_if eq 'exists' ? $map_if

+            : $map_if eq 'defined' ? sub { defined $_[0] }

+            : $map_if eq 'length'  ? sub { length $_[0] }

+            : ref $map_if eq 'CODE' ? $map_if

+            : undef;

+    

+    croak "You can must specify right value to C<map_if> " . _subname

+      unless $map_if;

+    $self->{_map_if} = $map_if;

+    

     # Parse

     my $where = [];

     my $count = {};

@@ -123,13 +136,25 @@ sub _parse {

         my $param = $self->param;

         if (ref $param eq 'HASH') {

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

+                my $map_if = $self->{_map_if};

+                

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

-                    $pushed = 1

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

-                       && ref $param->{$column}->[$count - 1] ne 'DBIx::Custom::NotExists';

+                    unless (ref $param->{$column}->[$count - 1] eq 'DBIx::Custom::NotExists') {

+                        if ($map_if eq 'exists') {

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

+                        }

+                        else {

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

+                        }

+                    }

                 } 

                 elsif ($count == 1) {

-                    $pushed = 1;

+                    if ($map_if eq 'exists') {

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

+                    }

+                    else {

+                        $pushed = 1 if $map_if->($param->{$column});

+                    }

                 }

             }

             push @$where, $clause if $pushed;

@@ -175,6 +200,35 @@ If all parameter names is exists.

     "where ( title = :title and ( date < :date or date > :date ) )"

+=head2 C<map_if EXPERIMENTAL>

+    

+    my $map_if = $where->map_if($condition);

+    $where->map_if($condition);

+

+If C<clause> contain named placeholder like ':title{=}'

+and C<param> contain the corresponding key like {title => 'Perl'},

+C<to_string> method join the cluase and convert to placeholder

+like 'title = ?'.

+

+C<map_if> method can change this mapping rule.

+Default is C<exists>. If the key exists, mapping is done.

+    

+    $where->map_if('exists');

+

+In case C<defined> is specified, if the value is defined,

+mapping is done.

+

+    $where->map_if('defined');

+

+In case C<length> is specified, the value is defined

+and the length is bigger than 0, mappting is done.

+

+    $where->map_if('length');

+

+You can also subroutine like C<sub { defined $_[0] }> for mappging.

+

+    $where->map_if(sub { defined $_[0] });

+

 =head2 C<param>

     my $param = $where->param;

@@ -238,4 +238,6 @@ $result = $dbi->execute(

 $rows = $result->all;

 is_deeply($rows, [{key1 => 'a:b c:d', key2 => 2}]);

+

+

 1;

@@ -1221,6 +1221,74 @@ $result = $dbi->select(

 $row = $result->all;

 is_deeply($row, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}]);

+$where = $dbi->where;

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

+$where->param({key1 => undef});

+$result = $dbi->execute("select * from table1 $where", {key1 => 1});

+$row = $result->all;

+is_deeply($row, [{key1 => 1, key2 => 2}]);

+

+$where = $dbi->where;

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

+$where->param({key1 => undef});

+$where->map_if('defined');

+$result = $dbi->execute("select * from table1 $where", {key1 => 1});

+$row = $result->all;

+is_deeply($row, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}]);

+

+$where = $dbi->where;

+$where->clause(['or', ':key1{=}', ':key1{=}']);

+$where->param({key1 => [undef, undef]});

+$result = $dbi->execute("select * from table1 $where", {key1 => [1, 0]});

+$row = $result->all;

+is_deeply($row, [{key1 => 1, key2 => 2}]);

+$result = $dbi->execute("select * from table1 $where", {key1 => [0, 1]});

+$row = $result->all;

+is_deeply($row, [{key1 => 1, key2 => 2}]);

+

+$where = $dbi->where;

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

+$where->param({key1 => [undef, undef]});

+$where->map_if('defined');

+$result = $dbi->execute("select * from table1 $where", {key1 => [1, 0]});

+$row = $result->all;

+is_deeply($row, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}]);

+$result = $dbi->execute("select * from table1 $where", {key1 => [0, 1]});

+$row = $result->all;

+is_deeply($row, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}]);

+

+$where = $dbi->where;

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

+$where->param({key1 => 0});

+$where->map_if('length');

+$result = $dbi->execute("select * from table1 $where", {key1 => 1});

+$row = $result->all;

+is_deeply($row, [{key1 => 1, key2 => 2}]);

+

+$where = $dbi->where;

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

+$where->param({key1 => ''});

+$where->map_if('length');

+$result = $dbi->execute("select * from table1 $where", {key1 => 1});

+$row = $result->all;

+is_deeply($row, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}]);

+

+$where = $dbi->where;

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

+$where->param({key1 => 5});

+$where->map_if(sub { ($_[0] || '') eq 5 });

+$result = $dbi->execute("select * from table1 $where", {key1 => 1});

+$row = $result->all;

+is_deeply($row, [{key1 => 1, key2 => 2}]);

+

+$where = $dbi->where;

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

+$where->param({key1 => 7});

+$where->map_if(sub { ($_[0] || '') eq 5 });

+$result = $dbi->execute("select * from table1 $where", {key1 => 1});

+$row = $result->all;

+is_deeply($row, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}]);

+

 test 'dbi_option default';

 $dbi = DBIx::Custom->new;

@@ -3108,9 +3176,9 @@ $result = $model->select(column => 'key1');

 $result->filter(key1 => sub { $_[0] * 2 });

 is_deeply($result->one, {key1 => 2});

-test 'available_date_type';

+test 'available_datetype';

 $dbi = DBIx::Custom->connect(%memory);

-ok($dbi->can('available_data_type'));

+ok($dbi->can('available_datatype'));

 test 'select prefix option';

@@ -3560,3 +3628,4 @@ like($@, qr/unexpected "}"/, "error : 1");

 $source = "a {= {}";

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

 like($@, qr/unexpected "{"/, "error : 2");

+