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

+0.1604

+  removed DESTROY method(not backword compatible)

+  removed disconnect method(not backword compatible)

+  fixed DBIx::Custom::MySQL connect_memory

 0.1603

   removed DBIx::Custom commit method (not backword compatible)

   removed DBIx::Custom rollback method (not backword compatible)

@@ -74,15 +74,14 @@ sub connect {

     return $self;

 }

-sub disconnect {

-    my $self = shift;

+sub register_filter {

+    my $invocant = shift;

-    # Disconnect

-    my $ret = eval { $self->dbh->disconnect };

-    croak $@ if $@;

-    $self->dbh(undef);

+    # Add filter

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

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

-    return $ret;

+    return $invocant;

 }

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

@@ -110,7 +109,8 @@ sub insert {

       unless @insert_keys;

     # Templte for insert

-    my $template = "insert into $table {insert " . join(' ', @insert_keys) . '}';

+    my $template = "insert into $table {insert "

+                   . join(' ', @insert_keys) . '}';

     $template .= " $append" if $append;

     # Execute query

@@ -444,7 +444,8 @@ sub _build_bind_values {

             }

             else {

                 my $filters = $self->filters;

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

+                croak "Not exists filter \"$fname\""

+                  unless exists $filters->{$fname};

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

             }            

         }

@@ -460,44 +461,23 @@ sub _build_bind_values {

     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 DESTROY {

-    my $self = shift;

-    

-    # Disconnect

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

-}

-

 =head1 NAME

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

 =cut

-our $VERSION = '0.1603';

+our $VERSION = '0.1604';

 =head1 STABILITY

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

+This module is not stable. Method name and implementations will be changed.

 =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'},

@@ -569,7 +549,7 @@ This module is not stable. Method name and implementations will be change.

     }

-    # DBI instance

+    # Get DBI object

     my $dbh = $dbi->dbh;

 =head1 DESCRIPTION

@@ -590,11 +570,17 @@ And have useful method such as insert(), update(), delete(), and select().

 =over 4

-=item 1. Hash parameter binding.

+=item *

-=item 2. Value filtering.

+Hash parameter binding.

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

+=item *

+

+Value filtering.

+

+=item *

+

+Provide suger methods, such as insert(), update(), delete(), and select().

 =back

@@ -602,82 +588,83 @@ And have useful method such as insert(), update(), delete(), and select().

 =head2 C<user>

-Database user name.

-    

     $dbi  = $dbi->user('Ken');

     $user = $dbi->user;

+

+Database user name.

+This is used for connect().

 =head2 C<password>

-Database password.

-    

     $dbi      = $dbi->password('lkj&le`@s');

     $password = $dbi->password;

+Database password.

+This is used for connect().

+

 =head2 C<data_source>

-Database data source.

-    

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

     $data_source = $dbi->data_source;

-    

+

+Database data source.

+This is used for connect().

+

 =head2 C<dbh>

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

-    

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

     $dbh = $dbi->dbh;

-You can use all methods of L<DBI>

+Database handle. This is a L<DBI> object.

+You can call all methods of L<DBI>

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

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

+    $dbi->dbh->begin_work;

+    $dbi->dbh->commit;

+    $dbi->dbh->rollback;

 =head2 C<filters>

-Filters

-

     $dbi     = $dbi->filters({%filters});

     $filters = $dbi->filters;

-encode_utf8 and decode_utf8 is set to this attribute by default.

+Filter functions.

+By default, "encode_utf8" and "decode_utf8" is registered.

     $encode_utf8 = $dbi->filters->{encode_utf8};

     $decode_utf8 = $dbi->filters->{decode_utf8};

 =head2 C<default_query_filter>

-Default query filter.

-

     $dbi                  = $dbi->default_query_filter('encode_utf8');

     $default_query_filter = $dbi->default_query_filter

-=head2 C<default_fetch_filter>

+Default filter for value binding

-Fetching filter.

+=head2 C<default_fetch_filter>

     $dbi                  = $dbi->default_fetch_filter('decode_utf8');

     $default_fetch_filter = $dbi->default_fetch_filter;

-=head2 C<result_class>

+Default filter for fetching.

-Result class.

+=head2 C<result_class>

     $dbi          = $dbi->result_class('DBIx::Custom::Result');

     $result_class = $dbi->result_class;

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

+Result class for select statement.

+Default to L<DBIx::Custom::Result>

 =head2 C<sql_template>

-SQLTemplate instance. sql_template attribute must be 

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

-

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

     $sql_template = $dbi->sql_template;

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

-this attribute by default.

+SQLTemplate instance. sql_template attribute must be 

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

+Default to DBIx::Cutom::SQLTemplate object

 =head1 METHODS

@@ -686,36 +673,25 @@ You can use all methods of L<Object::Simple>

 =head2 C<connect>

-Connect to database.

-    

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

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

+Connect to database.

 "AutoCommit" and "RaiseError" option is true, 

-and "PrintError" option is false by dfault.

-

-=head2 C<disconnect>

-

-Disconnect database.

-

-    $dbi->disconnect;

-

-If database is already disconnected, this method do nothing.

+and "PrintError" option is false by default.

 =head2 C<insert>

-Insert row.

-

     $affected = $dbi->insert(table  => $table, 

                              param  => {%param},

                              append => $append,

                              filter => {%filter});

-Retruned value is affected rows count.

+Insert row.

+Retrun value is the count of affected rows.

-Example:

+B<Example:>

-    # insert

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

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

                  append => "some statement",

@@ -723,19 +699,17 @@ Example:

 =head2 C<update>

-Update rows.

-

     $affected = $dbi->update(table  => $table, 

                              param  => {%params},

                              where  => {%where},

                              append => $append,

                              filter => {%filter})

-Retruned value is affected rows count

+Update rows.

+Retrun value is the count of affected rows.

-Example:

+B<Example:>

-    #update

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

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

                  where  => {id => 5},

@@ -744,36 +718,32 @@ Example:

 =head2 C<update_all>

-Update all rows.

-

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

                                  param  => {%params},

                                  filter => {%filter},

                                  append => $append);

