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

 0.1648

+  add experimental DBIx::Custom::Model relation() attribute

   add experimental update_at(), delete_at(), select_at()

   add experimental setup_model()

   add experimental DBIx::Custom::Model columns attirbute

@@ -607,7 +607,7 @@ sub select {

     push @sql, $swhere;

     # Relation

-    if ($relation) {

+    if (!$selection && $relation) {

         push @sql, $swhere eq '' ? 'where' : 'and';

         foreach my $rcolumn (keys %$relation) {

             push @sql, ("$rcolumn = " . $relation->{$rcolumn},  'and');

@@ -13,7 +13,8 @@ push @DBIx::Custom::CARP_NOT, __PACKAGE__;

 __PACKAGE__->attr(

     ['dbi', 'table'],

     columns => sub { [] },

-    primary_key => sub { [] }

+    primary_key => sub { [] },

+    relation => sub { {} }

 );

 our $AUTOLOAD;

@@ -1500,3 +1500,9 @@ is($row->{key2}, 2);

 is($row->{key3}, 3);

+test 'columns';

+use MyDBI1;

+$dbi = MyDBI1->connect($NEW_ARGS->{0});

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

+$model->relation({'book.id' => 'company.id'});

+is_deeply($model->relation, {'book.id' => 'company.id'});