@@ -1,5 +1,7 @@

+0.1726

+    - improved join clause parsing

 0.1725

-    - improved join clause parsing.

+    - improved join clause parsing

 0.1724

     - added EXPERIMENTAL like_value method to DBIx::Custom

     - sqlfilter option is renamed to after_build_sql, sqlfilter is DEPRECATED!

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

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.1725';

+our $VERSION = '0.1726';

 use 5.008001;

 use Carp 'croak';

@@ -1460,7 +1460,7 @@ sub _push_join {

             my @j_clauses = reverse split /\s(and|on)\s/, $j_clause;

             my $c = $self->safety_character;

-            my $join_re = qr/(?:^|\s)($c+)\.$c+\s.+\s($c+)\.$c+/;

+            my $join_re = qr/(?:^|\s)($c+)\.$c+[^$c]+($c+)\.$c+/;

             for my $clause (@j_clauses) {

                 if ($clause =~ $join_re) {

                     $table1 = $1;

@@ -2205,14 +2205,14 @@ User name, used when C<connect> method is executed.

     my $user_column_info = $dbi->user_column_info;

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

-You can set the following data.

+You can set the date like the following one.

     [

         {table => 'book', column => 'title', info => {...}},

         {table => 'author', column => 'name', info => {...}}

     ]

-Usually, you can set return value of C<get_column_info>.

+Usually, you set return value of C<get_column_info>.

     my $user_column_info

       = $dbi->get_column_info(exclude_table => qr/^system/);

@@ -268,3 +268,21 @@ $rows = $dbi->select(

   append => "order by key2 {limit 1}"

 )->all;

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

+

+test 'join function';

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

+eval { $dbi->execute("drop table table1") };

+eval { $dbi->execute("drop table table2") };

+$dbi->execute($create_table1);

+$dbi->execute("create table table2 (key1, key3)");

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

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

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

+$result = $dbi->select(

+    table => 'table1',

+    column => [{table2 => ['key3']}],

+    join => [

+        "left outer join table2 on coalesce(table2.key3, 0) > '3' and table1.key1 = table2.key1"

+    ]

+);

+is_deeply($result->all, [{"table2.key3" => 4}]);