@@ -1,7 +1,8 @@

 0.1689

     - added EXPERIMENTAL available_data_type

     - simplified type_rule

-    - changed type_rule arguments format.

+    - changed type_rule arguments format

+    - added DBIx::Custom result_filter attribute

 0.1688

     - fixed bug that model insert, update, delete select can't

       odd number arguments

@@ -84,7 +84,9 @@ sub AUTOLOAD {

     }

 }

-sub apply_filter {

+sub apply_filter { shift->_apply_filter(@_) }

+

+sub _apply_filter {

     my ($self, $table, @cinfos) = @_;

     # Initialize filters

@@ -389,6 +391,13 @@ sub create_model {

                ? [%{$model->filter}]

                : $model->filter;

     $self->apply_filter($model->table, @$filter);

+    my $result_filter = ref $model->result_filter eq 'HASH'

+               ? [%{$model->result_filter}]

+               : $model->result_filter;

+    for (my $i = 1; $i < @$result_filter; $i += 2) {

+        $result_filter->[$i] = {in => $result_filter->[$i]};

+    }

+    $self->apply_filter($model->table, @$result_filter);

     # Associate table with model

     croak "Table name is duplicated " . _subname

@@ -579,6 +588,7 @@ sub execute {

         my $filter = {};

         $filter->{in}  = {};

         $filter->{end} = {};

+        push @$tables, $main_table if $main_table;

         foreach my $table (@$tables) {

             foreach my $way (qw/in end/) {

                 $filter->{$way} = {

@@ -16,6 +16,7 @@ __PACKAGE__->attr(

     table_alias => sub { {} },

     columns => sub { [] },

     filter => sub { [] },

+    result_filter => sub { [] },

     join => sub { [] },

     type => sub { [] },

     primary_key => sub { [] }

@@ -163,7 +164,10 @@ L<DBIx::Custom> object.

 =head2 C<filter>

     my $dbi = $model->filter

-    $model  = $model->filter({out => 'tp_to_date', in => 'date_to_tp'});

+    $model  = $model->filter(

+        title => {out => 'tp_to_date', in => 'date_to_tp'}

+        author => {out => ..., in => ...},

+    );

 This filter is applied when L<DBIx::Custom>'s C<include_model()> is called.

@@ -183,6 +187,24 @@ Model name.

 Join clause, this is used as C<select()>'s C<join> option.

+=head2 C<primary_key>

+

+    my $primary_key = $model->primary_key;

+    $model          = $model->primary_key(['id', 'number']);

+

+Foreign key, this is used as C<primary_key> of C<insert_at>,C<update_at()>,

+C<delete_at()>,C<select_at()>.

+

+=head2 C<result_filter>

+

+    my $dbi = $model->result_filter

+    $model  = $model->result_filter(

+        title => sub { ... },

+        author => sub { ... }

+    );

+

+This filter is applied when L<DBIx::Custom>'s C<include_model()> or C<create_model> is called.

+

 =head2 C<table>

     my $table = $model->table;

@@ -200,14 +222,6 @@ Table alias. If you define table alias,

 same filter as the table is avaliable

 , and can write $dbi->column('user1') to get all columns.

-=head2 C<primary_key>

-

-    my $primary_key = $model->primary_key;

-    $model          = $model->primary_key(['id', 'number']);

-

-Foreign key, this is used as C<primary_key> of C<insert_at>,C<update_at()>,

-C<delete_at()>,C<select_at()>.

-

 =head2 C<type>

     my $type = $model->type;

@@ -2684,4 +2684,41 @@ $dbi->insert({key1 => 2}, table => 'table1', type_rule_off => 1);

 $result = $dbi->select(table => 'table1', type_rule_off => 1);

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

+

+test 'result_filter';

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

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

+$dbi->execute($CREATE_TABLE->{2});

+

+$dbi->create_model(

+    table => 'table1',

+    join => [

+       'left outer join table2 on table1.key1 = table2.key1'

+    ],

+    primary_key => ['key1'],

+    result_filter => {

+        key1 => sub { $_[0] * 2 }

+    }

+);

+$model2 = $dbi->create_model(

+    table => 'table2',

+    result_filter => [

+        [qw/key1 key3/] => sub { $_[0] * 3 }

+    ]

+);

+$dbi->setup_model;

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

+$dbi->insert(table => 'table2', param => {key1 => 1, key3 => 3});

+$model = $dbi->model('table1');

+$result = $model->select(

+    column => [

+        $model->mycolumn,

+        {table2 => [qw/key1 key3/]}

+    ],

+    where => {'table1.key1' => 1}

+);

+is_deeply($result->one,

+          {key1 => 2, key2 => 2, 'table2.key1' => 3, 'table2.key3' => 9});

+is_deeply($model2->select->one, {key1 => 3, key3 => 9});

+

 =cut