@@ -14,6 +14,7 @@ use DBIx::Custom::Model;

 use DBIx::Custom::Tag;

 use DBIx::Custom::Order;

 use DBIx::Custom::Util qw/_array_to_hash _subname/;

+use DBIx::Custom::Mapper;

 use Encode qw/encode encode_utf8 decode_utf8/;

 use Scalar::Util qw/weaken/;

@@ -1,13 +1,16 @@

 package DBIx::Custom::Mapper;

 use Object::Simple -base;

+use Carp 'croak';

 use DBIx::Custom::Util '_subname';

 # Carp trust relationship

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

-has [qw/param pass/]

-    condition => sub { defined $_[0] && length $_[0] };

+has [qw/param pass/],

+    condition => sub {

+        sub { defined $_[0] && length $_[0] }

+    };

 sub map {

     my ($self, %rule) = @_;

@@ -25,7 +28,7 @@ sub map {

         if (ref $rule{$key} eq 'ARRAY') {

             foreach my $some (@{$rule{$key}}) {

                 $new_key = $some unless ref $some;

-                $condition = $some->{if} if ref $some eq 'HASH';

+                $condition = $some->{condition} if ref $some eq 'HASH';

                 $value_cb = $some if ref $some eq 'CODE';

             }

         }

@@ -2597,6 +2597,52 @@ $dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2});

 $rows = $dbi->select(prefix => "$key1,", column => $key2, table => $table1)->all;

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

+test 'mapper';

+$DB::single = 1;

+$dbi = DBIx::Custom->connect;

+$param = $dbi->mapper(param => {id => 1, author => 'Ken', price => 1900})->map(

+    id => "$table1.id",

+    author => ["$table1.author", sub { '%' . $_[0] . '%' }],

+    price => ["$table1.price", {condition => sub { $_[0] eq 1900 }}]

+);

+is_deeply($param, {"$table1.id" => 1, "$table1.author" => '%Ken%',

+  "$table1.price" => 1900});

+

+$param = $dbi->mapper(param => {id => 0, author => 0, price => 0})->map(

+    id => "$table1.id",

+    author => ["$table1.author", sub { '%' . $_[0] . '%' }],

+    price => ["$table1.price", sub { '%' . $_[0] . '%' },

+      {condition => sub { $_[0] eq 0 }}]

+);

+is_deeply($param, {"$table1.id" => 0, "$table1.author" => '%0%', "$table1.price" => '%0%'});

+

+$param = $dbi->mapper(param => {id => '', author => '', price => ''})->map(

+    id => "$table1.id",

+    author => ["$table1.author", sub { '%' . $_[0] . '%' }],

+    price => ["$table1.price", sub { '%' . $_[0] . '%' },

+      {condition => sub { $_[0] eq 1 }}]

+);

+is_deeply($param, {});

+

+$DB::single = 1;

+$param = $dbi->mapper(param => {id => undef, author => undef, price => undef})->map(

+    id => "$table1.id",

+    price => ["$table1.price", {condition => 'exists'}]

+);

+is_deeply($param, {"$table1.price" => undef});

+

+$param = $dbi->mapper(param => {price => 'a'})->map(

+    id => ["$table1.id", {condition => 'exists'}],

+    price => ["$table1.price", sub { '%' . $_[0] }, {condition => 'exists'}]

+);

+is_deeply($param, {"$table1.price" => '%a'});

+

+$param = $dbi->mapper(param => {price => 'a'}, condition => 'exists')->map(

+    id => ["$table1.id"],

+    price => ["$table1.price", sub { '%' . $_[0] }]

+);

+is_deeply($param, {"$table1.price" => '%a'});

+

 test 'map_param';

 $dbi = DBIx::Custom->connect;

 $param = $dbi->map_param(