@@ -1,3 +1,10 @@

+0.1503

+  removed reconnect method

+  removed connected method

+  removed reconnect_memroy method

+  renamed fetch_single to fetch_first

+  renamed fetch_hash_single to fetch_hash_first

+  updated document

 0.1502

   added commit method

   added rollback method

@@ -5,7 +12,6 @@

   moved host attribute to DBIx::Custom::MySQL

   moved port attribute to DBIx::Custom::MySQL

   moved database attribute to DBIx::Custom::MySQL and DBIx::Custom::SQLite

-  

 0.1501

   removed register_format()

   removed formats()

@@ -26,32 +26,6 @@ __PACKAGE__->register_filter(

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

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

-sub register_filter {

-    my $invocant = shift;

-    

-    # Add filter

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

-    $invocant->filters({%{$invocant->filters}, %$filters});

-    

-    return $invocant;

-}

-

-sub auto_commit {

-    my $self = shift;

-    

-    if (@_) {

-        

-        # Set AutoCommit

-        $self->dbh->{AutoCommit} = $_[0];

-        

-        return $self;

-    }

-    return $self->dbh->{AutoCommit};

-}

-

-sub commit   { shift->dbh->commit }

-sub rollback { shift->dbh->rollback }

-

 sub connect {

     my $proto = shift;

@@ -84,186 +58,16 @@ sub connect {

     return $self;

 }

-sub DESTROY {

-    my $self = shift;

-    

-    # Disconnect

-    $self->disconnect if $self->connected;

-}

-

-sub connected { ref shift->{dbh} eq 'DBI::db' }

-

 sub disconnect {

     my $self = shift;

-    if ($self->connected) {

-        

-        # Disconnect

-        $self->dbh->disconnect;

-        delete $self->{dbh};

-    }

-    

-    return $self;

-}

-

-sub reconnect {

-    my $self = shift;

-    

-    # Reconnect

-    $self->disconnect if $self->connected;

-    $self->connect;

+    # Disconnect

+    $self->dbh->disconnect;

+    $self->dbh(undef);

     return $self;

 }

-sub create_query {

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

-    

-    # Create query from SQL template

-    my $sql_template = $self->sql_template;

-    

-    # Get cached query

-    my $cache = $self->{_cache}->{$template};

-    

-    # Create query

-    my $query;

-    if ($cache) {

-        $query = DBIx::Custom::Query->new(

-            sql       => $cache->sql,

-            columns   => $cache->columns

-        );

-    }

-    else {

-        $query = eval{$sql_template->create_query($template)};

-        croak($@) if $@;

-        

-        $self->{_cache}->{$template} = $query

-          unless $self->{_cache}->{$template};

-    }

-    

-    # Prepare statement handle

-    my $sth = $self->dbh->prepare($query->{sql});

-    

-    # Set statement handle

-    $query->sth($sth);

-    

-    return $query;

-}

-

-our %VALID_EXECUTE_ARGS = map { $_ => 1 } qw/param filter/;

-

-sub execute{

-    my $self  = shift;

-    my $query = shift;

-    

-    # Arguments

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

-    

-    # Check arguments

-    foreach my $name (keys %$args) {

-        croak "\"$name\" is invalid name"

-          unless $VALID_EXECUTE_ARGS{$name};

-    }

-    

-    my $params = $args->{param} || {};

-    

-    # First argument is SQL template

-    unless (ref $query eq 'DBIx::Custom::Query') {

-        my $template;

-        

-        if (ref $query eq 'ARRAY') {

-            $template = $query->[0];

-        }

-        else { $template = $query }

-        

-        $query = $self->create_query($template);

-    }

-    

-    my $filter = $args->{filter} || $query->filter || {};

-    

-    # Create bind value

-    my $bind_values = $self->_build_bind_values($query, $params, $filter);

-    

-    # Execute

-    my $sth      = $query->sth;

-    my $affected = eval{$sth->execute(@$bind_values)};

-    

-    # Execute error

-    if (my $execute_error = $@) {

-        require Data::Dumper;

-        my $sql              = $query->{sql} || '';

-        my $params_dump      = Data::Dumper->Dump([$params], ['*params']);

-        

-        croak("$execute_error" . 

-              "<Your SQL>\n$sql\n" . 

-              "<Your parameters>\n$params_dump");

-    }

-    

-    # Return resultset if select statement is executed

-    if ($sth->{NUM_OF_FIELDS}) {

-        

-        # Get result class

-        my $result_class = $self->result_class;

-        

-        # Create result

-        my $result = $result_class->new({

-            sth             => $sth,

-            default_filter  => $self->default_fetch_filter,

-            filters         => $self->filters

-        });

-        return $result;

-    }

-    return $affected;

-}

-

-sub _build_bind_values {

-    my ($self, $query, $params, $filter) = @_;

-    

-    # binding values

-    my @bind_values;

-    

-    # Build bind values

-    my $count = {};

-    foreach my $column (@{$query->columns}) {

-        

-        croak "\"$column\" is not exists in params"

-          unless exists $params->{$column};

-        

-        # Value

-        my $value = ref $params->{$column} eq 'ARRAY'

-                  ? $params->{$column}->[$count->{$column} || 0]

-                  : $params->{$column};

-        

-        # Filter

-        $filter ||= {};

-        

-        # Filter name

-        my $fname = $filter->{$column} || $self->default_query_filter || '';

-        

-        my $filter_func;

-        if ($fname) {

-            

-            if (ref $fname eq 'CODE') {

-                $filter_func = $fname;

-            }

-            else {

-                my $filters = $self->filters;

-                croak "Not exists filter \"$fname\"" unless exists $filters->{$fname};

-                $filter_func = $filters->{$fname};

-            }            

-        }

-        

-        push @bind_values, $filter_func

-                         ? $filter_func->($value)

-                         : $value;

-        

-        # Count up 

-        $count->{$column}++;

-    }

-    

-    return \@bind_values;

-}

-

 our %VALID_INSERT_ARGS = map { $_ => 1 } qw/table param append filter/;

 sub insert {

@@ -529,55 +333,239 @@ sub select {

     return $result;

 }

-=head1 NAME

-

-DBIx::Custom - DBI with hash parameter binding and filtering system

-

-=head1 VERSION

-

-Version 0.1502

-

-=cut

-

-our $VERSION = '0.1502';

-$VERSION = eval $VERSION;

-

-=head1 STATE

-

-This module is not stable. Method name and functionality will be change.

-

-=head1 SYNOPSYS

-    

-    # Connect

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

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

-    

-    # Insert 

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

-                 param  => {title => 'perl', author => 'Ken'},

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

+sub create_query {

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

-    # Update 

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

-                 param  => {title => 'aaa', author => 'Ken'}, 

-                 where  => {id => 5},

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

+    # Create query from SQL template

+    my $sql_template = $self->sql_template;

-    # Update all

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

-                     param  => {title => 'aaa'},

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

+    # Get cached query

+    my $cache = $self->{_cache}->{$template};

-    # Delete

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

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

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

+    # Create query

+    my $query;

+    if ($cache) {

+        $query = DBIx::Custom::Query->new(

+            sql       => $cache->sql,

+            columns   => $cache->columns

+        );

+    }

+    else {

+        $query = eval{$sql_template->create_query($template)};

+        croak($@) if $@;

+        

+        $self->{_cache}->{$template} = $query

+          unless $self->{_cache}->{$template};

+    }

-    # Delete all

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

+    # Prepare statement handle

+    my $sth = $self->dbh->prepare($query->{sql});

-    # Select

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

+    # Set statement handle

+    $query->sth($sth);

+    

+    return $query;

+}

+

+our %VALID_EXECUTE_ARGS = map { $_ => 1 } qw/param filter/;

+

+sub execute{

+    my $self  = shift;

+    my $query = shift;

+    

+    # Arguments

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

+    

+    # Check arguments

+    foreach my $name (keys %$args) {

+        croak "\"$name\" is invalid name"

+          unless $VALID_EXECUTE_ARGS{$name};

+    }

+    

+    my $params = $args->{param} || {};

+    

+    # First argument is SQL template

+    unless (ref $query eq 'DBIx::Custom::Query') {

+        my $template;

+        

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

+            $template = $query->[0];

+        }

+        else { $template = $query }

+        

+        $query = $self->create_query($template);

+    }

+    

+    my $filter = $args->{filter} || $query->filter || {};

+    

+    # Create bind value

+    my $bind_values = $self->_build_bind_values($query, $params, $filter);

+    

+    # Execute

+    my $sth      = $query->sth;

+    my $affected = eval{$sth->execute(@$bind_values)};

+    

+    # Execute error

+    if (my $execute_error = $@) {

+        require Data::Dumper;

+        my $sql              = $query->{sql} || '';

+        my $params_dump      = Data::Dumper->Dump([$params], ['*params']);

+        

+        croak("$execute_error" . 

+              "<Your SQL>\n$sql\n" . 

+              "<Your parameters>\n$params_dump");

+    }

+    

+    # Return resultset if select statement is executed

+    if ($sth->{NUM_OF_FIELDS}) {

+        

+        # Get result class

+        my $result_class = $self->result_class;

+        

+        # Create result

+        my $result = $result_class->new({

+            sth             => $sth,

+            default_filter  => $self->default_fetch_filter,

+            filters         => $self->filters

+        });

+        return $result;

+    }

+    return $affected;

+}

+

+sub _build_bind_values {

+    my ($self, $query, $params, $filter) = @_;

+    

+    # binding values

+    my @bind_values;

+    

+    # Build bind values

+    my $count = {};

+    foreach my $column (@{$query->columns}) {

+        

+        croak "\"$column\" is not exists in params"

+          unless exists $params->{$column};

+        

+        # Value

+        my $value = ref $params->{$column} eq 'ARRAY'

+                  ? $params->{$column}->[$count->{$column} || 0]

+                  : $params->{$column};

+        

+        # Filter

+        $filter ||= {};

+        

+        # Filter name

+        my $fname = $filter->{$column} || $self->default_query_filter || '';

+        

+        my $filter_func;

+        if ($fname) {

+            

+            if (ref $fname eq 'CODE') {

+                $filter_func = $fname;

+            }

+            else {

+                my $filters = $self->filters;

+                croak "Not exists filter \"$fname\"" unless exists $filters->{$fname};

+                $filter_func = $filters->{$fname};

+            }            

+        }

+        

+        push @bind_values, $filter_func

+                         ? $filter_func->($value)

+                         : $value;

+        

+        # Count up 

+        $count->{$column}++;

+    }

+    

+    return \@bind_values;

+}

+

+sub register_filter {

+    my $invocant = shift;

+    

+    # Add filter

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

+    $invocant->filters({%{$invocant->filters}, %$filters});

+    

+    return $invocant;

+}

+

+sub auto_commit {

+    my $self = shift;

+    

+    if (@_) {

+        

+        # Set AutoCommit

+        $self->dbh->{AutoCommit} = $_[0];

+        

+        return $self;

+    }

+    return $self->dbh->{AutoCommit};

+}

+

+sub commit   { shift->dbh->commit }

+sub rollback { shift->dbh->rollback }

+

+sub DESTROY {

+    my $self = shift;

+    

+    # Disconnect

+    $self->disconnect if $self->dbh;

+}

+

+=head1 NAME

+

+DBIx::Custom - DBI with hash parameter binding and filtering system

+

+=head1 VERSION

+

+Version 0.1503

+

+=cut

+

+our $VERSION = '0.1503';

+$VERSION = eval $VERSION;

+

+=head1 STABILITY

+

+This module is not stable. Method name and functionality will be change.

+

+=head1 SYNOPSYS

+    

+    # Connect

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

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

+    

+    # Disconnect

+    $dbi->disconnect

+

+    # Insert 

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

+                 param  => {title => 'perl', author => 'Ken'},

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

+    

+    # Update 

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

+                 param  => {title => 'aaa', author => 'Ken'}, 

+                 where  => {id => 5},

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

+    

+    # Update all

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

+                     param  => {title => 'aaa'},

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

+    

+    # Delete

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

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

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

+    

+    # Delete all

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

+    

+    # Select

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

     # Select(more complex)

     my $result = $dbi->select(

@@ -594,7 +582,7 @@ This module is not stable. Method name and functionality will be change.

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

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

     );

-

+    

     # Execute SQL

     $dbi->execute("select title from books");

@@ -602,6 +590,12 @@ This module is not stable. Method name and functionality will be change.

     $dbi->execute("select id from books where {= author} && {like title}",

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

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

+

+    # Create query and execute it

+    my $query = $dbi->create_query(

+        "select id from books where {= author} && {like title}"

+    );

+    $dbi->execute($query, param => {author => 'ken', title => '%Perl%'})

     # Default filter

     $dbi->default_query_filter('encode_utf8');

@@ -619,7 +613,33 @@ This module is not stable. Method name and functionality will be change.

     # DBI instance

     my $dbh = $dbi->dbh;

-    

+

+=head1 DESCRIPTION

+

+L<DBIx::Custom> is useful L<DBI> extention.

+This module have hash parameter binding and filtering system.

+

+Normally, binding parameter is array.

+L<DBIx::Custom> enable you to pass binding parameter as hash.

+

+This module also provide filtering system.

+You can filter the binding parameter

+or the value of fetching row.

+

+And have useful method such as insert(), update(), delete(), and select().

+

+=head2 Features

+

+=over 4

+

+=item 1. Hash parameter binding.

+

+=item 2. Value filtering.

+

+=item 3. Useful methos such as insert(), update(), delete(), and select().

+

+=back

+

 =head1 ATTRIBUTES

 =head2 user

@@ -643,19 +663,18 @@ Database data source.

     $dbi         = $dbi->data_source("dbi:mysql:dbname=$database");

     $data_source = $dbi->data_source;

-If you know data source more, See also L<DBI>.

-

-=head2 sql_template

-

-SQLTemplate instance. sql_template attribute must be 

-the instance of L<DBIx::Cutom::SQLTemplate> subclass.

+=head2 dbh

-    $dbi          = $dbi->sql_template(DBIx::Cutom::SQLTemplate->new);

-    $sql_template = $dbi->sql_template;

+Database handle. This is the innstance of L<DBI>

+    

+    $dbi = $dbi->dbh($dbh);

+    $dbh = $dbi->dbh;

-the instance of DBIx::Cutom::SQLTemplate is set to 

-this attribute by default.

+You can use all methods of L<DBI>

+    my $sth    = $dbi->dbh->prepare("...");

+    my $errstr = $dbi->dbh->errstr;

+    

 =head2 filters

 Filters

@@ -691,49 +710,21 @@ Result class.

 L<DBIx::Custom::Result> is set to this attribute by default.

-=head2 dbh

-

-Database handle.

-    

-    $dbi = $dbi->dbh($dbh);

-    $dbh = $dbi->dbh;

-    

-=head1 METHODS

-

-This class is L<Object::Simple> subclass.

-You can use all methods of L<Object::Simple>

-

-=head2 auto_commit

-

-Auto commit.

-

-    $self        = $dbi->auto_commit(1);

-    $auto_commit = $dbi->auto_commit;

-

-This is equal to

-

-    $dbi->dbh->{AutoCommit} = 1;

-    $auto_commit = $dbi->dbh->{AutoCommit};

-

-=head2 commit

-

-Commit.

-

-    $dbi->commit;

-

-This is equal to

-

-    $dbi->dbh->commit;

+=head2 sql_template

-=head2 rollback

+SQLTemplate instance. sql_template attribute must be 

+the instance of L<DBIx::Cutom::SQLTemplate> subclass.

-Rollback.

+    $dbi          = $dbi->sql_template(DBIx::Cutom::SQLTemplate->new);

+    $sql_template = $dbi->sql_template;

-    $dbi->rollback

+the instance of DBIx::Cutom::SQLTemplate is set to 

+this attribute by default.

-This is equal to

+=head1 METHODS

-    $dbi->dbh->rollback;

+This class is L<Object::Simple> subclass.

+You can use all methods of L<Object::Simple>

 =head2 connect

@@ -753,70 +744,6 @@ Disconnect database.

 If database is already disconnected, this method do nothing.

-=head2 reconnect

-

-Reconnect to database.

-

-    $dbi->reconnect;

-

-=head2 connected

-

-Check if database is connected.

-    

-    $is_connected = $dbi->connected;

-    

-=head2 register_filter

-

-Resister filter.

-    

-    $dbi->register_filter(%filters);

-    

-Example.

-

-    $dbi->register_filter(

-        encode_utf8 => sub {

-            my $value = shift;

-            

-            require Encode;

-            

-            return Encode::encode('UTF-8', $value);

-        },

-        decode_utf8 => sub {

-            my $value = shift;

-            

-            require Encode;

-            

-            return Encode::decode('UTF-8', $value)

-        }

-    );

-

-=head2 create_query

-    

-Create the instance of L<DBIx::Custom::Query>. 

-This receive the string written by SQL template.

-

-    my $query = $dbi->create_query("select * from authors where {= name} and {= age}");

-

-=head2 execute

-

-Execute the query or the string written by SQL template.

-

-    $result = $dbi->execute($query,    param => $params, filter => {%filter});

-    $result = $dbi->execute($template, param => $params, filter => {%filter});

-

-Example.

-

-    $result = $dbi->execute("select * from authors where {= name} and {= age}", 

-                            {name => 'taro', age => 19});

-    

-    while (my @row = $result->fetch) {

-        # do something

-    }

-

-See also L<DBIx::Custom::SQLTemplate>.

-

-Returned value L<DBIx::Custom::Result> instance.

-

 =head2 insert

 Insert row.

@@ -828,7 +755,7 @@ Insert row.

 Retruned value is affected rows count.

-Example.

+Example:

     # insert

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

@@ -848,7 +775,7 @@ Update rows.

 Retruned value is affected rows count

-Example.

+Example:

     #update

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

@@ -868,7 +795,7 @@ Update all rows.

 Retruned value is affected rows count.

-Example.

+Example:

     # update_all

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

@@ -886,13 +813,13 @@ Delete rows.

 Retrun value is affected rows count

-Example.

+Example:

     # delete

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

                  where  => {id => 5},

                  append => 'some statement',

-                 filter => {id => 'encode_utf8');

+                 filter => {id => 'encode_utf8'});

 =head2 delete_all

@@ -902,10 +829,10 @@ Delete all rows.

 Retruned value is affected rows count.

-Example

+Example:

     # delete_all

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

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

 =head2 select

@@ -915,23 +842,23 @@ Select rows.

                            column   => [@column],

                            where    => {%where},

                            append   => $append,

-                           relation => {%relation}

+                           relation => {%relation},

                            filter   => {%filter});

-Returned value is L<DBIx::Custom::Result> instance.

+Return value is the instance of L<DBIx::Custom::Result>.

-Example.

+Example:

     # select * from books;

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

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

     # select * from books where title = 'Perl';

-    $result = $dbi->select('books', {title => 1});

+    $result = $dbi->select(table => 'books', where => {title => 1});

     # select title, author from books where id = 1 for update;

     $result = $dbi->select(

         table  => 'books',

-        column  => ['title', 'author'],

+        column => ['title', 'author'],

         where  => {id => 1},

         appned => 'for update'

     );

@@ -939,18 +866,98 @@ Example.

     # select books.name as book_name from books, rental 

     # where books.id = rental.book_id;

     my $result = $dbi->select(

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

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

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

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

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

     );

-=head1 AUTHOR

+=head2 create_query

+    

+Create the instance of L<DBIx::Custom::Query>. 

+This receive the string written by SQL template.

-Yuki Kimoto, C<< <kimoto.yuki at gmail.com> >>

+    my $query = $dbi->create_query("select * from authors where {= name} and {= age}");

+

+=head2 execute

+

+Execute the instace of L<DBIx::Custom::Query> or

+the string written by SQL template.

+Return value is the instance of L<DBIx::Custom::Result>.

+

+    $result = $dbi->execute($query,    param => $params, filter => {%filter});

+    $result = $dbi->execute($template, param => $params, filter => {%filter});

+

+Example:

+

+    $result = $dbi->execute("select * from authors where {= name} and {= age}", 

+                            param => {name => 'taro', age => 19});

+    

+    while (my $row = $result->fetch) {

+        # do something

+    }

+

+See also L<DBIx::Custom::SQLTemplate> to know how to write SQL template.

+

+=head2 register_filter

+

+Resister filter.

+    

+    $dbi->register_filter(%filters);

+    

+Example:

-Github L<http://github.com/yuki-kimoto>

+    $dbi->register_filter(

+        encode_utf8 => sub {

+            my $value = shift;

+            

+            require Encode;

+            

+            return Encode::encode('UTF-8', $value);

+        },

+        decode_utf8 => sub {

+            my $value = shift;

+            

+            require Encode;

+            

+            return Encode::decode('UTF-8', $value)

+        }

+    );

+

+=head2 auto_commit

+

+Auto commit.

-I develope this module on L<http://github.com/yuki-kimoto/DBIx-Custom>

+    $self        = $dbi->auto_commit(1);

+    $auto_commit = $dbi->auto_commit;

+

+This is equal to

+

+    $dbi->dbh->{AutoCommit} = 1;

+    $auto_commit = $dbi->dbh->{AutoCommit};

+

+=head2 commit

+

+Commit.

+

+    $dbi->commit;

+

+This is equal to

+

+    $dbi->dbh->commit;

+

+=head2 rollback

+

+Rollback.

+

+    $dbi->rollback

+

+This is equal to

+

+    $dbi->dbh->rollback;

+

+=head1 AUTHOR

+

+Yuki Kimoto, C<< <kimoto.yuki at gmail.com> >>

 =head1 COPYRIGHT & LICENSE

@@ -30,17 +30,7 @@ sub connect {

     return $self->SUPER::connect;

 }

-sub last_insert_id {

-    my $self = shift;

-    

-    # Not connected

-    croak "Not yet connected" unless $self->connected;

-    

-    # Get last insert id

-    my $last_insert_id = $self->dbh->{mysql_insertid};

-    

-    return $last_insert_id;

-}

+sub last_insert_id { shift->dbh->{mysql_insertid} }

 1;

@@ -20,13 +20,6 @@ DBIx::Custom::Query - query used by DBIx::Custom

 =head1 ATTRIBUTES

-=head2 sth

-

-Statement handle.

-

-    $query = $query->sth($sth);

-    $sth   = $query->sth;

-

 =head2 sql

 SQL statement.

@@ -34,6 +27,13 @@ SQL statement.

     $query = $query->sql($sql);

     $sql   = $query->sql;

+=head2 columns

+

+Column names.

+

+    $query   = $query->columns([@columns]);

+    $columns = $query->columns;

+

 =head2 default_filter

 Default filter.

@@ -48,12 +48,12 @@ Filter.

     $query  = $query->filter({%filter});

     $filter = $query->filter;

-=head2 columns

+=head2 sth

-Column names.

+Statement handle.

-    $query   = $query->columns([@columns]);

-    $columns = $query->columns;

+    $query = $query->sth($sth);

+    $sth   = $query->sth;

 =head1 METHODS

@@ -35,7 +35,54 @@ sub fetch {

                    : $_[0]->{filters}->{$fname}->($row[$i]);

     }

-    return wantarray ? @row : \@row;

+    return \@row;

+}