-Retruned value is affected rows count.

+Update all rows.

+Retrun value is the count of affected rows.

-Example:

+B<Example:>

-    # update_all

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

                      param  => {author => 'taro'},

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

 =head2 C<delete>

-Delete rows.

-

     $affected = $dbi->delete(table  => $table,

                              where  => {%where},

                              append => $append,

                              filter => {%filter});

-Retrun value is affected rows count

+Delete rows.

+Retrun value is the count of affected rows.

-Example:

+B<Example:>

-    # delete

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

                  where  => {id => 5},

                  append => 'some statement',

@@ -781,21 +751,17 @@ Example:

 =head2 C<delete_all>

-Delete all rows.

-

     $affected = $dbi->delete_all(table => $table);

-Retruned value is affected rows count.

+Delete all rows.

+Retrun value is the count of affected rows.

-Example:

+B<Example:>

-    # delete_all

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

 =head2 C<select>

-Select rows.

-

     $result = $dbi->select(table    => $table,

                            column   => [@column],

                            where    => {%where},

@@ -803,9 +769,10 @@ Select rows.

                            relation => {%relation},

                            filter   => {%filter});

+Select rows.

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

-Example:

+B<Example:>

     # select * from books;

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

@@ -861,6 +828,7 @@ See also L<DBIx::Custom::SQLTemplate> to know how to write SQL template.

 =head2 C<register_filter>

     $dbi->register_filter(%filters);

+    $dbi->register_filter(\%filters);

 Resister filter.

@@ -915,6 +883,14 @@ B<Example:>

         }

     );

+=head1 BUGS

+

+Please tell me bugs.

+

+C<< <kimoto.yuki at gmail.com> >>

+

+L<http://github.com/yuki-kimoto/DBIx-Custom>

+

 =head1 AUTHOR

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

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

 package DBIx::Custom::MySQL;

-use warnings;

 use strict;

+use warnings;

 use base 'DBIx::Custom';

@@ -36,16 +36,16 @@ sub last_insert_id { shift->dbh->{mysql_insertid} }

 =head1 NAME

-DBIx::Custom::MySQL - a MySQL implementation of DBIx::Custom

+DBIx::Custom::MySQL - Implementation for MySQL

 =head1 SYNOPSYS

-    # Connect

-    my $dbi = DBIx::Custom::MySQL->connect(user      => 'taro', 

+    # Connect to database

+    my $dbi = DBIx::Custom::MySQL->connect(user     => 'taro', 

                                            password => 'kliej&@K',

-                                           database  => 'your_database');

+                                           database => 'your_database');

-    # Last insert id

+    # Get last insert id

     my $id = $dbi->last_insert_id;

 =head1 ATTRIBUTES

@@ -55,29 +55,30 @@ You can use all attributes of L<DBIx::Custom>

 =head2 C<database>

-Database name

