@@ -1,4 +1,6 @@

-0.1653

+0.1655

+    - remove experimental DBIx::Custom::Model relation

+0.1654

     - selection can contain where clause.

 0.1653

     - added experimental DBIx::Custom::Result remove_filter()

@@ -1,6 +1,6 @@

 package DBIx::Custom;

-our $VERSION = '0.1654';

+our $VERSION = '0.1655';

 use 5.008001;

 use strict;

@@ -369,7 +369,9 @@ sub execute{

     $arg_tables = [$arg_tables]

       unless ref $arg_tables eq 'ARRAY';

     push @$tables, @$arg_tables;

+    

     foreach my $table (@$tables) {

+        next unless $table;

         $filter = {

             %$filter,

             %{$self->{filter}{out}->{$table} || {}}

@@ -409,6 +411,7 @@ sub execute{

         my $in_filter  = {};

         my $end_filter = {};

         foreach my $table (@$tables) {

+            next unless $table;

             $in_filter = {

                 %$in_filter,

                 %{$self->{filter}{in}{$table} || {}}

@@ -532,6 +535,22 @@ sub insert_at {

     return $self->insert(param => $param, %args);

 }

+sub insert_param {

+    my ($self, $param) = @_;

+    

+    my @tag;

+    

+    push @tag, '{insert_param';

+    

+    foreach my $column (keys %$param) {

+        push @tag, $column;

+    }

+    

+    push @tag, '}';

+    

+    return join ' ', @tag;

+}

+

 sub each_column {

     my ($self, $cb) = @_;

@@ -593,7 +612,7 @@ 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/;

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

 sub select {

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

@@ -616,7 +635,11 @@ sub select {

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

     my $append    = $args{append};

     my $filter    = $args{filter};

-

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

+    

+    my @left_join_tables;

+    unshift @left_join_tables, $tables->[-1];

+    

     # Relation

     if (!$selection && keys %$relation) {

         foreach my $rcolumn (keys %$relation) {

@@ -641,11 +664,13 @@ sub select {

     if ($selection) {

         push @sql, $selection;

+        push @left_join_tables, @{$self->_tables($selection)};

     }

     else {

         # Column clause

         if (@$columns) {

             foreach my $column (@$columns) {

+                push @left_join_tables, @{$self->_tables($column)};

                 push @sql, ($column, ',');

             }

             pop @sql if $sql[-1] eq ',';

@@ -680,6 +705,34 @@ sub select {

     # String where

     my $swhere = "$w";

+    

+    # Table name in Where

+    unshift @left_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];

+            

+            my $table1_exists;

+            my $table2_exists;

+            

+            foreach my $table (@left_join_tables) {

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

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

+            }

+            

+            if ($table1_exists && $table2_exists) {

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

+            }

+        }

+    }

+    

+    # Add where

     push @sql, $swhere;

     # Relation

@@ -694,7 +747,7 @@ sub select {

         }

     }

     pop @sql if $sql[-1] eq 'and';

-    

+        

     # Append statement

     push @sql, $append if $append;

@@ -705,6 +758,8 @@ sub select {

     my $query = $self->create_query($sql);

     return $query if $args{query};

+    unshift @$tables, @left_join_tables;

+    

     # Execute query

     my $result = $self->execute(

         $query, param  => $where, filter => $filter,

@@ -715,7 +770,7 @@ sub select {

 our %VALID_SELECT_AT_ARGS

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

-                       param primary_key/;

+                       param primary_key left_join/;

 sub select_at {

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

@@ -999,6 +1054,22 @@ sub update_at {

     return $self->update(where => $where, param => $param, %args);

 }

+sub update_param {

+    my ($self, $param) = @_;

+    

+    my @tag;

+    

+    push @tag, '{update_param';

+    

+    foreach my $column (keys %$param) {

+        push @tag, $column;

+    }

+    

+    push @tag, '}';

+    

+    return join ' ', @tag;

+}

+

 sub where {

     my $self = shift;

@@ -1070,6 +1141,20 @@ sub _croak {

     }

 }

+sub _tables {

+    my ($self, $source) = @_;

+    

+    my $tables = [];

+    

+    my $safety_name = $self->safety_column_name;

+    

+    while ($source =~ /\b(\w+)\./g) {

+        push @$tables, $1;

+    }

+    

+    return $tables;

+}

+

 # DEPRECATED!

 __PACKAGE__->attr(

     dbi_options => sub { {} },

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

     columns => sub { [] },

     filter => sub { [] },

     primary_key => sub { [] },

-    relation => sub { {} }

 );

 our $AUTOLOAD;

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

     my $self = shift;

     $self->dbi->select(

         table => $self->table,

-        relation => $self->relation,

         @_

     );

 }

@@ -128,7 +126,6 @@ sub select_at {

     return $self->dbi->select_at(

         table => $self->table,

         primary_key => $self->primary_key,

-        relation => $self->relation,

         @_

     );

 }

@@ -1300,7 +1300,7 @@ test 'selection';

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

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

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

-$result = $dbi->select(selection => '* from table1', where => {key1 => 1});

+$result = $dbi->select(selection => '* from {table table1}', where => {key1 => 1});

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

 test 'Model class';

@@ -1586,8 +1586,6 @@ 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'});

 test 'model delete_at';

@@ -1654,7 +1652,7 @@ is($row->{key2}, 2);

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

-test 'model select relation';

+test 'column_clause';

 {

     package MyDBI7;

@@ -1672,21 +1670,6 @@ test 'model select relation';

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

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

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

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

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

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

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

-$result = $dbi->model('table1')->select_at(column => ['key3'], where => [1]);

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

-$dbi->execute('create table table3 (key1);');

-$dbi->model('table3')->insert(param => {key1 => 'a'});

-is_deeply($dbi->model('table3')->select(where => {key1 => 'a'})->fetch_hash_first,

-   {key1 => 'A'});

-

-test 'column_clause';

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

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

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

 $dbi->setup_model;

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

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

@@ -1695,7 +1678,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(column => $model->column_clause(add => ['key3']), where => {'table1.key1' => 1});

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

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