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

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

 has [qw/dbi param/],

-    map => sub { {} },

     clause => sub { [] };

+sub map {

+    my ($self, %map) = @_;

+    

+    my $param = $self->_map_param($self->param, %map);

+    $self->param($param);

+    return $self;

+}

+

 sub _map_param {

     my $self = shift;

     my $param = shift;

@@ -145,8 +152,6 @@ sub to_string {

       unless $if;

     $self->{_if} = $if;

-    $self->{_param} = $self->_map_param($self->param, %{$self->map});

-    

     # Parse

     my $where = [];

     my $count = {};

@@ -226,7 +231,7 @@ sub _parse {

         my $count = ++$count->{$column};

         # Push

-        my $param = $self->{_param};

+        my $param = $self->param;

         if (ref $param eq 'HASH') {

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

                 my $if = $self->{_if};

@@ -280,17 +285,45 @@ If all parameter names is exists.

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

+=head2 C<param>

+

+    my $param = $where->param;

+    $where = $where->param({

+        title => 'Perl',

+        date => ['2010-11-11', '2011-03-05'],

+    });

+

+=head2 C<dbi>

+

+    my $dbi = $where->dbi;

+    $where = $where->dbi($dbi);

+

+L<DBIx::Custom> object.

+

+=head1 METHODS

+

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

+and implements the following new ones.

+

+=head2 C<if EXPERIMENTAL>

+    

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

+    $where->if($condition);

+

+C<if> is default of C<map> method C<if> option.

+

 =head2 C<map EXPERIMENTAL>

-Mapping parameter key and value when C<to_stirng> method is executed.

+Mapping parameter key and value. C<param> is converted,

+so this method must be called after C<param> is set.

-    $where->map({

+    $where->map(

         'id' => 'book.id',

         'author' => ['book.author' => sub { '%' . $_[0] . '%' }],

         'price' => [

             'book.price', {if => sub { length $_[0] }

         ]

-    });

+    );

 The following option is available.

@@ -318,33 +351,6 @@ You can also subroutine like C<sub { defined $_[0] }> for mappging.

 =back

-=head2 C<param>

-

-    my $param = $where->param;

-    $where = $where->param({

-        title => 'Perl',

-        date => ['2010-11-11', '2011-03-05'],

-    });

-

-=head2 C<dbi>

-

-    my $dbi = $where->dbi;

-    $where = $where->dbi($dbi);

-

-L<DBIx::Custom> object.

-

-=head1 METHODS

-

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

-and implements the following new ones.

-

-=head2 C<if EXPERIMENTAL>

-    

-    my $if = $where->if($condition);

-    $where->if($condition);

-

-C<if> is default of C<map> method C<if> option.

-

 =head2 C<to_string>

     $where->to_string;

@@ -934,7 +934,7 @@ is(ref $query, 'DBIx::Custom::Query');

 $query = $dbi->select(table => 'table1', where => {key1 => 1, key2 => 2}, query => 1);

 is(ref $query, 'DBIx::Custom::Query');

-test 'DBIx::Custom::Where';

+test 'where';

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

 $dbi->execute($create_table_default);

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

@@ -1226,6 +1226,7 @@ $where = $dbi->where;

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

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

 $where->if('defined');

+$where->map;

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

 $row = $result->all;

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

@@ -1244,6 +1245,7 @@ $where = $dbi->where;

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

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

 $where->if('defined');

+$where->map;

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

 $row = $result->all;

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

@@ -1255,6 +1257,7 @@ $where = $dbi->where;

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

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

 $where->if('length');

+$where->map;

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

 $row = $result->all;

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

@@ -1263,6 +1266,7 @@ $where = $dbi->where;

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

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

 $where->if('length');

+$where->map;

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

 $row = $result->all;

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

@@ -1271,6 +1275,7 @@ $where = $dbi->where;

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

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

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

+$where->map;

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

 $row = $result->all;

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

@@ -1279,6 +1284,7 @@ $where = $dbi->where;

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

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

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

+$where->map;

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

 $row = $result->all;

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