-

     $dbi      = $dbi->database('your_database');

     $database = $dbi->database;

-=head2 C<host>

+Database name.

+This is used for connect().

-Database host name.

+=head2 C<host>

     $dbi  = $dbi->host('somehost.com');

     $host = $dbi->host;

-IP address can be set to host attribute.

+Database host name.

+You can also set IP address, instead of host name.

+This is used for connect().

     $dbi->host('127.03.45.12');

 =head2 C<port>

-Database port.

-

     $dbi  = $dbi->port(1198);

     $port = $dbi->port;

+Database port. This is used for connect().

+

 =head1 METHODS

 This class is L<DBIx::Custom> subclass.

@@ -85,20 +86,24 @@ You can use all methods of L<DBIx::Custom>.

 =head2 C<connect (overridden)>

-Connect to database.

+    $dbi = DBIx::Custom::MySQL->connect(

+        data_source => "dbi:mysql:database=books;host=somehost;port=2000"

+    );

+    

+    $dbi = DBIx::Custom::MySQL->connect(user     => 'taro', 

+                                        password => 'kliej&@K',

+                                        database => 'your_database',

+                                        host     => 'somehost',

+                                        port     => 2000);

-    # Connect

-    my $dbi = DBIx::Custom::MySQL->connect(user      => 'taro', 

-                                           password => 'kliej&@K',

-                                           database  => 'your_database');

+Connect to database. You can also specify database, host, and port

+(instead of data soruce).

 =head2 C<last_insert_id>

-Last insert ID.

-

     $last_insert_id = $dbi->last_insert_id;

+Get last insert id.

 This is equal to MySQL last_insert_id() function.

-    

 =cut

@@ -11,50 +11,49 @@ __PACKAGE__->attr([qw/sql columns default_filter filter sth/]);

 =head1 NAME

-DBIx::Custom::Query - query used by DBIx::Custom

+DBIx::Custom::Query - Query

 =head1 SYNOPSIS

-    # New

     my $query = DBIx::Custom::Query->new;

 =head1 ATTRIBUTES

 =head2 C<sql>

-SQL statement.

-

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

     $sql   = $query->sql;

-=head2 C<columns>

+SQL statement.

-Column names.

+=head2 C<columns>

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

     $columns = $query->columns;

-=head2 C<default_filter>

+Column names.

-Default filter.

+=head2 C<default_filter>

     $query          = $query->default_filter($filter);

     $default_filter = $query->default_filter;

-=head2 C<filter>

+Default filter for value binding.

-Filter.

+=head2 C<filter>

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

     $filter = $query->filter;

-=head2 C<sth>

+Filters for value binding

-Statement handle.

+=head2 C<sth>

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

     $sth   = $query->sth;

+Statement handle.

+

 =head1 METHODS

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