+

+sub fetch_first {

+    my $self = shift;

+    

+    # Fetch

+    my $row = $self->fetch;

+    

+    # Not exist

+    return unless $row;

+    

+    # Finish statement handle

+    $self->sth->finish;

+    

+    return $row;

+}

+

+sub fetch_multi {

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

+    

+    # Not specified Row count

+    croak("Row count must be specified")

+      unless $count;

+    

+    # Fetch multi rows

+    my $rows = [];

+    for (my $i = 0; $i < $count; $i++) {

+        my $row = $self->fetch;

+        

+        last unless $row;

+        

+        push @$rows, $row;

+    }

+    

+    return unless @$rows;

+    return $rows;

+}

+

+sub fetch_all {

+    my $self = shift;

+    

+    # Fetch all rows

+    my $rows = [];

+    while(my $row = $self->fetch) {

+        push @$rows, $row;

+    }

+    return $rows;

 }

 sub fetch_hash {

@@ -65,25 +112,10 @@ sub fetch_hash {

             $_[0]->{filters}->{$fname}->($row->[$i]);

     }

-    return wantarray ? %$row_hash : $row_hash;

-}

-

-sub fetch_single {

-    my $self = shift;

-    

-    # Fetch

-    my $row = $self->fetch;

-    

-    # Not exist

-    return unless $row;

-    

-    # Finish statement handle

-    $self->sth->finish;

-    

-    return wantarray ? @$row : $row;

+    return $row_hash;

 }

