@@ -1,4 +1,7 @@

 0.1655

+    - added experimental DBIx::Custom::Model join attribute

+    - added experimental select() join option

+    - deprecated select() relation option

     - added experimental update_param and insert_param

     - remove experimental DBIx::Custom::Model relation

 0.1654

@@ -613,7 +613,19 @@ sub register_filter {

 sub register_tag { shift->query_builder->register_tag(@_) }

 our %VALID_SELECT_ARGS

-  = map { $_ => 1 } qw/table column where append relation filter query selection left_join/;

+  = map { $_ => 1 } qw/table column where append relation filter query selection join/;

+

+sub _need_tables {

+    my ($self, $tree, $need_tables, $tables) = @_;

+    

+    foreach my $table (@$tables) {

+        

+        if ($tree->{$table}) {

+            $need_tables->{$table} = 1;

+            $self->_need_tables($tree, $need_tables, [$tree->{$table}{parent}])

+        }

+    }

+}

 sub select {

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

@@ -635,9 +647,9 @@ sub select {

     my $where     = $args{where} || {};

     my $append    = $args{append};

     my $filter    = $args{filter};

-    my $left_join = $args{left_join} || [];

-    croak qq{"left_join" must be array reference}

-      unless ref $left_join eq 'ARRAY';

+    my $join =     $args{join} || [];

+    croak qq{"join" must be array reference}

+      unless ref $join eq 'ARRAY';

     my @join_tables;

     unshift @join_tables, $tables->[-1];

@@ -697,27 +709,39 @@ sub select {

     # Table name in Where

     unshift @join_tables, @{$self->_tables($swhere)};

-    # Left join

-    if (@$left_join) {

-        for (my $i = 0; $i < @$left_join; $i += 2) {

-            my $column1 = $left_join->[$i];

-            my $column2 = $left_join->[$i + 1];

-            

-            my $table1 = (split (/\./, $column1))[0];

-            my $table2 = (split (/\./, $column2))[0];

+    # Join

+    if (@$join) {

+        my $tree = {};

+        

+        for (my $i = 0; $i < @$join; $i++) {

-            my $table1_exists;

-            my $table2_exists;

+            my $join_clause = $join->[$i];

-            foreach my $table (@join_tables) {

-                $table1_exists = 1 if $table eq $table1;

-                $table2_exists = 1 if $table eq $table2;

+            if ($join_clause =~ /\s([^\.\s]+?)\..+\s([^\.\s]+?)\./) {

+                

+                my $table1 = $1;

+                my $table2 = $2;

+                

+                croak qq{right side table of "$join_clause" must be uniq}

+                  if exists $tree->{$table2};

+                

+                $tree->{$table2}

+                  = {position => $i, parent => $table1, join => $join_clause};

             }

-            

-            if ($table1_exists && $table2_exists) {

-                push @sql, "left outer join $table2 on $column1 = $column2";

+            else {

+                croak qq{join "$join_clause" must be two table name};

             }

         }

+        

+        my $need_tables = {};

+        $self->_need_tables($tree, $need_tables, \@join_tables);

+        

+        

+        my @need_tables = sort { $tree->{$a}{position} <=> $tree->{$b}{position} } keys %$need_tables;

+

+        foreach my $need_table (@need_tables) {

+            push @sql, $tree->{$need_table}{join};

+        }

     }

     # Add where

@@ -1748,7 +1772,7 @@ This is same as L<DBI>'s C<rollback>.

         where     => \%where,

         append    => $append,

         relation  => \%relation,

-        left_join => ['book.company_id' => 'company.id']

+        join => ['left outer join company on book.company_id = company.id']

         filter    => \%filter,

         query     => 1,

         selection => $selection

@@ -1773,7 +1797,7 @@ First element is a string. it contains tags,

 such as "{= title} or {like author}".

 Second element is paramters.

-C<left_join> is add left outer join clause after from clause.

+C<join> is join clause after from clause.

 This is experimental.

 =head3 C<(experimental) select_at()>

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

     columns => sub { [] },

     filter => sub { [] },

     primary_key => sub { [] },

+    join => sub { [] }

 );

 our $AUTOLOAD;

@@ -116,6 +117,7 @@ sub select {

     my $self = shift;

     $self->dbi->select(

         table => $self->table,

+        join => $self->join,

         @_

     );

 }

@@ -191,6 +193,15 @@ This filter is applied when L<DBIx::Custom> C<include_model()> is called.

 Model name.

+=head2 C<(experimental) join>

+

+    my $join = $model->join;

+    $model   = $model->join(

+        ['left outer join company on book.company_id = company.id']

+    );

+    

+Default join clause. This is used by C<select()>.

+

 =head2 C<table>

     my $table = $model->table;

@@ -27,7 +27,8 @@ my $CREATE_TABLE = {

     0 => 'create table table1 (key1 char(255), key2 char(255));',

     1 => 'create table table1 (key1 char(255), key2 char(255), key3 char(255), key4 char(255), key5 char(255));',

     2 => 'create table table2 (key1 char(255), key3 char(255));',

-    3 => 'create table table1 (key1 Date, key2 datetime);'

+    3 => 'create table table1 (key1 Date, key2 datetime);',

+    4 => 'create table table3 (key3 int, key4 int);'

 };

 my $SELECT_SOURCES = {

@@ -1681,7 +1682,7 @@ $result = $model->select(column => $model->column_clause, where => {'table1.key1

 is_deeply($result->fetch_hash_first, {key1 => 1, key2 => 2});

 $result = $model->select(column => $model->column_clause(remove => ['key1']), where => {'table1.key1' => 1});

 is_deeply($result->fetch_hash_first, {key2 => 2});

-$result = $model->select(relation => {'table1.key1' => 'table2.key1'}, column => $model->column_clause(add => ['key3']), where => {'table1.key1' => 1});

+$result = $model->select(column => $model->column_clause(add => ['table2.key3']), where => {'table1.key1' => 1});

 is_deeply($result->fetch_hash_first, {key1 => 1, key2 => 2, key3 => 3});

 test 'update_param';

@@ -1724,27 +1725,62 @@ eval { $dbi->insert_param({";" => 1}) };

 like($@, qr/not safety/);

-test 'left_join';

+test 'join';

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

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

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

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

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

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

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

+$dbi->insert(table => 'table3', param => {key3 => 5, key4 => 4});

 $rows = $dbi->select(

     table => 'table1',

     column => 'table1.key1 as table1_key1, table2.key1 as table2_key1, key2, key3',

     where   => {'table1.key2' => 2},

-    left_join  => ['table1.key1' => 'table2.key1']

+    join  => ['left outer join table2 on table1.key1 = table2.key1']

 )->fetch_hash_all;

 is_deeply($rows, [{table1_key1 => 1, table2_key1 => 1, key2 => 2, key3 => 5}]);

+$rows = $dbi->select(

+    table => 'table1',

+    where   => {'key1' => 1},

+    join  => ['left outer join table2 on table1.key1 = table2.key1']

+)->fetch_hash_all;

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

+

 eval {

     $rows = $dbi->select(

         table => 'table1',

         column => 'table1.key1 as table1_key1, table2.key1 as table2_key1, key2, key3',

         where   => {'table1.key2' => 2},

-        left_join  => {'table1.key1' => 'table2.key1'}

+        join  => {'table1.key1' => 'table2.key1'}

     );

 };

 like ($@, qr/array/);

+

+$rows = $dbi->select(

+    table => 'table1',

+    where   => {'key1' => 1},

+    join  => ['left outer join table2 on table1.key1 = table2.key1',

+              'left outer join table3 on table2.key3 = table3.key3']

+)->fetch_hash_all;

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

+

+$rows = $dbi->select(

+    column => 'table3.key4 as table3__key4',

+    table => 'table1',

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

+    join  => ['left outer join table2 on table1.key1 = table2.key1',

+              'left outer join table3 on table2.key3 = table3.key3']

+)->fetch_hash_all;

+is_deeply($rows, [{table3__key4 => 4}]);

+

+$rows = $dbi->select(

+    column => 'table1.key1 as table1__key1',

+    table => 'table1',

+    where   => {'table3.key4' => 4},

+    join  => ['left outer join table2 on table1.key1 = table2.key1',

+              'left outer join table3 on table2.key3 = table3.key3']

+)->fetch_hash_all;

+is_deeply($rows, [{table1__key1 => 1}]);

@@ -3,10 +3,10 @@ package MyModel6::table1;

 use base 'MyModel6';

 __PACKAGE__->attr(

-    relation => sub {

-        {

-            'table1.key1' => 'table2.key1'

-        }

+    join => sub {

+        [

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

+        ]

     },

     primary_key => sub { ['key1'] }

 );