@@ -1,3 +1,5 @@

+0.1626

+  simplified DBIx::Custom::Model and DBIx::Custom::Table

 0.1625

   added experimental DBIx::Custom::Model and DBIx::Custom::Table

 0.1624

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

 package DBIx::Custom;

-our $VERSION = '0.1625';

+our $VERSION = '0.1626';

 use 5.008001;

 use strict;

@@ -523,7 +523,7 @@ sub register_filter {

 }

 our %VALID_SELECT_ARGS

-  = map { $_ => 1 } qw/auto_filter_table table column where append relation filter param/;

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

 sub select {

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

@@ -6,18 +6,27 @@ use warnings;

 use base 'Object::Simple';

 use Carp 'croak';

-use DBIx::Custom::Table;

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

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

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

 sub table {

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

-      

-    $self->{tables}{$table}

-        = DBIx::Custom::Table->new(name => $table, dbi => $self->dbi)

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

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

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

+    # Table class

+    my $table_class = $self->table_class;

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

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

+    eval "use $table_class";

+    croak $@ if $@;

+    

+    # Create table

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

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

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

+    

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

 }

 1;

@@ -35,14 +44,15 @@ use base 'DBIx::Custom::Model';

 sub new {

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

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

-        insert_multi => sub {

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

+    

+    $self->dbi($dbi);

+    

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

+        insert => sub {

             my $self = shift;

-            my $dbi = $self->dbi;

-            

-            # ...

-            

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

         }

     );

@@ -56,7 +66,7 @@ and implements the following new ones.

 =head2 C<table>

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

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

-Create a table object if not exists or get it.

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

@@ -9,87 +9,6 @@ use Carp 'croak';

 __PACKAGE__->attr(['dbi', 'name']);

-sub new {

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

-    

-    my $insert = sub {

-        my $self = shift;

-        

-        return $self->dbi->insert(table => $self->name, param => shift);

-    };

-    

-    my $update = sub {

-        my $self = shift;

-        

-        return $self->dbi->update(table => $self->name, param => shift,

-                                  where => shift);

-    };

-    

-    my $update_all = sub {

-        my $self = shift;

-        

-        return $self->dbi->update_all(table => $self->name, param => shift);

-    };

-    

-    my $delete = sub {

-        my $self = shift;

-        

-        return $self->dbi->delete(table => $self->name, where => shift);

-    };

-    

-    my $delete_all = sub {

-        my $self = shift;

-        

-        return $self->dbi->delete_all(table => $self->name);

-    };

-    

-    my $select = sub {

-        my $self = shift;

-        

-        my $where  = {};

-        my $column = ['*'];

-        my $append = '';

-        

-        foreach my $arg (@_) {

-            my $type = ref $arg;

-            

-            if ($type eq 'ARRAY') {

-                $column = $arg;

-            }

-            elsif ($type eq 'HASH') {

-                $where = $arg;

-            }

-            else {

-                $append = $arg;

-            }

-        }

-        

-        return $self->dbi->select(

-            table  => $self->name,

-            where  => $where,

-            column => $column,

-            append => $append

-        );

-    };

-    

-    $self->helper(

-        insert => $insert,

-        insert_simple => $insert,

-        update => $update,

-        update_simple => $update,

-        update_all => $update_all,

-        update_all_simple => $update_all,

-        delete => $delete,

-        delete_simple => $delete,

-        delete_all => $delete_all,

-        delete_all_simple => $delete_all,

-        select => $select,

-        select_simple => $select

-    );

-    

-    return $self;

-}

-

 our $AUTOLOAD;

 sub AUTOLOAD {

@@ -123,7 +42,7 @@ sub DESTROY { }

 =head1 NAME

-DBIx::Custom::Model - Modele base class(experimental)

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

 =head1 SYNOPSIS

@@ -139,69 +58,10 @@ and implements the following new ones.

 =head2 C<helper>

     $table->helper(insert => sub {

-        # ...

+        my $self = shift;

+        

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

     });

-

-=head2 C<new>

-

-    my $table = DBIx::Custom->new;

-    

-=head2 C<insert>

-

-    $table->insert(\%param);

-

-Insert.

-

-=head2 C<insert_simple>

-

-Same as C<insert()>.

-

-=head2 C<update>

-

-    $table->update(\%param, \%where);

-

-Update.

-

-=head2 C<update_simple>

-

-Same as C<update()>.

-

-=head2 C<update_all>

-

-    $table->update_all(\%param);

-

-Update all.

-

-=head2 C<update_all_simple>

-

-Same as C<update_all>.

-

-=head2 C<delete>

-

-    $table->delete(\%where);

-

-=head2 C<delete_simple()>

-

-Same as C<delete_all()>.

-

-=head2 C<delete_all>

-

-    $table->delete_all(\%where);

-

-=head2 C<delete_all_simple()>

-

-Same as C<delete_all()>.

-

-=head2 C<select>

-

-    $table->select(\%where);

-    $table->select(\@column);

-    $table->select($append);

-    # And any combination

-    $table->select(\%where, \@column, $append);

-

-=head2 C<select_simple>

-

-Same as C<select()>.

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

@@ -754,31 +754,66 @@ 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);

+        

+        $self->table('table1')->helper(

+            insert => sub { 

+                my $self = shift;

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

+            },

+            update => sub {

+                my $self = shift;

+                $self->dbi->update(table => $self->name, @_);

+            },

+            update_all => sub {

+                my $self = shift;

+                $self->dbi->update_all(table => $self->name, @_);

+            },

+            delete => sub {

+                my $self = shift;

+                $self->dbi->delete(table => $self->name, @_);

+            },

+            delete_all => sub {

+                my $self = shift;

+                $self->dbi->delete_all(table => $self->name, @_);

+            },

+            select => sub {

+                my $self = shift;

+                $self->dbi->select(table => $self->name, @_);

+            },

+        );

+        return $self;

+    }

 }

 $model = MyModel1->new;

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

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

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

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

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

+$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}],

                  "$test: select");

-$rows = $table->select({key2 => 2},

-                       'order by key1', ['key1', 'key2'])->fetch_hash_all;

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

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

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

-                 "$test: insert insert_simple select select_simple");

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

-$table->update_simple({key1 => 5}, {key2 => 4});

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

+                 "$test: 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}],

                  "$test: update");

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

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

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

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

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

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

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

 $table->delete_all;

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

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

-$table->helper('insert' => sub { 5 });

-is($table->insert, 5, "$test : helper");

-