-sub fetch_hash_single {

+sub fetch_hash_first {

     my $self = shift;

     # Fetch hash

@@ -95,28 +127,7 @@ sub fetch_hash_single {

     # Finish statement handle

     $self->sth->finish;

-    return wantarray ? %$row : $row;

-}

-

-sub fetch_multi {

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

-    

-    # Not specified Row count

-    croak("Row count must be specified")

-      unless $count;

-    

-    # Fetch multi rows

-    my $rows = [];

-    for (my $i = 0; $i < $count; $i++) {

-        my @row = $self->fetch;

-        

-        last unless @row;

-        

-        push @$rows, \@row;

-    }

-    

-    return unless @$rows;

-    return wantarray ? @$rows : $rows;

+    return $row;

 }

 sub fetch_hash_multi {

@@ -129,26 +140,15 @@ sub fetch_hash_multi {

     # Fetch multi rows

     my $rows = [];

     for (my $i = 0; $i < $count; $i++) {

-        my %row = $self->fetch_hash;

+        my $row = $self->fetch_hash;

-        last unless %row;

+        last unless $row;

-        push @$rows, \%row;

+        push @$rows, $row;

     }

     return unless @$rows;

-    return wantarray ? @$rows : $rows;

-}

-

-sub fetch_all {

-    my $self = shift;

-    

-    # Fetch all rows

-    my $rows = [];

-    while(my @row = $self->fetch) {

-        push @$rows, [@row];

-    }

-    return wantarray ? @$rows : $rows;

+    return $rows;

 }

 sub fetch_hash_all {

@@ -156,10 +156,10 @@ sub fetch_hash_all {

     # Fetch all rows as hash

     my $rows = [];

-    while(my %row = $self->fetch_hash) {

-        push @$rows, {%row};

+    while(my $row = $self->fetch_hash) {

+        push @$rows, $row;

     }

-    return wantarray ? @$rows : $rows;

+    return $rows;

 }

 1;

@@ -169,177 +169,151 @@ sub fetch_hash_all {

 DBIx::Custom::Result - DBIx::Custom Resultset

 =head1 SYNOPSIS

-

-    my $result = $dbi->execute($query);

-    # Fetch

-    while (my @row = $result->fetch) {

-        # Do something

+    # Result

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

+    

+    # Fetch a row into array

+    while (my $row = $result->fetch) {

+        my $value1 = $row->[0];

+        my $valuu2 = $row->[1];

+        

+        # do something

     }

-    # Fetch hash

-    while (my %row = $result->fetch_hash) {

-        # Do something

+    # Fetch only first row into array

+    my $row = $result->fetch_first;

+    

+    # Fetch multiple rows into array of array

+    while (my $rows = $result->fetch_multi(5)) {

+        # do something

+    }

+    

+    # Fetch all rows into array of array

+    my $rows = $result->fetch_all;

+    

+    # Fetch hash into hash

+    while (my $row = $result->fetch_hash) {

+        my $value1 = $row->{title};

+        my $value2 = $row->{author};

+        

+        # do something

     }

+    

+    # Fetch only first row into hash

+    my $row = $result->fetch_hash_first;

+    

+    # Fetch multiple rows into array of hash

+    while (my $rows = $result->fetch_hash_multi) {

+        # do something

+    }

+    

+    # Fetch all rows into array of hash

+    my $rows = $result->fetch_hash_all;

 =head1 ATTRIBUTES

 =head2 sth

-Statement handle

+Statement handle.

     $result = $result->sth($sth);

     $sth    = $reuslt->sth

 =head2 default_filter

-Filter excuted when data is fetched

+Default filter.

-    $result         = $result->default_filter($default_filter);

+    $result         = $result->default_filter('decode_utf8');

     $default_filter = $result->default_filter;

 =head2 filter

-Filter excuted when data is fetched

+Filter

-    $result   = $result->filter($sth);

-    $filter   = $result->filter;

+    $result = $result->filter({title => 'decode_utf8'});

+    $filter = $result->filter;

 =head1 METHODS

 This class is L<Object::Simple> subclass.

 You can use all methods of L<Object::Simple>

-=head2 new

-

-    my $result = DBIx::Custom::Result->new;

-

 =head2 fetch

-Fetch a row

+Fetch a row into array

-    $row = $result->fetch; # array reference

-    @row = $result->fecth; # array

+    $row = $result->fetch;

-The following is fetch sample

+Example:

     while (my $row = $result->fetch) {

         # do something

-        my $val1 = $row->[0];

-        my $val2 = $row->[1];

-    }

-

-=head2 fetch_hash

-

-Fetch row as hash

-

-    $row = $result->fetch_hash; # hash reference

-    %row = $result->fetch_hash; # hash

-

-The following is fetch_hash sample

-

-    while (my $row = $result->fetch_hash) {

-        # do something

-        my $val1 = $row->{key1};

-        my $val2 = $row->{key2};

+        my $value1 = $row->[0];

+        my $value2 = $row->[1];

     }

-=head2 fetch_single

-

-Fetch only first row(Scalar context)

+=head2 fetch_first

-    $row = $result->fetch_single; # array reference

-    @row = $result->fetch_single; # array

-    

-The following is fetch_single sample

-

-    $row = $result->fetch_single;

-    

-This method fetch only first row and finish statement handle

-

-=head2 fetch_hash_single

-    

-Fetch only first row as hash

-

-    $row = $result->fetch_hash_single; # hash reference

-    %row = $result->fetch_hash_single; # hash

-    

-The following is fetch_hash_single sample

+Fetch only first row into array and finish statment handle.

-    $row = $result->fetch_hash_single;

-    

-This method fetch only single row and finish statement handle

+    $row = $result->fetch_first;

 =head2 fetch_multi

-Fetch rows

+Fetch multiple rows into array of array.

-    $rows = $result->fetch_multi($row_count); # array ref of array ref

-    @rows = $result->fetch_multi($row_count); # array of array ref

+    $rows = $result->fetch_multi($count);

-The following is fetch_multi sample

+Example:

     while(my $rows = $result->fetch_multi(10)) {

         # do someting

     }

-=head2 fetch_hash_multi

-

-Fetch rows as hash

-

-    $rows = $result->fetch_hash_multi($row_count); # array ref of hash ref

-    @rows = $result->fetch_hash_multi($row_count); # array of hash ref

-    

-The following is fetch_hash_multi sample

-

-    while(my $rows = $result->fetch_hash_multi(10)) {

-        # do someting

-    }

-

 =head2 fetch_all

-Fetch all rows

+Fetch all rows into array of array.

-    $rows = $result->fetch_all; # array ref of array ref

-    @rows = $result->fecth_all; # array of array ref

+    $rows = $result->fetch_all;

-The following is fetch_all sample

+=head2 fetch_hash

-    my $rows = $result->fetch_all;

+Fetch a row into hash

-=head2 fetch_hash_all

+    $row = $result->fetch_hash;

-Fetch all row as array ref of hash ref (Scalar context)

+Example:

-    $rows = $result->fetch_hash_all; # array ref of hash ref

-    @rows = $result->fecth_all_hash; # array of hash ref

+    while (my $row = $result->fetch_hash) {

+        my $val1 = $row->{title};

+        my $val2 = $row->{author};

+        

+        # do something

+    }

-The following is fetch_hash_all sample

+=head2 fetch_hash_first

+    

+Fetch only first row into hash and finish statment handle.

-    my $rows = $result->fetch_hash_all;

+    $row = $result->fetch_hash_first;

-=head2 error

+=head2 fetch_hash_multi

-Get error infomation

+Fetch multiple rows into array of hash

-    $error_messege = $result->error;

-    ($error_message, $error_number, $error_state) = $result->error;

+    $rows = $result->fetch_hash_multi($count);

+Example:

-You can get get information. This is same as the following.

-

-    $error_message : $result->sth->errstr

-    $error_number  : $result->sth->err

-    $error_state   : $result->sth->state

-

-=head2 finish

-

-Finish statement handle

+    while(my $rows = $result->fetch_hash_multi(10)) {

+        # do someting

+    }

-    $result->finish

+=head2 fetch_hash_all

-This is equel to

+Fetch all rows into array of hash.

-    $result->sth->finish;

+    $rows = $result->fetch_hash_all;

 =cut

@@ -59,18 +59,6 @@ sub register_tag_processor {

     return $self;

 }

-sub clone {

-    my $self = shift;

-    my $new = $self->new;

-    

-    $new->tag_start($self->tag_start);

-    $new->tag_end($self->tag_end);

-    $new->tag_syntax($self->tag_syntax);

-    $new->tag_processors({%{$self->tag_processors || {}}});

-    

-    return $new;

-}

-

 sub create_query {

     my ($self, $template)  = @_;

@@ -29,38 +29,13 @@ sub connect_memory {

     # Data source for memory database

     $self->data_source('dbi:SQLite:dbname=:memory:');

-    # Already connected

-    croak("Already connected") if $self->connected;

-    

     # Connect

     $self->connect;

     return $self;

 }

-sub reconnect_memory {

-    my $self = shift;

-

-    # Data source for memory database

-    $self->data_source('dbi:SQLite:dbname=:memory:');

-    

-    # Reconnect

-    $self->reconnect;

-    

-    return $self;

-}

-

-sub last_insert_rowid {

-    my $self = shift;

-    

-    # Not connected

-    croak "Not yet connected" unless $self->connected;

-    

-    # Get last insert row id

-    my $last_insert_rowid = $self->dbh->func('last_insert_rowid');

-    

-    return $last_insert_rowid;

-}

+sub last_insert_rowid { shift->dbh->func('last_insert_rowid') }

 1;

@@ -80,9 +55,6 @@ DBIx::Custom::SQLite - a SQLite implementation of DBIx::Custom

     # Connect memory database

     my $dbi = DBIx::Custom::SQLite->connect_memory;

-    # Reconnect memory database

-    $dbi->reconnect_memory;

-    

     # Last insert row ID

     my $id = $dbi->last_insert_rowid;

@@ -117,12 +89,6 @@ Connect memory database.

     $dbi->connect_memory;

-=head2 reconnect_memory

-

-Reconnect to memory databsse.

-

-    $dbi->reconnect_memory;

-

 =head2 last_insert_rowid

 Last insert row ID.

@@ -68,10 +68,6 @@ $dbi->disconnect;

 ok(!$dbi->dbh, $test);

-test 'connected';

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

-ok($dbi->connected, "$test : connected");

-

 # Prepare table

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

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

@@ -87,45 +83,22 @@ $result = $dbi->execute($query);

 while (my $row = $result->fetch) {

     push @rows, [@$row];

 }

-is_deeply(\@rows, [[1, 2], [3, 4]], "$test : fetch scalar context");

-

-$result = $dbi->execute($query);

-@rows = ();

-while (my @row = $result->fetch) {

-    push @rows, [@row];

-}