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

+0.1658

+    - added experimental DBIx::Custom::Model column() prefix option.

+    - fixed select_at join column invalid bug

+    - added DBIx::Custom::Model column() attribute 

 0.1657

     - remaned experimental safty_charcter to safty_name

     - safty_charcter is changed, set only one character regex.

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

 package DBIx::Custom;

-our $VERSION = '0.1657';

+our $VERSION = '0.1658';

 use 5.008001;

 use strict;

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

 our %VALID_SELECT_AT_ARGS

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

-                       param primary_key left_join/;

+                       param primary_key join/;

 sub select_at {

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

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

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

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

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

             my $table1 = $1;

             my $table2 = $2;

@@ -11,7 +11,7 @@ use Carp 'croak';

 push @DBIx::Custom::CARP_NOT, __PACKAGE__;

 __PACKAGE__->attr(

-    ['dbi', 'name', 'table'],

+    ['dbi', 'name', 'table', 'column'],

     columns => sub { [] },

     filter => sub { [] },

     primary_key => sub { [] },

@@ -52,10 +52,11 @@ sub column_clause {

     my $add     = $args->{add} || [];

     my $remove  = $args->{remove} || [];

     my %remove  = map {$_ => 1} @$remove;

+    my $prefix  = $args->{prefix} || '';

     my @column;

     foreach my $column (@$columns) {

-        push @column, "$table.$column as $column"

+        push @column, "$table.$column as $prefix$column"

           unless $remove{$column};

     }

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

     my $self = shift;

     $self->dbi->select(

         table => $self->table,

+        column => $self->column,

         join => $self->join,

         @_

     );

@@ -127,7 +129,9 @@ sub select_at {

     return $self->dbi->select_at(

         table => $self->table,

+        column => $self->column,

         primary_key => $self->primary_key,

+        join => $self->join,

         @_

     );

 }

@@ -246,6 +250,14 @@ If you add some column, use C<add> option.

     my $column_clause = $model->column_clause(add => ['company.id as company__id']);

+If you add column name prefix, use C<prefix> option

+

+    my $column_clause = $model->column_clause(prefix => 'book__');

+

+The following clause is created.

+

+    book.id as book__id, book.name as book__name

+

 =head2 C<delete>

     $table->delete(...);

@@ -1784,3 +1784,29 @@ $rows = $dbi->select(

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

 )->fetch_hash_all;

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

+

+

+test 'column_clause';

+{

+    package MyDBI8;

+    

+    use base 'DBIx::Custom';

+    

+    sub connect {

+        my $self = shift->SUPER::connect(@_);

+        

+        $self->include_model('MyModel7');

+        

+        return $self;

+    }

+}

+$dbi = MyDBI8->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});

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

+$result = $model->select_at(where => 1);

+is_deeply($result->fetch_hash_first,

+          {key1 => 1, key2 => 2, table2__key1 => 1, table2__key3 => 3});

@@ -0,0 +1,5 @@

+package MyModel7;

+

+use base 'DBIx::Custom::Model';

+

+1;

@@ -0,0 +1,22 @@

+package MyModel7::table1;

+

+use base 'MyModel7';

+

+__PACKAGE__->attr(

+    primary_key => sub { ['key1'] },

+    column => sub {

+        my $self = shift;

+        

+        return [

+            $self->column_clause,

+            $self->model('table2')->column_clause(prefix => 'table2__')

+        ];

+    },

+    join => sub {

+        [

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

+        ]

+    },

+);

+

+1;

@@ -0,0 +1,5 @@

+package MyModel7::table2;

+

+use base 'MyModel7';

+

+1;