@@ -1,5 +1,10 @@

 0.1660

-    - update pod

+    - added EXPERIMENTAL DBIx::Custom::Model view()

+    - added EXPERIMENTAL view()

+    - DBIx::Custom::Model inherit DBIx::Custom

+    - removed EXPERIMETNAL DBIx::Custom::Model method()

+    - added table choice feature to select() EXPERIMENTAL all_column option 

+    - removed EXPERIMENTAL DBIx::Custom::Model column attribute for side effect

 0.1659

     - EXPERIMETAL fork safety implementaion.

     - removed EXPERIMENTAL selection

@@ -669,20 +669,34 @@ sub select {

     elsif ($all_column) {

         # Find tables

-        my $main_table = $tables->[-1] || '';

+        my $main_table;

         my %tables;

-        foreach my $j (@$join) {

-            my $tables = $self->_tables($j);

-            foreach my $table (@$tables) {

-                $tables{$table} = 1;

+        if (ref $all_column eq 'ARRAY') {

+            foreach my $table (@$all_column) {

+                if (($table || '') eq $tables->[-1]) {

+                    $main_table = $table;

+                }

+                else {

+                    $tables{$table} = 1;

+                }

+            }

+        }

+        else {

+            $main_table = $tables->[-1] || '';

+            foreach my $j (@$join) {

+                my $tables = $self->_tables($j);

+                foreach my $table (@$tables) {

+                    $tables{$table} = 1;

+                }

             }

+            delete $tables{$main_table};

         }

-        delete $tables{$main_table};

-        my @column_clause;

         # Column clause of main table

-        push @sql, $self->model($main_table)->column_clause;

-        push @sql, ',';

+        if ($main_table) {

+            push @sql, $self->model($main_table)->column_clause;

+            push @sql, ',';

+        }

         # Column cluase of other tables

         foreach my $table (keys %tables) {

@@ -716,7 +730,12 @@ sub select {

                 $found->{$table} = 1;

             }

         }

-        else { push @sql, $tables->[-1] }

+        else {

+            my $main_table = $tables->[-1] || '';

+            push @sql, $self->view($main_table)

+                     ? $self->view($main_table)

+                     : $main_table;

+        }

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

     }

@@ -892,6 +911,9 @@ sub include_model {

         # Set

         $self->model($model->name, $model);

+        # View

+        $self->view($model->table, $model->view) if $model->view;

+        

         # Apply filter

         croak "${name_space}::$model_class filter must be array reference"

           unless ref $model->filter eq 'ARRAY';

@@ -1073,6 +1095,23 @@ sub update_param {

     return join ' ', @tag;

 }

+sub view {

+    my $self = shift;

+    my $name = shift;

+    

+    # View

+    $self->{view} ||= {};

+    if (@_) {

+        $self->{view}->{$name} = $_[0];

+        return $self;

+    }

+    else {

+        return $name && $self->{view}->{$name}

+             ? "(" . $self->{view}->{$name} . ") as $name"

+             : undef;

+    }

+}

+

 sub where {

     my $self = shift;

@@ -2189,12 +2228,16 @@ This create the following column clause.

 Columns of main table is consist of only column name,

 Columns of joined table is consist of table and column name joined C<__>.

-Note that this option is failed unless L<DBIx::Custom::Model> object is set to

-C<model> and C<columns> of the object is set.

+Note that this option is failed unless modles is included and

+C<columns> attribute is set.

     # Generally do the following way before using all_column option

     $dbi->include_model('MyModel')->setup_model;

+You can also specify table names to C<all_column>.

+

+    $dbi->select(all_column => ['book', 'company']);

+

 =item C<where>

 Where clause. This is hash reference or L<DBIx::Custom::Where> object.

@@ -2506,6 +2549,27 @@ Create a new L<DBIx::Custom::Where> object.

 Setup all model objects.

 C<columns> of model object is automatically set, parsing database information.

+=head2 C<view> EXPERIMENTAL

+

+    # Register view

+    $dbi->view(

+        book_issue_data

+          => 'select id, DATE(issue_datatime) as issue_date from book');

+    );

+    

+    # Get view

+    my $view = $dbi->view('book_issue_date');

+

+View.

+

+C<view()> return the following statement when you get a view.

+

+    (select id, DATE(issue_datetime) from book) as book_issue_date

+

+You can use this view in from clause

+

+    "select issue_date from " . $dbi->view('book_issue_date')

+

 =head1 Tags

 The following tags is available.

@@ -3,7 +3,7 @@ package DBIx::Custom::Model;

 use strict;

 use warnings;

-use base 'Object::Simple';

+use base 'DBIx::Custom';

 use Carp 'croak';

@@ -11,37 +11,13 @@ use Carp 'croak';

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

 __PACKAGE__->attr(

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

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

     columns => sub { [] },

     filter => sub { [] },

-    primary_key => sub { [] },

-    join => sub { [] }

+    join => sub { [] },

+    primary_key => sub { [] }

 );

-our $AUTOLOAD;

-

-sub AUTOLOAD {

-    my $self = shift;

-

-    # Method name

-    my ($package, $mname) = $AUTOLOAD =~ /^([\w\:]+)\:\:(\w+)$/;

-

-    # Method

-    $self->{_methods} ||= {};

-    if (my $method = $self->{_methods}->{$mname}) {

-        return $self->$method(@_)

-    }

-    elsif ($self->dbi->can($mname)) {

-        $self->dbi->$mname(@_);

-    }

-    elsif ($self->dbi->dbh->can($mname)) {

-        $self->dbi->dbh->$mname(@_);

-    }

-    else {

-        croak qq/Can't locate object method "$mname" via "$package"/

-    }

-}

-

 sub column_clause {

     my $self = shift;

@@ -104,21 +80,10 @@ sub insert_at {

     );

 }

-sub method {

-    my $self = shift;

-    

-    # Merge

-    my $methods = ref $_[0] eq 'HASH' ? $_[0] : {@_};

-    $self->{_methods} = {%{$self->{_methods} || {}}, %$methods};

-    

-    return $self;

-}

-

 sub select {

     my $self = shift;

     $self->dbi->select(

         table => $self->table,

-        column => $self->column,

         join => $self->join,

         @_

     );

@@ -129,7 +94,6 @@ sub select_at {

     return $self->dbi->select_at(

         table => $self->table,

-        column => $self->column,

         primary_key => $self->primary_key,

         join => $self->join,

         @_

@@ -171,11 +135,6 @@ my $table = DBIx::Custom::Model->new(table => 'books');

 =head1 ATTRIBUTES

-=head2 C<columns>

-

-    my $columns = $model->columns;

-    $model      = $model->columns(['id', 'number']);

-

 =head2 C<dbi>

     my $dbi = $model->dbi;

@@ -222,6 +181,14 @@ Table name is real table name in database.

 Foreign key. This is used by C<insert_at>,C<update_at()>,

 C<delete_at()>,C<select_at()>.

+=head2 C<view>

+

+    my $view = $model->view;

+    $model   = $model->view('select id, DATE(issue_datetime) as date from book');

+

+View. This view is registered by C<view()> of L<DBIx::Custom> when

+model is included by C<include_model>.

+

 =head1 METHODS

 L<DBIx::Custom> inherits all methods from L<Object::Simple>,

@@ -279,19 +246,6 @@ you don't have to specify C<table> option.

 Same as C<delete()> of L<DBIx::Custom> except that

 you don't have to specify C<table> and C<primary_key> option.

-=head2 C<method>

-

-    $table->method(

-        count => sub {

-            my $self = shift;

-        

-            return $self->select(column => 'count(*)', @_)

-                        ->fetch_first->[0];

-        }

-    );

-    

-Add method to a L<DBIx::Custom::Table> object.

-

 =head2 C<insert>

     $table->insert(...);

@@ -1321,10 +1321,6 @@ is_deeply($model->list->fetch_hash_all, [{name => 'a'}], 'basic');

 is($dbi->models->{'book'}, $dbi->model('book'));

 is($dbi->models->{'company'}, $dbi->model('company'));

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

-eval{$dbi->model('book')->no_exists};

-like($@, qr/locate/);

-

 {

     package MyDBI4;

@@ -1807,11 +1803,46 @@ $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);

+$result = $model->select_at(

+    all_column => ['table1', 'table2'],

+    where => 1

+);

 is_deeply($result->fetch_hash_first,

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

-$model->column(undef);

 $result = $model->select(all_column => 1);

 is_deeply($result->fetch_hash_first,

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

+test 'view';

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

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

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

+$dbi->view('table1_trim' => 'select key1, trim(key2) as key2 from table1');

+$result = $dbi->select(

+    table => 'table1',

+    column => ['table1_trim.key2 as table1_trim__key2'],

+    join => ["left outer join " . $dbi->view('table1_trim') . " on table1.key1 = table1_trim.key1"]

+);

+is($result->fetch_hash_first->{'table1_trim__key2'}, 'a');

+

+$result = $dbi->select(table => 'table1_trim');

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

+

+{

+    package MyDBI9;

+    

+    use base 'DBIx::Custom';

+    

+    sub connect {

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

+        

+        $self->include_model('MyModel8')->setup_model;

+        

+        return $self;

+    }

+}

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

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

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

+$result = $dbi->model('table1_trim')->select;

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

@@ -4,14 +4,6 @@ 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'

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

+package MyModel8;

+

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

+

+1;

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

+package MyModel8::table1;

+

+use base 'MyModel8';

+

+1;

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

+package MyModel8::table1_trim;

+

+use base 'MyModel8';

+

+__PACKAGE__->attr(view => 'select key1, trim(key2) as key2 from table1');

+

+1;