@@ -166,7 +166,7 @@ sub fetch_hash_all {

 =head1 NAME

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

+DBIx::Custom::Result - Manipulate the result of select statement

 =head1 SYNOPSIS

@@ -215,25 +215,25 @@ DBIx::Custom::Result - DBIx::Custom Resultset

 =head2 C<sth>

-Statement handle.

-

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

     $sth    = $reuslt->sth

-    

-=head2 C<default_filter>

-Default filter.

+Statement handle.

+

+=head2 C<default_filter>

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

     $default_filter = $result->default_filter;

-=head2 C<filter>

+Default filter for fetching.

-Filter

+=head2 C<filter>

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

     $filter = $result->filter;

+Filters for fetching.

+

 =head1 METHODS

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

@@ -241,11 +241,9 @@ You can use all methods of L<Object::Simple>

 =head2 C<fetch>

-Fetch a row into array

-

     $row = $result->fetch;

-Example:

+Fetch a row into array

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

         # do something

@@ -255,17 +253,15 @@ Example:

 =head2 C<fetch_first>

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

-

     $row = $result->fetch_first;

-=head2 C<fetch_multi>

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

-Fetch multiple rows into array of array.

+=head2 C<fetch_multi>

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

-Example:

+Fetch multiple rows into array of array.

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

         # do someting

@@ -273,17 +269,15 @@ Example:

 =head2 C<fetch_all>

-Fetch all rows into array of array.

-

     $rows = $result->fetch_all;

-=head2 C<fetch_hash>

+Fetch all rows into array of array.

-Fetch a row into hash

+=head2 C<fetch_hash>

     $row = $result->fetch_hash;

-Example:

+Fetch a row into hash

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

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

@@ -294,17 +288,15 @@ Example:

 =head2 C<fetch_hash_first>

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

-

     $row = $result->fetch_hash_first;

-=head2 C<fetch_hash_multi>

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

-Fetch multiple rows into array of hash

+=head2 C<fetch_hash_multi>

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

-Example:

+Fetch multiple rows into array of hash

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

         # do someting

@@ -312,8 +304,8 @@ Example:

 =head2 C<fetch_hash_all>

-Fetch all rows into array of hash.

-

     $rows = $result->fetch_hash_all;

+Fetch all rows into array of hash.

+

 =cut

@@ -209,7 +209,7 @@ sub _placeholder_count {

 =head1 NAME

-DBIx::Custom::SQLTemplate - DBIx::Custom SQL Template

+DBIx::Custom::SQLTemplate - SQL template system

 =head1 SYNOPSIS

@@ -121,11 +121,11 @@ DBIx::Custom::SQLTemplate::TagProcessor - Tag processor

 =head1 FUNCTIONS

-=head2 expand_basic_tag

+=head2 C<expand_basic_tag>

-=head2 expand_in_tag

+=head2 C<expand_in_tag>

-=head2 expand_insert_tag

+=head2 C<expand_insert_tag>

-=head2 expand_update_tag

+=head2 C<expand_update_tag>

@@ -24,7 +24,7 @@ sub connect {

 }

 sub connect_memory {

-    my $self = shift;

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

     # Data source for memory database

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

@@ -41,21 +41,19 @@ sub last_insert_rowid { shift->dbh->func('last_insert_rowid') }

 =head1 NAME

-DBIx::Custom::SQLite - a SQLite implementation of DBIx::Custom

+DBIx::Custom::SQLite - Implementation for SQLite

 =head1 SYNOPSYS

     use DBIx::Custom::SQLite;

-    # Connect

-    my $dbi = DBIx::Custom::SQLite->connect(user      => 'taro', 

-                                            password => 'kl&@K',

-                                            database  => 'your_database');

+    # Connect to database

+    my $dbi = DBIx::Custom::SQLite->connect(database  => 'dbname');

-    # Connect memory database

+    # Connect to memory database

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

-    # Last insert row ID

+    # Get last insert row id

     my $id = $dbi->last_insert_rowid;

 =head1 ATTRIBUTES

@@ -65,36 +63,39 @@ You can use all attributes of L<DBIx::Custom>.

 =head2 C<database>

-Database name

-

     $dbi      = $dbi->database('your_database');

     $database = $dbi->database;

+Database name.

+This is used for connect().

+

 =head1 METHODS

 This class is L<DBIx::Custom> subclass.

 You can use all methods of L<DBIx::Custom>.

 =head2 C<connect (overridden)>

+    

+    $dbi = DBIx::Custom::SQLite->connect(

+        data_source  => "dbi:SQLite:dbname=your_db"

+    );

+    

+    $dbi = DBIx::Custom::SQLite->connect(database  => 'your_db');

 Connect to database.

-

-    $dbi->connect;

-

-If you set database, host, or port, data source is automatically created.

+You can also specify database name, instead of data source.

 =head2 C<connect_memory>

-Connect memory database.

-

     $dbi->connect_memory;

-=head2 C<last_insert_rowid>

+Connect to memory database.

-Last insert row ID.

+=head2 C<last_insert_rowid>

     $last_insert_rowid = $dbi->last_insert_rowid;

-    

+

+Get last insert row id.

 This is equal to SQLite last_insert_rowid() function.

 =cut

@@ -62,11 +62,6 @@ my $update_query;

 my $ret_val;

-test 'disconnect';

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

-$dbi->disconnect;

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

-

 # Prepare table

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

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

@@ -35,7 +35,7 @@ my $db_file;

 my $id;

 test 'connect_memory';

-$dbi = DBIx::Custom::SQLite->connect(database => ':memory:');

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

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

 ok(defined $ret_val, $test);

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

@@ -50,15 +50,14 @@ $dbi->connect;

 ok(-f $db_file, "$test : database file");

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

 ok(defined $ret_val, "$test : database");

-$dbi->disconnect;

+$dbi->dbh->disconnect;

 unlink $db_file if -f $db_file;

 test 'last_insert_rowid';

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

-$dbi->connect_memory;

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

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

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

 is($dbi->last_insert_rowid, 1, "$test: first");

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

 is($dbi->last_insert_rowid, 2, "$test: second");

-$dbi->disconnect;

+$dbi->dbh->disconnect;