@@ -1,5 +1,8 @@

 0.1628

+  remove DBIx::Custom::Model

+  move table method and table_class attribute to DBIx::Custom

   added examples

+  fixed connect method bug

 0.1627

   added insert, update, update_all, delete, delete_all, select method to DBIx::Custom::Table

   added experimental txn_scope

@@ -44,6 +44,7 @@ __PACKAGE__->attr(filters => sub {

 __PACKAGE__->attr(filter_check => 1);

 __PACKAGE__->attr(query_builder  => sub {DBIx::Custom::QueryBuilder->new});

 __PACKAGE__->attr(result_class => 'DBIx::Custom::Result');

+__PACKAGE__->attr(table_class => 'DBIx::Custom::Table');

 # DBI methods

 foreach my $method (qw/begin_work commit rollback/) {

@@ -173,7 +174,7 @@ sub connect {

         }

     }

     else {

-        $self = $proto->new(@_);

+        $self = $proto->SUPER::new(@_);

     }

     # Information

@@ -606,6 +607,30 @@ sub select {

     return $result;

 }

+sub table {

+    my $self = shift;

+    my $name = shift;

+    

+    # Table class

+    my $table_class = $self->table_class;

+    croak qq{Invalid table class name "$table_class"}

+      unless $table_class =~ /^[\w:]+$/;

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

+        eval "require $table_class";

+        croak $@ if $@;

+    }

+    # Create table

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

+    $self->{_tables}->{$name}

+        = $table_class->new(name => $name, dbi => $self)

+      unless defined $self->{_tables}->{$name};

+    

+    # Helper

+    $self->{_tables}->{$name}->helper(@_) if @_;

+    

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

+}

+

 sub txn_scope {

     my $self = shift;

@@ -1351,6 +1376,18 @@ Rollback is automatically done.

 Note that this is feature of L<DBIx::TransactionManager>

 L<DBIx::TransactionManager> is required.

+=head2 C<table>

+

+    $dbi->table('book',

+        insert => sub { ... },

+        update => sub { ... }

+    );

+    

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

+

+Create a L<DBIx::Custom::Table> object,

+or get a L<DBIx::Custom::Table> object.

+

 =head2 C<update_all>

     $dbi->update_all(table  => $table, 

@@ -6,25 +6,25 @@ DBIx::Custom::Guides - DBIx::Custom Guides

 =head2 1. Connect to the database

-C<connect()> method create a new L<DBIx::Custom>

-object and connect to the database.

-

     use DBIx::Custom;

-    my $dbi = DBIx::Custom->connect(data_source => "dbi:mysql:database=dbname",

+    my $dbi = DBIx::Custom->connect(data_source => "dbi:mysql:database=$database",

                                     user => 'ken', password => '!LFKD%$&');

-B<Data source exmaples:>

-

-MySQL

+use C<connect()> to connect to the database.

+You can sepecfiy C<data_soruce>, C<user>, and C<password>.

-    "dbi:mysql:database=$database"

-    "dbi:mysql:database=$database;host=$hostname;port=$port"

+The following ones are data source exmaple in variouse dabase system.

 SQLite

     "dbi:SQLite:dbname=$database"

     "dbi:SQLite:dbname=:memory:"

+MySQL

+

+    "dbi:mysql:database=$database"

+    "dbi:mysql:database=$database;host=$hostname;port=$port"

+

 PostgreSQL

     "dbi:Pg:dbname=$dbname"

@@ -52,7 +52,7 @@ You don't have to create SQL statements.

 Execute insert statement.

-    $dbi->insert(table  => 'books',

+    $dbi->insert(table  => 'book',

                  param  => {title => 'Perl', author => 'Ken'});

 The following SQL is executed.

@@ -68,13 +68,13 @@ See also "METHODS" section.

 Execute update statement.

-    $dbi->update(table  => 'books', 

+    $dbi->update(table  => 'book', 

                  param  => {title => 'Perl', author => 'Ken'}, 

                  where  => {id => 5});

 The following SQL is executed.

-    update books set title = ?, author = ?;

+    update book set title = ?, author = ?;

 The values of C<title> and C<author> is embedded into the placeholders.

@@ -87,12 +87,12 @@ If you want to update all rows, use C<update_all()> method.

 Execute delete statement.

-    $dbi->delete(table  => 'books',

+    $dbi->delete(table  => 'book',

                  where  => {author => 'Ken'});

 The following SQL is executed.

-    delete from books where id = ?;

+    delete from book where id = ?;

 The value of C<id> is embedded into the placehodler.

@@ -105,11 +105,11 @@ If you want to delete all rows, use C<delete_all()> method.

 Execute select statement, only C<table> argument specified :

-    my $result = $dbi->select(table => 'books');

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

 The following SQL is executed.

-    select * from books;

+    select * from book;

 the result of C<select()> method is L<DBIx::Custom::Result> object.

 You can fetch a row by C<fetch()> method.

@@ -125,42 +125,42 @@ See "3. Fetch row".

 C<column> and C<where> arguments specified.

     my $result = $dbi->select(

-        table  => 'books',

+        table  => 'book',

         column => [qw/author title/],

         where  => {author => 'Ken'}

     );

 The following SQL is executed.

-    select author, title from books where author = ?;

+    select author, title from book where author = ?;

 the value of C<author> is embdded into the placeholder.

 If you want to join tables, specify C<relation> argument. 

     my $result = $dbi->select(

-        table    => ['books', 'rental'],

-        column   => ['books.name as book_name']

-        relation => {'books.id' => 'rental.book_id'}

+        table    => ['book', 'rental'],

+        column   => ['book.name as book_name']

+        relation => {'book.id' => 'rental.book_id'}

     );

 The following SQL is executed.

-    select books.name as book_name from books, rental

-    where books.id = rental.book_id;

+    select book.name as book_name from book, rental

+    where book.id = rental.book_id;

 If you want to add some string to the end of SQL statement,

 use C<append> argument.

     my $result = $dbi->select(

-        table  => 'books',

+        table  => 'book',

         where  => {author => 'Ken'},

         append => 'order by price limit 5',

     );

 The following SQL is executed.

-    select * books where author = ? order by price limit 5;

+    select * book where author = ? order by price limit 5;

 C<filter> argument can be specified.

 see also "METHODS" section.

@@ -238,7 +238,7 @@ At frist, I show normal parameter binding.

     use DBI;

     my $dbh = DBI->connect(...);

     my $sth = $dbh->prepare(

-        "select * from books where author = ? and title like ?;"

+        "select * from book where author = ? and title like ?;"

     );

     $sth->execute('Ken', '%Perl%');

@@ -249,7 +249,7 @@ L<DBIx::Custom> hash parameter binding system improve

 normal parameter binding to use hash parameter.

     my $result = $dbi->execute(

-        "select * from books where {= author} and {like title};"

+        "select * from book where {= author} and {like title};"

         param => {author => 'Ken', title => '%Perl%'}

     );

@@ -257,8 +257,8 @@ This is same as the normal way, execpt that the parameter is hash.

 {= author} and {like title} is called C<tag>.

 tag is expand to placeholder string internally.

-    select * from books where {= author} and {like title}

-      -> select * from books where author = ? and title like ?;

+    select * from book where {= author} and {like title}

+      -> select * from book where author = ? and title like ?;

 The following tags is available.

@@ -284,7 +284,7 @@ C<{> and C<}> is reserved. If you use these charactors,

 you must escape them using '\'. Note that '\' is

 already perl escaped charactor, so you must write '\\'. 

-    'select * from books \\{ something statement \\}'

+    'select * from book \\{ something statement \\}'

 =head2 5. Filtering

@@ -307,7 +307,7 @@ C<encode_utf8> and C<decode_utf8> filter is registerd by default.

 You can specify these filters to C<filter> argument of C<execute()> method.

     my $result = $dbi->execute(

-        "select * from books where {= author} and {like title};"

+        "select * from book where {= author} and {like title};"

         param  => {author => 'Ken', title => '%Perl%'},

         filter => {author => 'to_upper_case, title => 'encode_utf8'}

     );

@@ -317,13 +317,13 @@ C<insert()>, C<update()>, C<update_all()>,

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

     # insert(), having filter argument

-    $dbi->insert(table  => 'books',

+    $dbi->insert(table  => 'book',

                  param  => {title => 'Perl', author => 'Ken'},

                  filter => {title => 'encode_utf8'});

     # select(), having filter argument

     my $result = $dbi->select(

-        table  => 'books',

+        table  => 'book',

         column => [qw/author title/],

         where  => {author => 'Ken'},

         append => 'order by id limit 1',

@@ -338,7 +338,7 @@ C<filter()> argument overwrites this default filter.

     $dbi->default_bind_filter('encode_utf8');

     $dbi->insert(

-        table  => 'books',

+        table  => 'book',

         param  => {title => 'Perl', author => 'Ken', price => 1000},

         filter => {author => 'to_upper_case', price => undef}

     );

@@ -346,14 +346,14 @@ C<filter()> argument overwrites this default filter.

 This is same as the following example.

     $dbi->insert(

-        table  => 'books',

+        table  => 'book',

         param  => {title => 'Perl', author => 'Ken', price => 1000},

         filter => {title => 'encode_uft8' author => 'to_upper_case'}

     );

 You can also specify filter when the row is fetched. This is reverse of bind filter.

-    my $result = $dbi->select(table => 'books');

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

     $result->filter({title => 'decode_utf8', author => 'to_upper_case'});

 Filter works each column value, but you prepare a default filter

@@ -366,7 +366,7 @@ overwrites this default filter.

     $dbi->default_fetch_filter('decode_utf8');

     my $result = $dbi->select(

-        table => 'books',

+        table => 'book',

         columns => ['title', 'author', 'price']

     );

     $result->filter({author => 'to_upper_case', price => undef});

@@ -374,7 +374,7 @@ overwrites this default filter.

 This is same as the following one.

     my $result = $dbi->select(

-        table => 'books',

+        table => 'book',

         columns => ['title', 'author', 'price']

     );

     $result->filter({title => 'decode_utf8', author => 'to_upper_case'});

@@ -431,17 +431,6 @@ SQLite

 =head2 6. Get high performance

-=head3 Disable filter checking

-

-Filter checking is executed by default.

-This is done to check right filter name is specified,

-but sometimes damage performance.

-

-If you disable this filter checking,

-Set C<filter_check> attribute to 0.

-

-    $dbi->filter_check(0);

-

 =head3 Use execute() method instead suger methods

 If you execute insert statement by C<insert()> method,

@@ -453,65 +442,30 @@ is created every time.

 In that case, you can prepare a query by C<create_query()> method.

     my $query = $dbi->create_query(

-        "insert into books {insert_param title author};"

+        "insert into book {insert_param title author};"

     );

 Return value of C<create_query()> is L<DBIx::Custom::Query> object.

 This keep the information of SQL and column names.

     {

-        sql     => 'insert into books (title, author) values (?, ?);',

+        sql     => 'insert into book (title, author) values (?, ?);',

         columns => ['title', 'author']

     }

 Execute query repeatedly.

-    my $inputs = [

+    my $params = [

         {title => 'Perl',      author => 'Ken'},

         {title => 'Good days', author => 'Mike'}

     ];

-    foreach my $input (@$inputs) {

-        $dbi->execute($query, $input);

+    foreach my $param (@$params) {

+        $dbi->execute($query, $param);

     }

 This is faster than C<insert()> method.

-=head3 caching

-

-C<execute()> method caches the parsed result of the source of SQL.

-Default to 1

-

-    $dbi->cache(1);

-

-Caching is on memory, but you can change this by C<cache_method()>.

-First argument is L<DBIx::Custom> object.

-Second argument is a source of SQL,

-such as "select * from books where {= title} and {= author};";

-Third argument is parsed result, such as

-{sql => "select * from books where title = ? and author = ?",

- columns => ['title', 'author']}, this is hash reference.

-If arguments is more than two, this method is called to set cache.

-If not, this method is called to get cache.

-

-    $dbi->cache_method(sub {

-        sub {

-            my $self = shift;

-            

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

-            

-            # Set cache

-            if (@_ > 1) {

-                $self->{_cached}{$_[0]} = $_[1] 

-            }

-            

-            # Get cache

-            else {

-                return $self->{_cached}{$_[0]}

-            }

-        }

-    });

-

 =head2 7. More features

 =head3 Get DBI object

@@ -94,7 +94,7 @@ C<insert()>、C<update()>、C<delete()>、C<select()>

 C<insert>メソッドです。データベースにデータを挿入します。

-    $dbi->insert(table  => 'books',

+    $dbi->insert(table  => 'book',

                  param  => {title => 'Perl', author => 'Ken'});

 これは次のL<DBI>の操作と同じです。

@@ -106,14 +106,14 @@ C<insert>メソッドです。データベースにデータを挿入します

 C<update>メソッドです。データベースのデータを更新します。

-    $dbi->update(table  => 'books', 

+    $dbi->update(table  => 'book', 

                  param  => {title => 'Perl', author => 'Ken'}, 

                  where  => {id => 5});

 これは次のL<DBI>の操作と同じです。

     my $sth = $dbh->prepare(

-        'update books set title = ?, author = ? where id = ?;');

+        'update book set title = ?, author = ? where id = ?;');

     $sth->execute('Perl', 'Ken', 5);

 C<update>メソッドは安全のため

@@ -121,19 +121,19 @@ where句のないSQLを発行することを許可していません。

 もしすべての行を更新したい場合は

 C<update_all()>メソッドを使用してください。

-    $dbi->update_all(table  => 'books', 

+    $dbi->update_all(table  => 'book', 

                      param  => {title => 'Perl', author => 'Ken'});

 =head3 C<delete()>

 C<delete>メソッドです。データベースのデータを削除します。

-    $dbi->delete(table  => 'books',

+    $dbi->delete(table  => 'book',

                  where  => {author => 'Ken'});

 これは次のL<DBI>の操作と同じです。

-    my $sth = $dbh->prepare('delete from books where id = ?;');

+    my $sth = $dbh->prepare('delete from book where id = ?;');

     $sth->execute('Ken');

 C<delete>メソッドは安全のため

@@ -141,17 +141,17 @@ where句のないSQLを発行することを許可していません。

 もしすべての行を削除したい場合は

 C<delete_all()>メソッドを使用してください。

-    $dbi->delete_all(table  => 'books');

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

 =head3 C<select()>

 C<select>メソッドです。テーブル名だけを指定しています。

-    my $result = $dbi->select(table => 'books');

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

 これは次のL<DBI>の操作と同じです。

-    my $sth = $dbh->prepare('select * from books;);

+    my $sth = $dbh->prepare('select * from book;);

     $sth->execute;

 C<select()>メソッドの戻り値はL<DBIx::Custom::Result>

@@ -166,7 +166,7 @@ C<select()>メソッドの戻り値はL<DBIx::Custom::Result>

 次のC<select>は行の名前とwhere句を指定したものです。

     my $result = $dbi->select(

-        table  => 'books',

+        table  => 'book',

         column => [qw/author title/],

         where  => {author => 'Ken'}

     );

@@ -174,28 +174,28 @@ C<select()>メソッドの戻り値はL<DBIx::Custom::Result>

 次のL<DBI>の操作と同じです。

     my $sth = $dbh->prepare(

-        'select author, title from books where author = ?;');

+        'select author, title from book where author = ?;');

     $sht->execute('Ken');

 テーブルをjoinしたい場合はC<relation>を使用します。

     my $result = $dbi->select(

-        table    => ['books', 'rental'],

-        column   => ['books.name as book_name']

-        relation => {'books.id' => 'rental.book_id'}

+        table    => ['book', 'rental'],

+        column   => ['book.name as book_name']

+        relation => {'book.id' => 'rental.book_id'}

     );

 次のL<DBI>の操作と同じです。

     my $sth = $dbh->prepare(

-        'select books.name as book_name from books, rental' .

-        'where books.id = rental.book_id;');

+        'select book.name as book_name from book, rental' .

+        'where book.id = rental.book_id;');

     $sth->execute;

 SQL文の末尾に文字列を追加したい場合は<append>オプションを使用します。

     my $result = $dbi->select(

-        table  => 'books',

+        table  => 'book',

         where  => {author => 'Ken'},

         append => 'order by price limit 5',

     );

@@ -203,7 +203,7 @@ SQL文の末尾に文字列を追加したい場合は<append>オプションを

 次のL<DBI>の操作と同じです。

     my $sth = $dbh->prepare(

-        'select * books where author = ? order by price limit 5;');

+        'select * book where author = ? order by price limit 5;');

     $sth->execute;

 C<append>オプションは、C<insert()>、C<update()>、C<update_all()>

@@ -213,7 +213,7 @@ C<delete()>、C<select>メソッドで使用することが

 この後のフィルタリングの解説で詳しく扱いますが、値をフィルタリングしたい

 場合はC<filter>オプションを使用することができます。

-    $dbi->insert(table  => 'books',

+    $dbi->insert(table  => 'book',

                  param  => {title => 'Perl', author => 'Ken'});

                  filter => {title  => 'encode_utf8',

                             author => 'encode_utf8'});

@@ -228,7 +228,7 @@ C<select()>メソッドのC<where>オプションではハッシュの代わり

     # Select, more flexible where

     my $result = $dbi->select(

-        table  => 'books',

+        table  => 'book',

         where  => ['{= author} and {like title}', 

                    {author => 'Ken', title => '%Perl%'}]

     );

@@ -328,7 +328,7 @@ L<DBIx::Custom>はハッシュパラメタバインドを提供します。

     use DBI;

     my $dbh = DBI->connect(...);

     my $sth = $dbh->prepare(

-        "select * from books where author = ? and title like ?;"

+        "select * from book where author = ? and title like ?;"

     );

     $sth->execute('Ken', '%Perl%');

@@ -342,18 +342,18 @@ L<DBIx::Custom>はこれを改善して、ハッシュで

 パラメタを指定できるようにしました。

     my $result = $dbi->execute(

-        "select * from books where {= author} and {like title};"

+        "select * from book where {= author} and {like title};"

         param => {author => 'Ken', title => '%Perl%'}

     );

 C<{= author}>とC<{like title}>はタグと呼ばれます。

 タグは内部ではプレースホルダを含む文字列に置き換えられます。

-    select * from books where {= author} and {like title}

+    select * from book where {= author} and {like title}

 という文は以下のSQLに置き換えられます。

-    select * from books where author = ? and title like ?;

+    select * from book where author = ? and title like ?;

 このようにタグを使ってSQL文を表現するのがL<DBIx::Custom>の

 特徴です。以下のタグが利用可能です。

@@ -382,7 +382,7 @@ C<{>とC<}>は予約語です。これらの文字を使いたい場合は

 エスケープするためには'\\'と書く必要があることに注意

 してください。

-    'select * from books \\{ something statement \\}'

+    'select * from book \\{ something statement \\}'

 =head2 5. フィルタリング

@@ -412,7 +412,7 @@ C<register_filter()>メソッドを使用して

 で指定することができます。

     my $result = $dbi->execute(

-        "select * from books where {= author} and {like title};"

+        "select * from book where {= author} and {like title};"

         param  => {author => 'Ken', title => '%Perl%'},

         filter => {author => 'to_upper_case, title => 'encode_utf8'}

     );

@@ -426,13 +426,13 @@ C<delete()>、C<select()>

 メソッドにおいても使用することができます。

     # insert() with filter option

-    $dbi->insert(table  => 'books',

+    $dbi->insert(table  => 'book',

                  param  => {title => 'Perl', author => 'Ken'},

                  filter => {title => 'encode_utf8'});

     # select() with filter option

     my $result = $dbi->select(

-        table  => 'books',

+        table  => 'book',

         column => [qw/author title/],

         where  => {author => 'Ken'},

         append => 'order by id limit 1',

@@ -449,7 +449,7 @@ C<filter()>オプションで指定されたフィルタは、

     $dbi->default_bind_filter('encode_utf8');

     $dbi->insert(

-        table  => 'books',

+        table  => 'book',

         param  => {title => 'Perl', author => 'Ken', price => 1000},

         filter => {author => 'to_upper_case', price => undef}

     );

@@ -510,7 +510,7 @@ SQLite

 これはL<DBIx::Custom::Result>クラスのC<filter>メソッドを使って

 行います。

-    my $result = $dbi->select(table => 'books');

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

     $result->filter({title => 'decode_utf8', author => 'to_upper_case'});

 フィルタはそれぞれの列の値に作用しますが、

@@ -522,7 +522,7 @@ C<filter>メソッドで設定されたフィルタはデフォルトのフィ

     $dbi->default_fetch_filter('decode_utf8');

     my $result = $dbi->select(

-        table => 'books',

+        table => 'book',

         columns => ['title', 'author', 'price']

     );

     $result->filter({author => 'to_upper_case', price => undef});

@@ -561,7 +561,7 @@ C<insert()>メソッドは、SQL文とステートメントハンドルを

 クエリを用意しておくことができます。

     my $query = $dbi->create_query(

-        "insert into books {insert_param title author};"

+        "insert into book {insert_param title author};"

     );

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

@@ -569,7 +569,7 @@ C<insert()>メソッドは、SQL文とステートメントハンドルを

 保持しています。またステートメントハンドルも保持しています。

     {

-        sql     => 'insert into books (title, author) values (?, ?);',

+        sql     => 'insert into book (title, author) values (?, ?);',

         columns => ['title', 'author'],

         sth     => $sth

     }

@@ -617,10 +617,10 @@ C<execute()>メソッドはデフォルトでSQL文への解析結果をキャ

     });

 最初の引数はL<DBIx::Custom>です。第二引数は、

-"select * from books where {= title} and {= author};";

+"select * from book where {= title} and {= author};";

 のようなSQL文の源です。

 第三引数は

-{sql => "select * from books where title = ? and author = ?",

+{sql => "select * from book where title = ? and author = ?",

  columns => ['title', 'author']}

 のような解析後のデータです。これはハッシュリファレンスである必要

 があります。

@@ -711,18 +711,18 @@ C<expand>メソッドを使用すると次のようなハッシュに含まれ

 以下のハッシュ

-    {books => {title => 'Perl', author => 'Ken'}}

+    {book => {title => 'Perl', author => 'Ken'}}

 は次のように展開されます。

-    ('books.title' => 'Perl', 'books.author' => 'Ken')

+    ('book.title' => 'Perl', 'book.author' => 'Ken')

 これはテーブル名を含むselect文で利用すると便利です。

     my $param = {title => 'Perl', author => '%Ken%'};

     $dbi->execute(

-        'select * from books where {= books.title} && {like books.author};',

-        param => {$dbi->expand({books => $param})}

+        'select * from book where {= book.title} && {like book.author};',

+        param => {$dbi->expand({book => $param})}

     );

 =cut

@@ -1,73 +0,0 @@

-package DBIx::Custom::Model;

-

-use strict;

-use warnings;

-

-use base 'Object::Simple';

-

-use Carp 'croak';

-

-__PACKAGE__->attr(dbi => sub { DBIx::Custom->new });

-__PACKAGE__->attr(table_class => 'DBIx::Custom::Table');

-__PACKAGE__->attr(tables => sub { {} });

-

-sub table {

-    my ($self, $name) = @_;

-    

-    # Table class

-    my $table_class = $self->table_class;

-    croak qq{Invalid table class name "$table_class"}

-      unless $table_class =~ /^[\w:]+$/;

-    unless ($table_class->can('isa')) {

-        eval "require $table_class";

-        croak $@ if $@;

-    }

-    # Create table

-    $self->tables->{$name}

-        = $table_class->new(name => $name, dbi => $self->dbi, model => $self)

-      unless defined $self->tables->{$name};

-    

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

-}

-

-1;

-

-=head1 NAME

-

-DBIx::Custom::Model - Table class(experimental)

-

-=head1 SYNOPSIS

-

-use MyModel;

-

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

-

-sub new {

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

-    

-    my $dbi = DBIx::Custom->connect(...);

-    

-    $self->dbi($dbi);

-    

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

-        insert => sub {

-            my $self = shift;

-            

-            return $self->dbi->insert(table => $self->name, @_);

-        }

-    );

-    

-    return $self;

-}

-

-=head1 METHODS

-

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

-and implements the following new ones.

-

-=head2 C<table>

-

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

-

-Get a L<DBIx::Custom::Table>, or create a L<DBIx::Custom::Table> object if not exists.

-

@@ -62,7 +62,6 @@ my $insert_query;

 my $update_query;

 my $ret_val;

 my $infos;

-my $model;

 my $table;

 # Prepare table

@@ -749,27 +748,10 @@ is_deeply($infos,

     , $test

 );

-test 'model';

-{

-    package MyModel1;

-    

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

-    

-    sub new {

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

-        

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

-        

-        $self->dbi($dbi);

-        

-        return $self;

-    }

-}

-$model = MyModel1->new;

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

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

-is($table, $model->table('table1'));

-is($table->model, $model);

+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;

@@ -794,6 +776,14 @@ $table->delete_all;

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

 is_deeply($rows, [], "$test: delete_all");

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

+$dbi->table('table2', ppp => sub {

+    my $self = shift;

+    

+    return $self->name;

+});

+is($dbi->table('table2')->ppp, 'table2', "$test : helper");

+

 test 'limit';

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

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

@@ -830,3 +820,30 @@ $rows = $dbi->select(

 )->fetch_hash_all;

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

+test 'connect super';

+{

+    package MyDBI;

+    

+    use base 'DBIx::Custom';

+    sub connect {

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

+        

+        return $self;

+    }

+    

+    sub new {

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

+        

+        return $self;

+    }

+}

+

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

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

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

+is($dbi->select(table => 'table1')->fetch_hash_first->{key1}, 1, $test);

+

+$dbi = MyDBI->new($NEW_ARGS->{0});

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

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

+is($dbi->select(table => 'table1')->fetch_hash_first->{key1}, 1, $test);