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

+0.1645

+  removed experimental base_table() for class expandability.

+  experimental table() can't set table object any more.

+  added experimental include_table().

 0.1644

   update pod

 0.1643

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

 package DBIx::Custom;

-our $VERSION = '0.1644';

+our $VERSION = '0.1645';

 use 5.008001;

 use strict;

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

     dbi_option    => sub { {} },

     query_builder => sub { DBIx::Custom::QueryBuilder->new },

     result_class  => 'DBIx::Custom::Result',

-    base_table    => sub { DBIx::Custom::Table->new(dbi => shift) },

     safety_column_name => sub { qr/^[\w\.]*$/ },

     stash => sub { {} }

 );

@@ -588,36 +587,53 @@ sub select {

 }

 sub table {

-    my $self = shift;

-    my $name = shift;

+    my ($self, $name, $table) = @_;

+    

+    # Set

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

+    if ($table) {

+        $self->{table}{$name} = $table;

+        return $self;

+    }

+    

+    # Check table existance

+    croak qq{Table "$name" is not included}

+      unless $self->{table}{$name};

+    

+    # Get

+    return $self->{table}{$name};

+}

+

+sub include_table {

+    my ($self, $name_space, $table_infos) = @_;

-    # Create table

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

-    unless (defined $self->{_tables}->{$name}) {

-        # Base table

-        my $base_table = $self->base_table;

+    foreach my $table_info (@$table_infos) {

-        # Base methods

-        my $bmethods = ref $base_table->{_methods} eq 'HASH'

-                     ? $base_table->{_methods}

-                     : {};

+        # Table name and class

+        my $table_name;

+        my $table_class;

+        if (ref $table_info eq 'HASH') {

+            $table_name = (keys %$table_info)[0];

+            $table_class = $table_info->{$table_name};

+        }

+        else { $table_name = $table_class = $table_info }

+        my $tclass = "${name_space}::$table_class";

-        # Copy Methods

-        my $methods = {};

-        $methods->{$_} = $bmethods->{$_} for keys %$bmethods;

-        $methods->{"base_$_"} = $bmethods->{$_} for keys %$bmethods;

+        # Load

+        croak qq{"$tclass" is invalid class name}

+          if $tclass =~ /[^\w:]/;

+        unless ($tclass->can('isa')) {

+            eval "use $tclass";

+            croak $@ if $@;

+        }

-        # Create table

-        my $table = $base_table->new(

-            dbi      => $self,

-            name     => $name,

-        );

-        $table->method($methods);

+        # Instantiate

+        my $table = $tclass->new(dbi => $self, name => $table_name);

-        $self->{_tables}->{$name} = $table;

+        # Set

+        $self->table($table_name, $table);

     }

-    

-    return $self->{_tables}{$name};

+    return $self;

 }

 our %VALID_UPDATE_ARGS

@@ -1165,6 +1181,37 @@ You can do anything in callback.

 Callback receive four arguments, dbi object, table name,

 column name and columninformation.

+=head2 C<(experimental) include_table>

+

+    $dbi->include_table(

+        'MyTable' => [

+            'book', 'person', 'company'

+        ]

+    );

+

+Include tables. First argument is name space.

+Second argument is array reference of class base names.

+

+The following table is instantiated and included.

+

+    MyTable::book

+    MyTable::person

+    MyTable::company

+

+You can get these instance by C<table()>.

+

+    my $book_table = $dbi->table('book');

+

+If you want to other name as table class,

+you can do like this.

+

+    $dbi->include_table(

+        'MyTable' => [

+            {'book' => 'Book'},

+            {'person' => 'Person'}

+        ]

+    );

+

 =head2 C<(experimental) method>

     $dbi->method(

@@ -959,43 +959,51 @@ L<DBIx::Custom::Where> object is embedded into SQL.

     $dbi->execute($sql, param => $param);

-=head2 7. Table object

+=head2 7. Table class

-=head3 Create table object C<table()>

+=head3 Define table clas

-You can create table object to access table in database.

-use C<tabel()> to create table object.

+You can define table class extending L<DBIx::Custom::Table>

+to improve source code view.

-    my $table = $dbi->table('book');

+    package MyTable::book;

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

+    

+    sub insert { ... }

+    sub list { ... }

-Return value is L<DBIx::Custom::Table>.

-From table object, you can call C<insert()>, C<update()>, C<update_all()>�A

-C<delete()>, C<delete_all()>, C<select()>.

-You don't have to specify table name.

+You can include and instantiate this class.

-    $table->insert(param => $param);

+    $dbi->include_table(

+        MyTable => [

+            'book',

+        ]

+    );

-You can add any method to table object.

+First argument is name space.

+Second argument is array reference of class base names.

-    $table->method(

-        register => sub {

-            my $self = shift;

-            my $table_name = $self->name;

-            # ...

-        },

-        list => sub { ... }

-    );

+You can use this table like this.

+

+    my $result = $dbi->table('book')->list;

+

+Table class is a little more useful than L<DBIx::Custom>,

+because you can use method C<insert()>, C<update()>, C<update_all()>,

+C<delete()>, C<delete_all()>, C<select()> without table name.

+

+    $dbi->table('book')->insert(param => $param);

-You can get table name by C<name()>.

+This table is L<DBIx::Custom::Table> object.

-You can call these method from table object.

+If you need table name, you can get C<name()>.

-    $table->register(...);

-    $table->list(...);

+    my $name = $table->name;

-=head2 Use L<DBIx::Custom> and <DBI> methods

+You can get L<DBIx::Custom> object.

-You can call all methods of L<DBIx::Custom> and L<DBI>

+    my $dbi = $table->dbi;

+

+You can also call all methods of L<DBIx::Custom> and L<DBI>.

     # DBIx::Custom method

     $table->execute($sql);

@@ -1004,40 +1012,9 @@ You can call all methods of L<DBIx::Custom> and L<DBI>

     $table->begin_work;

     $table->commit;

-=head2 Add table shared method

-

-To share methods in all tables,

-add method to base table.

-You can get base table by C<base_table()>.

+=head2 Table class example

-    $dbi->base_table->method(

-        count => sub {

-            my $self = shift;

-            return $self->select(column => ['count(*)']);

-        }

-    );

-

-This method is used by all talbes.

-

-    $dbi->table('book')->count(...);

-

-Even if same method name is added to table,

-You can use base table method by C<base_METHOD()>.

-

-    $table->method(

-        count => sub {

-            my $self = shift;

-            

-            $self->base_count(...);

-            

-            # ...

-        }

-    );

-

-=head2 Model example

-

-Generally, it is good to create model in constructor

-in the class extending L<DBIx::Custom>.

+Model example.

     package MyDBI;

@@ -1046,25 +1023,25 @@ in the class extending L<DBIx::Custom>.

     sub connect {

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

-        $self->base_table->method(

-            delete_multi => sub { ... }

-        );

-        

-        $self->table('book')->method(

-            register => sub { ... },

-            remove   => sub { ... },

-        );

-        

-        $self->table('company')->method(

-            register => sub { ... },

-            remove   => sub { ... },

+        $self->include_table(

+            MyTable => [

+                'book',

+                'company'

+            ]

         );

     }

-

-You can use this class in the following way.

-

-    my $dbi = MyDBI->connect(...);

-    $dbi->table('book')->delete_multi(...);

+    

+    package MyTable::book;

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

+    

+    sub insert { ... }

+    sub list { ... }

+    

+    package MyTable::company;

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

+    

+    sub insert { ... }

+    sub list { ... }

 =head2 8. Improve performance

@@ -986,45 +986,53 @@ C<execute()>との連携です。SQLを作成するときに埋め込むこと

     $dbi->execute($sql, param => $param);

-=head2 7. テーブルオブジェクト

+=head2 7. テーブルクラス

-=head3 テーブルオブジェクトの作成 C<table()>

+=head3 テーブルクラス

-データベースのテーブルにアクセスするための

-テーブルオブジェクトを作成することができます。

+ソースコードの見通しをよくするために、

+L<DBIx::Custom::Table>を継承してテーブルクラスを作成することができます。

-テーブルオブジェクトを生成するにはC<table()>を使用します。

+    package MyTable::book;

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

+    

+    sub insert { ... }

+    sub list { ... }

-    my $table = $dbi->table('book');

+このクラスを取り込んで、インスタンス化することができます。

-戻り値はL<DBIx::Custom::Table>オブジェクトです。

-テーブルオブジェクトからはC<insert()>、C<update()>、C<update_all()>、

-C<delete()>、C<delete_all()>、C<select()>などのメソッド呼び出すことができます。

-C<table>を指定する必要はありません。

+    $dbi->include_table(

+        MyTable => [

+            'book',

+        ]

+    );

-    $table->insert(param => $param);

+最初の引数は名前空間です。第二引数は、クラスの末尾の名前を含む

+配列のリファレンスです。

-テーブルオブジェクトには任意のメソッドを追加することができます。

+このテーブルは次のように利用することができます。

-    $table->method(

-        register => sub {

-            my $self = shift;

-            my $table_name = $self->name;

-            # something

-        },

-        list => sub { ... },

-    );

+    my $result = $dbi->table('book')->list;

+

+テーブルクラスでは、テーブル名を指定することなしに

+C<insert()>, C<update()>, C<update_all()>,

+C<delete()>, C<delete_all()>, C<select()>などのメソッドを

+利用できるので

+L<DBIx::Custom>よりも少し便利です。

+

+    $dbi->table('book')->insert(param => $param);

+

+テーブルクラスはL<DBIx::Custom::Table>です。

-C<name()>を使用して、テーブル名を取得することができます。

+必要であれば、C<name()>でテーブル名を取得することができます。

-このようにして登録したメソッドはテーブルオブジェクトから呼び出すことができます。

+    my $name = $table->name;

-    $table->register(...);

-    $table->list(...);

+L<DBIx::Custom>オブジェクトを取得することもできます。

-=head2 L<DBIx::Custom>と<DBI>のメソッドの利用

+    my $dbi = $table->dbi;

-テーブルからはL<DBIx::Custom>とL<DBI>のすべてのメソッドを呼び出すことができます。

+L<DBIx::Custom>とL<DBI>のすべてのメソッドを呼び出すこともできます。

     # DBIx::Custom method

     $table->execute($sql);

@@ -1033,40 +1041,9 @@ C<name()>を使用して、テーブル名を取得することができます

     $table->begin_work;

     $table->commit;

-=head2 テーブルで共有のメソッドの追加

-

-すべてのテーブルでメソッドを共有するには

-ベーステーブルにメソッドを登録します。

-ベーステーブルを取得するにはC<base_table>を使用します。

-

-    $dbi->base_table->method(

-        count => sub {

-            my $self = shift;

-            return $self->select(column => ['count(*)']);

-        }

-    );

-

-このメソッドはすべてのテーブルから利用することができます。

-

-    $dbi->table('book')->count(...);

-

-また同名のメソッドをテーブルに追加して、ベーステーブルの

-メソッドを利用したい場合はC<base_METHOD()>と記述します。

+=head2 テーブルクラスのサンプル

-    $table->method(

-        count => sub {

-            my $self = shift;

-            

-            $self->base_count(...);

-            

-            # ...

-        }

-    );

-

-=head2 モデルのサンプル

-

-一般的には、L<DBIx::Custom>を継承してコンストラクタの中に、モデルを作成

-するのがよいでしょう。

+テーブルクラスのサンプルです。

     package MyDBI;

@@ -1075,26 +1052,25 @@ C<name()>を使用して、テーブル名を取得することができます

     sub connect {

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

-        $self->base_table->method(

-            delete_multi => sub { ... }

-        );

-        

-        $self->table('book')->method(

-            register => sub { ... },

-            remove   => sub { ... },

-        );

-        

-        $self->table('company')->method(

-            register => sub { ... },

-            remove   => sub { ... },

+        $self->include_table(

+            MyTable => [

+                'book',

+                'company'

+            ]

         );

     }

-

-次のようにこのクラスを利用することができます。

-

-    my $dbi = MyDBI->connect(...);

-    $dbi->table('book')->delete_multi(...);

-    $dbi->table('book')->register(...);

+    

+    package MyTable::book;

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

+    

+    sub insert { ... }

+    sub list { ... }

+    

+    package MyTable::company;

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

+    

+    sub insert { ... }

+    sub list { ... }

 =head2 8. パフォーマンスの改善

@@ -15,6 +15,9 @@ BEGIN {

     use_ok('DBIx::Custom');

 }

+use FindBin;

+use lib "$FindBin::Bin/dbix-custom-core-sqlite";

+

 # Function for test name

 sub test { print "# $_[0]\n" }

@@ -732,54 +735,6 @@ is_deeply($infos,

 );

-test 'table';

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

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

-$table = $dbi->table('table1');

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

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

-$rows = $table->select->fetch_hash_all;

-is_deeply($rows, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}],

-                 "select");

-$rows = $table->select(where => {key2 => 2}, append => 'order by key1',

-                              column => ['key1', 'key2'])->fetch_hash_all;

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

-                 "insert insert select");

-$table->update(param => {key1 => 3}, where => {key2 => 2});

-$table->update(param => {key1 => 5}, where => {key2 => 4});

-$rows = $table->select(where => {key2 => 2})->fetch_hash_all;

-is_deeply($rows, [{key1 => 3, key2 => 2}],

-                 "update");

-$table->delete(where => {key2 => 2});

-$rows = $table->select->fetch_hash_all;

-is_deeply($rows, [{key1 => 5, key2 => 4}], "delete");

-$table->update_all(param => {key1 => 3});

-$rows = $table->select->fetch_hash_all;

-is_deeply($rows, [{key1 => 3, key2 => 4}], "update_all");

-$table->delete_all;

-$rows = $table->select->fetch_hash_all;

-is_deeply($rows, [], "delete_all");

-

-$dbi->dbh->do($CREATE_TABLE->{2});

-$dbi->table('table2')->method(

-    ppp => sub {

-        my $self = shift;

-    

-        return $self->name;

-    }

-);

-is($dbi->table('table2')->ppp, 'table2', "method");

-

-$dbi->table('table2')->method({

-    qqq => sub {

-        my $self = shift;

-    

-        return $self->name;

-    }

-});

-is($dbi->table('table2')->qqq, 'table2', "method");

-

-

 test 'limit';

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

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

@@ -1272,10 +1227,6 @@ ok(!defined $result->default_filter);

 $result->default_filter('one');

 is($result->default_filter->(), 1);

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

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

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

-

 test 'dbi_option';

 $dbi = DBIx::Custom->connect(data_source => 'dbi:SQLite:dbname=:memory:',

                              dbi_option => {PrintError => 1});

@@ -1290,28 +1241,6 @@ is_deeply($result->stash, {}, 'default');

 $result->stash->{foo} = 1;

 is($result->stash->{foo}, 1, 'get and set');

-test 'base_table';

-$dbi = DBIx::Custom->new;

-$dbi->base_table->method(

-    twice => sub {

-        my $self = shift;

-        

-        return $_[0] * 2;

-    }

-);

-$table = $dbi->table('book');

-$table->method(

-    three_times => sub {

-        my $self = shift;

-        return  $_[0] * 3;

-    }

-);

-is($table->base_twice(1), 2, 'method');

-is($table->twice(1), 2, 'inherit method');

-is($table->three_times(1), 3, 'child table method');

-eval {$dbi->base_two};

-ok($@);

-

 test 'filter __ expression';

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

 $dbi->execute('create table company (id, name, location_id)');

@@ -1335,3 +1264,85 @@ $dbi->execute($CREATE_TABLE->{0});

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

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

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

+

+test 'Table class';

+use MyDBI1;

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

+$dbi->execute("create table book (title, author)");

+$table = $dbi->table('book');

+$table->insert({title => 'a', author => 'b'});

+is_deeply($table->list->fetch_hash_all, [{title => 'a', author => 'b'}], 'basic');

+$dbi->execute("create table company (name)");

+$table = $dbi->table('company');

+$table->insert({name => 'a'});

+is_deeply($table->list->fetch_hash_all, [{name => 'a'}], 'basic');

+

+$dbi->table('book');

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

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

+

+{

+    package MyDBI4;

+

+    use strict;

+    use warnings;

+

+    use base 'DBIx::Custom';

+

+    sub connect {

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

+        

+        $self->include_table(

+            MyTable2 => [

+                'book',

+                {company => 'Company'}

+            ]

+        );

+    }

+

+    package MyTable2::Base1;

+

+    use strict;

+    use warnings;

+

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

+

+    package MyTable2::book;

+

+    use strict;

+    use warnings;

+

+    use base 'MyTable2::Base1';

+

+    sub insert {

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

+        

+        return $self->SUPER::insert(param => $param);

+    }

+

+    sub list { shift->select; }

+

+    package MyTable2::Company;

+

+    use strict;

+    use warnings;

+

+    use base 'MyTable2::Base1';

+

+    sub insert {

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

+        

+        return $self->SUPER::insert(param => $param);

+    }

+

+    sub list { shift->select; }

+}

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

+$dbi->execute("create table book (title, author)");

+$table = $dbi->table('book');

+$table->insert({title => 'a', author => 'b'});

+is_deeply($table->list->fetch_hash_all, [{title => 'a', author => 'b'}], 'basic');

+$dbi->execute("create table company (name)");

+$table = $dbi->table('company');

+$table->insert({name => 'a'});

+is_deeply($table->list->fetch_hash_all, [{name => 'a'}], 'basic');

@@ -0,0 +1,19 @@

+package MyDBI1;

+

+use strict;

+use warnings;

+

+use base 'DBIx::Custom';

+

+sub connect {

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

+    

+    $self->include_table(

+        MyTable1 => [

+            'book',

+            {company => 'Company'}

+        ]

+    );

+}

+

+1;

@@ -0,0 +1,17 @@

+package MyTable1::Company;

+

+use strict;

+use warnings;

+

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

+

+

+sub insert {

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

+    

+    return $self->SUPER::insert(param => $param);

+}

+

+sub list { shift->select; }

+

+1;

@@ -0,0 +1,16 @@

+package MyTable1::book;

+

+use strict;

+use warnings;

+

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

+

+sub insert {

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

+    

+    return $self->SUPER::insert(param => $param);

+}

+

+sub list { shift->select; }

+

+1;