version 0.0901 ・ 4cf6ceb ・ Gitprep

- version 0.0901;
- Browse files
- yuki-kimoto commited on 2009-12-17
- 1 parent 70b2b7c
  
  commit 4cf6ceb2b44549226e5f9c51d5b35111c19d45a0

Showing 22 changed files with 558 additions and 609 deletions

Changes

...	...	@@ -1,3 +1,10 @@
	1	+0.0901
	2	+ DBIx::Basic filter 'encode_utf8' utf8::upgrade process is deleted
	3	+0.0801
	4	+ add 'create_table', 'drop_table' methods
	5	+0.0701
	6	+ rename sql_template to sql_tmpl (not backword compatible)
	7	+ rename dbi_options to options (not backword compatible)
1	8	0.0605
2	9	fix encode_utf8 filter
3	10	0.0604

+315 -307

lib/DBIx/Custom.pm

View

@@ -3,7 +3,7 @@ use 5.008001;
 package DBIx::Custom;
 use Object::Simple;
 
-our $VERSION = '0.0605';
+our $VERSION = '0.0901';
 
 use Carp 'croak';
 use DBI;
@@ -15,17 +15,28 @@ use DBIx::Custom::SQL::Template;
 sub user        : ClassObjectAttr { initialize => {clone => 'scalar'} }
 sub password    : ClassObjectAttr { initialize => {clone => 'scalar'} }
 sub data_source : ClassObjectAttr { initialize => {clone => 'scalar'} }
-sub dbi_options : ClassObjectAttr { initialize => {clone => 'hash', 
-                                                   default => sub { {} } } }
-sub database    : ClassObjectAttr { initialize => {clone => 'scalar'} }
-sub host        : ClassObjectAttr { initialize => {clone => 'scalar'} }
-sub port        : ClassObjectAttr { initialize => {clone => 'scalar'} }
+
+sub options : ClassObjectAttr {
+    type       => 'hash',
+    initialize => {clone => 'hash', default => sub { {} }}
+}
+
+sub database     : ClassObjectAttr { initialize => {clone => 'scalar'} }
+sub host         : ClassObjectAttr { initialize => {clone => 'scalar'} }
+sub port         : ClassObjectAttr { initialize => {clone => 'scalar'} }
 
 sub bind_filter  : ClassObjectAttr { initialize => {clone => 'scalar'} }
 sub fetch_filter : ClassObjectAttr { initialize => {clone => 'scalar'} }
 
-sub no_bind_filters   : ClassObjectAttr { initialize => {clone => 'array'} }
-sub no_fetch_filters  : ClassObjectAttr { initialize => {clone => 'array'} }
+sub no_bind_filters : ClassObjectAttr {
+    type       => 'array',
+    initialize => {clone => 'array', default => sub { [] }}
+}
+
+sub no_fetch_filters : ClassObjectAttr {
+    type => 'array',
+    initialize => {clone => 'array', default => sub { [] }}
+}
 
 sub filters : ClassObjectAttr {
     type => 'hash',
@@ -52,7 +63,7 @@ sub result_class : ClassObjectAttr {
     }
 }
 
-sub sql_template : ClassObjectAttr {
+sub sql_tmpl : ClassObjectAttr {
     initialize => {
         clone   => sub {$_[0] ? $_[0]->clone : undef},
         default => sub {DBIx::Custom::SQL::Template->new}
@@ -64,7 +75,6 @@ sub dbh : Attr {}
 
 ### Methods
 
-# Add filter
 sub add_filter {
     my $invocant = shift;
     
@@ -74,7 +84,6 @@ sub add_filter {
     return $invocant;
 }
 
-# Add format
 sub add_format{
     my $invocant = shift;
     
@@ -84,7 +93,6 @@ sub add_format{
     return $invocant;
 }
 
-# Auto commit
 sub _auto_commit {
     my $self = shift;
     
@@ -97,13 +105,12 @@ sub _auto_commit {
     return $self->dbh->{AutoCommit};
 }
 
-# Connect
 sub connect {
     my $self = shift;
     my $data_source = $self->data_source;
     my $user        = $self->user;
     my $password    = $self->password;
-    my $dbi_options  = $self->dbi_options;
+    my $options     = $self->options;
     
     my $dbh = eval{DBI->connect(
         $data_source,
@@ -113,7 +120,7 @@ sub connect {
             RaiseError => 1,
             PrintError => 0,
             AutoCommit => 1,
-            %{$dbi_options || {} }
+            %{$options || {} }
         }
     )};
     
@@ -123,19 +130,16 @@ sub connect {
     return $self;
 }
 
-# DESTROY
 sub DESTROY {
     my $self = shift;
     $self->disconnect if $self->connected;
 }
 
-# Is connected?
 sub connected {
     my $self = shift;
     return ref $self->{dbh} eq 'DBI::db';
 }
 
-# Disconnect
 sub disconnect {
     my $self = shift;
     if ($self->connected) {
@@ -144,14 +148,12 @@ sub disconnect {
     }
 }
 
-# Reconnect
 sub reconnect {
     my $self = shift;
     $self->disconnect if $self->connected;
     $self->connect;
 }
 
-# Prepare statement handle
 sub prepare {
     my ($self, $sql) = @_;
     
@@ -167,7 +169,6 @@ sub prepare {
     return $sth;
 }
 
-# Execute SQL directly
 sub do{
     my ($self, $sql, @bind_values) = @_;
     
@@ -175,7 +176,7 @@ sub do{
     $self->connect unless $self->connected;
     
     # Do
-    my $ret_val = eval{$self->dbh->do($sql, @bind_values)};
+    my $affected = eval{$self->dbh->do($sql, @bind_values)};
     
     # Error
     if ($@) {
@@ -187,15 +188,16 @@ sub do{
         
         croak("$error<Your SQL>\n$sql\n<Your bind values>\n$bind_value_dump\n");
     }
+    
+    return $affected;
 }
 
-# Create query
 sub create_query {
     my ($self, $template) = @_;
     my $class = ref $self;
     
     # Create query from SQL template
-    my $sql_template = $self->sql_template;
+    my $sql_tmpl = $self->sql_tmpl;
     
     # Try to get cached query
     my $cached_query = $class->_query_caches->{$template};
@@ -207,7 +209,7 @@ sub create_query {
                             key_infos => $cached_query->key_infos);
     }
     else {
-        $query = eval{$sql_template->create_query($template)};
+        $query = eval{$sql_tmpl->create_query($template)};
         croak($@) if $@;
         
         $class->_add_query_cache($template, $query);
@@ -237,8 +239,7 @@ sub create_query {
     return $query;
 }
 
-# Execute query
-sub execute {
+sub query{
     my ($self, $query, $params)  = @_;
     $params ||= {};
     
@@ -254,8 +255,8 @@ sub execute {
     my $bind_values = $self->_build_bind_values($query, $params);
     
     # Execute
-    my $sth = $query->sth;
-    my $ret_val = eval{$sth->execute(@$bind_values)};
+    my $sth      = $query->sth;
+    my $affected = eval{$sth->execute(@$bind_values)};
     
     # Execute error
     if (my $execute_error = $@) {
@@ -284,10 +285,9 @@ sub execute {
         });
         return $result;
     }
-    return $ret_val;
+    return $affected;
 }
 
-# Build binding values
 sub _build_bind_values {
     my ($self, $query, $params) = @_;
     my $key_infos           = $query->key_infos;
@@ -398,7 +398,6 @@ sub _build_bind_values {
     return \@bind_values;
 }
 
-# Run transaction
 sub run_transaction {
     my ($self, $transaction) = @_;
     
@@ -449,14 +448,42 @@ sub run_transaction {
     }
 }
 
-# Get last insert id
 sub last_insert_id {
     my $self = shift;
     my $class = ref $self;
     croak "'$class' do not suppert 'last_insert_id'";
 }
 
-# Insert
+
+sub create_table {
+    my ($self, $table, @column_definitions) = @_;
+    
+    # Create table
+    my $sql = "create table $table (\n";
+    
+    # Column definitions
+    foreach my $column_definition (@column_definitions) {
+        $sql .= "\t$column_definition,\n";
+    }
+    $sql =~ s/,\n$//;
+    
+    # End
+    $sql .= "\n);";
+    
+    # Do query
+    return $self->do($sql);
+}
+
+sub drop_table {
+    my ($self, $table) = @_;
+    
+    # Drop table
+    my $sql = "drop table $table;";
+
+    # Do query
+    return $self->do($sql);
+}
+
 sub insert {
     my $self             = shift;
     my $table            = shift || '';
@@ -485,12 +512,11 @@ sub insert {
     $query_edit_cb->($query) if $query_edit_cb;
     
     # Execute query
-    my $ret_val = $self->execute($query, $insert_params);
+    my $ret_val = $self->query($query, $insert_params);
     
     return $ret_val;
 }
 
-# Update
 sub update {
     my $self             = shift;
     my $table            = shift || '';
@@ -545,12 +571,11 @@ sub update {
     my $params = {'#update' => $update_params, %$where_params};
     
     # Execute query
-    my $ret_val = $self->execute($query, $params);
+    my $ret_val = $self->query($query, $params);
     
     return $ret_val;
 }
 
-# Update all rows
 sub update_all {
     my $self             = shift;
     my $table            = shift || '';
@@ -563,7 +588,6 @@ sub update_all {
                          $query_edit_cb, $options);
 }
 
-# Delete
 sub delete {
     my $self             = shift;
     my $table            = shift || '';
@@ -604,12 +628,11 @@ sub delete {
     $query_edit_cb->($query) if $query_edit_cb;
     
     # Execute query
-    my $ret_val = $self->execute($query, $where_params);
+    my $ret_val = $self->query($query, $where_params);
     
     return $ret_val;
 }
 
-# Delete all rows
 sub delete_all {
     my $self             = shift;
     my $table            = shift || '';
@@ -626,10 +649,10 @@ Your select arguments is wrong.
 select usage:
 $dbi->select(
     $table,                # must be string or array ref
-    [@$columns],           # must be array reference. this is optional
-    {%$where_params},      # must be hash reference.  this is optional
-    $append_statement,     # must be string.          this is optional
-    $query_edit_callback   # must be code reference.  this is optional
+    [@$columns],           # must be array reference. this can be ommited
+    {%$where_params},      # must be hash reference.  this can be ommited
+    $append_statement,     # must be string.          this can be ommited
+    $query_edit_callback   # must be code reference.  this can be ommited
 );
 EOS
 
@@ -704,7 +727,7 @@ sub select {
     $query_edit_cb->($query) if $query_edit_cb;
     
     # Execute query
-    my $result = $self->execute($query, $where_params);
+    my $result = $self->query($query, $where_params);
     
     return $result;
 }
@@ -717,7 +740,6 @@ sub _query_cache_keys : ClassAttr { type => 'array',
                                     
 sub query_cache_max   : ClassAttr { auto_build => sub {shift->query_cache_max(50)} }
 
-# Add query cahce
 sub _add_query_cache {
     my ($class, $template, $query) = @_;
     my $query_cache_keys = $class->_query_cache_keys;
@@ -738,7 +760,6 @@ sub _add_query_cache {
     return $class;
 }
 
-# Both bind_filter and fetch_filter off
 sub filter_off {
     my $self = shift;
     
@@ -753,27 +774,40 @@ Object::Simple->build_class;
 
 =head1 NAME
 
-DBIx::Custom - Customizable simple DBI
-
-=head1 Version
-
-Version 0.0601
-
-=head1 Caution
+DBIx::Custom - Customizable DBI
 
-This module is now experimental stage.
+=head1 VERSION
 
-I want you to try this module
-because I want this module stable, and not to damage your DB data by this module bug.
+Version 0.0801
 
-Please tell me bug if you find
-
-=head1 Synopsys
-
-  my $dbi = DBIx::Custom->new;
-  
-  my $query = $dbi->create_query($template);
-  $dbi->execute($query);
+=head1 SYNOPSYS
+    
+    # New
+    my $dbi = DBIx::Custom->new(data_source => "dbi:mysql:database=books"
+                                user => 'ken', password => '!LFKD%$&');
+    
+    # Query
+    $dbi->query("select title from books");
+    
+    # Query with parameters
+    $dbi->query("select id from books where {= author} && {like title}",
+                {author => 'ken', title => '%Perl%'});
+    
+    # Insert 
+    $dbi->insert('books', {title => 'perl', author => 'Ken'});
+    
+    # Update 
+    $dbi->update('books', {title => 'aaa', author => 'Ken'}, {id => 5});
+    
+    # Delete
+    $dbi->delete('books', {author => 'Ken'});
+    
+    # Select
+    $dbi->select('books');
+    $dbi->select('books', {author => 'taro'}); 
+    $dbi->select('books', [qw/author title/], {author => 'Ken'});
+    $dbi->select('books', [qw/author title/], {author => 'Ken'},
+                 'order by id limit 1');
 
 =head1 Accessors
 
@@ -781,172 +815,99 @@ Please tell me bug if you find
 
 Set and get database user name
     
-    # For object
-    $self  = $self->user($user);
-    $user  = $self->user;
-    
-    # For class
-    $class = $class->user($user);
-    $user  = $class->user;
-    
-    # Sample
-    $dbi->user('taro');
+    $dbi  = $dbi->user('Ken');
+    $user = $dbi->user;
     
 =head2 password
 
 Set and get database password
     
-    # For object
-    $self     = $self->password($password);
-    $password = $self->password;
-
-    # For class
-    $class    = $class->password($password);
-    $password = $class->password;
-    
-    # Sample
-    $dbi->password('lkj&le`@s');
+    $dbi      = $dbi->password('lkj&le`@s');
+    $password = $dbi->password;
 
 =head2 data_source
 
 Set and get database data source
     
-    # For object
-    $self        = $self->data_source($data_soruce);
-    $data_source = $self->data_source;
-    
-    # For class
-    $class       = $class->data_source($data_soruce);
-    $data_source = $class->data_source;
-    
-    # Sample(SQLite)
-    $dbi->data_source(dbi:SQLite:dbname=$database);
-    
-    # Sample(MySQL);
-    $dbi->data_source("dbi:mysql:dbname=$database");
-    
-    # Sample(PostgreSQL)
-    $dbi->data_source("dbi:Pg:dbname=$database");
+    $dbi         = $dbi->data_source("dbi:mysql:dbname=$database");
+    $data_source = $dbi->data_source;
     
+If you know data source more, See also L<DBI>.
+
 =head2 database
 
 Set and get database name
 
-    # For object
-    $self     = $self->database($database);
-    $database = $self->database;
-
-    # For class
-    $class    = $class->database($database);
-    $database = $class->database;
-    
-    # Sample
-    $dbi->database('books');
+    $dbi      = $dbi->database('books');
+    $database = $dbi->database;
 
 =head2 host
 
 Set and get host name
 
-    # For object
-    $self = $self->host($host);
-    $host = $self->host;
+    $dbi  = $dbi->host('somehost.com');
+    $host = $dbi->host;
 
-    # For class
-    $class = $class->host($host);
-    $host  = $class->host;
-    
-    # Sample
-    $dbi->host('somehost.com');
-    $dbi->host('127.1.2.3');
+You can also set IP address like '127.03.45.12'.
 
 =head2 port
 
 Set and get port
 
-    # For object
-    $self = $self->port($port);
-    $port = $self->port;
+    $dbi  = $dbi->port(1198);
+    $port = $dbi->port;
 
-    # For class
-    $class = $class->port($port);
-    $port = $class->port;
-    
-    # Sample
-    $dbi->port(1198);
-
-=head2 dbi_options
+=head2 options
 
 Set and get DBI option
 
-    # For object
-    $self        = $self->dbi_options({$options => $value, ...});
-    $dbi_options = $self->dbi_options;
-    
-    # For class
-    $class       = $class->dbi_options({$options => $value, ...});
-    $dbi_options = $class->dbi_options;
-    
-    # Sample
-    $dbi->dbi_options({PrintError => 0, RaiseError => 1});
+    $dbi     = $dbi->options({PrintError => 0, RaiseError => 1});
+    $options = $dbi->options;
 
-=head2 sql_template
+=head2 sql_tmpl
 
 Set and get SQL::Template object
 
-    # For object
-    $self         = $self->sql_template($sql_template);
-    $sql_template = $self->sql_template;
+    $dbi      = $dbi->sql_tmpl(DBIx::Cutom::SQL::Template->new);
+    $sql_tmpl = $dbi->sql_tmpl;
 
-    # For class
-    $class        = $class->sql_template($sql_template);
-    $sql_template = $class->sql_template;
-
-    # Sample
-    $dbi->sql_template(DBI::Cutom::SQL::Template->new);
+See also L<DBIx::Custom::SQL::Template>.
 
 =head2 filters
 
 Set and get filters
 
-    # For object
-    $self    = $self->filters($filters);
-    $filters = $self->filters;
-
-    # For class
-    $class   = $class->filters($filters);
-    $filters = $class->filters;
+    $dbi     = $dbi->filters({filter1 => sub { }, filter2 => sub {}});
+    $filters = $dbi->filters;
     
-    # Sample
-    $ret = $dbi->filters->{encode_utf8}->($value);
+This method is generally used to get a filter.
+
+    $filter = $dbi->filters->{encode_utf8};
+
+If you add filter, use add_filter method.
 
 =head2 formats
 
 Set and get formats
 
-    # For object
-    $self    = $self->formats($formats);
-    $formats = $self->formats;
+    $dbi     = $dbi->formats({format1 => sub { }, format2 => sub {}});
+    $formats = $dbi->formats;
 
-    # For class
-    $self    = $self->formats($formats);
-    $formats = $self->formats;
+This method is generally used to get a format.
 
-    # Sample
-    $datetime_format = $dbi->formats->{datetime};
+    $filter = $dbi->formats->{datetime};
+
+If you add format, use add_format method.
 
 =head2 bind_filter
 
 Set and get binding filter
 
-    # For object
-    $self        = $self->bind_filter($bind_filter);
-    $bind_filter = $self->bind_filter
+    $dbi         = $dbi->bind_filter($bind_filter);
+    $bind_filter = $dbi->bind_filter
 
-    # For object
-    $class       = $class->bind_filter($bind_filter);
-    $bind_filter = $class->bind_filter
+The following is bind filter sample
 
-    # Sample
     $dbi->bind_filter(sub {
         my ($value, $key, $dbi, $infos) = @_;
         
@@ -955,19 +916,22 @@ Set and get binding filter
         return $value;
     });
 
+Bind filter arguemts is
+
+    1. $value : Value
+    2. $key   : Key
+    3. $dbi   : DBIx::Custom object
+    4. $infos : {table => $table, column => $column}
+
 =head2 fetch_filter
 
 Set and get Fetch filter
 
-    # For object
-    $self         = $self->fetch_filter($fetch_filter);
-    $fetch_filter = $self->fetch_filter;
+    $dbi          = $dbi->fetch_filter($fetch_filter);
+    $fetch_filter = $dbi->fetch_filter;
 
-    # For class
-    $class        = $class->fetch_filter($fetch_filter);
-    $fetch_filter = $class->fetch_filter;
+The following is fetch filter sample
 
-    # Sample
     $dbi->fetch_filter(sub {
         my ($value, $key, $dbi, $infos) = @_;
         
@@ -976,74 +940,73 @@ Set and get Fetch filter
         return $value;
     });
 
+Bind filter arguemts is
+
+    1. $value : Value
+    2. $key   : Key
+    3. $dbi   : DBIx::Custom object
+    4. $infos : {type => $table, sth => $sth, index => $index}
+
 =head2 no_bind_filters
 
 Set and get no filter keys when binding
     
-    # For object
-    $self            = $self->no_bind_filters($no_bind_filters);
-    $no_bind_filters = $self->no_bind_filters;
-
-    # For class
-    $class           = $class->no_bind_filters($no_bind_filters);
-    $no_bind_filters = $class->no_bind_filters;
-
-    # Sample
-    $dbi->no_bind_filters(qw/title author/);
+    $dbi             = $dbi->no_bind_filters(qw/title author/);
+    $no_bind_filters = $dbi->no_bind_filters;
 
 =head2 no_fetch_filters
 
 Set and get no filter keys when fetching
 
-    # For object
-    $self             = $self->no_fetch_filters($no_fetch_filters);
-    $no_fetch_filters = $self->no_fetch_filters;
-
-    # For class
-    $class            = $class->no_fetch_filters($no_fetch_filters);
-    $no_fetch_filters = $class->no_fetch_filters;
-
-    # Sample
-    $dbi->no_fetch_filters(qw/title author/);
+    $dbi              = $dbi->no_fetch_filters(qw/title author/);
+    $no_fetch_filters = $dbi->no_fetch_filters;
 
 =head2 result_class
 
 Set and get resultset class
 
-    # For object
-    $self         = $dbi->result_class($result_class);
+    $dbi          = $dbi->result_class('DBIx::Custom::Result');
     $result_class = $dbi->result_class;
-    
-    # For class
-    $class        = $class->result_class($result_class);
-    $result_class = $class->result_class;
-    
-    # Sample
-    $dbi->result_class('DBIx::Custom::Result');
 
 =head2 dbh
 
 Get database handle
     
-    $self = $self->dbh($dbh);
-    $dbh  = $self->dbh;
-    
-    # Sample
-    $table_info = $dbi->dbh->table_info
+    $dbi = $dbi->dbh($dbh);
+    $dbh = $dbi->dbh;
     
 =head2 query_cache_max
 
 Set and get query cache max
 
-    $class           = $class->query_cache_max($query_cache_max);
-    $query_cache_max = $class->query_cache_max;
-    
-    # Sample
-    DBIx::Custom->query_cache_max(50);
+    $class           = DBIx::Custom->query_cache_max(50);
+    $query_cache_max = DBIx::Custom->query_cache_max;
+
+Default value is 50
+
+=head2 Accessor summary
+
+                       Accessor type       Variable type
+    user               class and object    scalar(string)
+    password           class and object    scalar(string)
+    data_source        class and object    scalar(string)
+    database           class and object    scalar(string)
+    host               class and object    scalar(string)
+
+    port               class and object    scalar(int)
+    options            class and object    hash(string)
+    sql_tmpl           class and object    scalar(DBIx::Custom::SQL::Template)
+    filters            class and object    hash(code ref)
+    formats            class and object    hash(string)
 
-DBIx::Custom cache queries for performance.
+    bind_filter        class and object    scalar(code ref)
+    fetch_filter       class and object    scalar(code ref)
+    no_bind_filters    class and object    array(string)
+    no_fetch_filters   class and object    array(string)
+    result_class       class and object    scalar(string)
 
-Default is 50
+    dbh                object              scalar(DBI)
+    query_cache_max    class               scalar(int)
 
 =head1 Methods
 
@@ -1051,52 +1014,35 @@ Default is 50
 
 Connect to database
 
-    $self = $dbi->connect;
-    
-    # Sample
-    $dbi = DBIx::Custom->new(user => 'taro', password => 'lji8(', 
-                            data_soruce => "dbi:mysql:dbname=$database");
     $dbi->connect;
 
 =head2 disconnect
 
 Disconnect database
 
-    $self = $dbi->disconnect;
-    
-    # Sample
     $dbi->disconnect;
 
-If database is already disconnected, this method do noting.
+If database is already disconnected, this method do nothing.
 
 =head2 reconnect
 
 Reconnect to database
 
-    $self = $dbi->reconnect;
-    
-    # Sample
     $dbi->reconnect;
 
 =head2 connected
 
-Check connected
+Check if database is connected.
     
-    $is_connected = $self->connected;
-    
-    # Sample
-    if ($dbi->connected) { # do something }
+    $is_connected = $dbi->connected;
     
 =head2 filter_off
 
 bind_filter and fitch_filter off
     
-    $self = $self->filter_off
-    
-    # Sample
-    $dbi->filter_off;
+    $dbi->filter_off
     
-This is equeal to
+This method is equeal to
     
     $dbi->bind_filter(undef);
     $dbi->fetch_filter(undef);
@@ -1105,11 +1051,10 @@ This is equeal to
 
 Resist filter
     
-    $self = $self->add_filter({$name => $filter, ...});
-    # or
-    $self = $self->add_filter($name => $filter, ...);
+    $dbi->add_filter($fname1 => $filter1, $fname => $filter2);
     
-    # Sample (For example DBIx::Custom::Basic)
+The following is add_filter sample
+
     $dbi->add_filter(
         encode_utf8 => sub {
             my ($value, $key, $dbi, $infos) = @_;
@@ -1124,52 +1069,34 @@ Resist filter
 
 =head2 add_format
 
-Resist format
+Add format
 
-    $self = $self->add_format({$name => $format, ...});
-    # or
-    $self = $self->add_format($name => $format, ...);
+    $dbi->add_format($fname1 => $format, $fname2 => $format2);
     
-    # Sample
-    $dbi->add_format(date => '%Y:%m:%d', datetime => '%Y-%m-%d %H:%M:%S');
-
-=head2 prepare
+The following is add_format sample.
 
-Prepare statement handle
+    $dbi->add_format(date => '%Y:%m:%d', datetime => '%Y-%m-%d %H:%M:%S');
 
-    $sth = $self->prepare($sql);
+=head2 create_query
     
-    # Sample
-    $sth = $dbi->prepare('select * from books;');
+Create Query object parsing SQL template
 
-This method is same as DBI prepare method.
+    my $query = $dbi->create_query("select * from authors where {= name} and {= age}");
 
-=head2 do
+$query is <DBIx::Query> object. This is executed by query method as the following
 
-Execute SQL
+    $dbi->query($query, $params);
 
-    $ret_val = $self->do($sql, @bind_values);
-    
-    # Sample
-    $ret_val = $dbi->do('insert into books (title, author) values (?, ?)',
-                        'Perl', 'taro');
+If you know SQL template, see also L<DBIx::Custom::SQL::Template>.
 
-This method is same as DBI do method.
+=head2 query
 
-=head2 create_query
-    
-Create Query object from SQL template
+Query
 
-    my $query = $dbi->create_query($template);
-    
-=head2 execute
+    $result = $dbi->query($template, $params);
 
-Parse SQL template and execute SQL
+The following is query sample
 
-    $result = $dbi->query($query, $params);
-    $result = $dbi->query($template, $params); # Shortcut
-    
-    # Sample
     $result = $dbi->query("select * from authors where {= name} and {= age}", 
                           {author => 'taro', age => 19});
     
@@ -1177,7 +1104,11 @@ Parse SQL template and execute SQL
         # do something
     }
 
-See also L<DBIx::Custom::SQL::Template>
+If you now syntax of template, See also L<DBIx::Custom::SQL::Template>
+
+Return value of query method is L<DBIx::Custom::Result> object
+
+See also L<DBIx::Custom::Result>.
 
 =head2 run_transaction
 
@@ -1192,74 +1123,113 @@ Run transaction
 If transaction is success, commit is execute. 
 If tranzation is died, rollback is execute.
 
+=head2 create_table
+
+Create table
+
+    $dbi->create_table(
+        'books',
+        'name char(255)',
+        'age  int'
+    );
+
+First argument is table name. Rest arguments is column definition.
+
+=head2 drop_table
+
+Drop table
+
+    $dbi->drop_table('books');
+
 =head2 insert
 
 Insert row
 
-    $ret_val = $self->insert($table, \%$insert_params);
+    $affected = $dbi->insert($table, \%$insert_params);
+    $affected = $dbi->insert($table, \%$insert_params, $append);
 
-$ret_val is maybe affected rows count
+Retrun value is affected rows count
     
-    # Sample
+The following is insert sample.
+
     $dbi->insert('books', {title => 'Perl', author => 'Taro'});
 
+You can add statement.
+
+    $dbi->insert('books', {title => 'Perl', author => 'Taro'}, "some statement");
+
 =head2 update
 
 Update rows
 
-    $self = $self->update($table, \%update_params, \%where);
+    $affected = $dbi->update($table, \%update_params, \%where);
+    $affected = $dbi->update($table, \%update_params, \%where, $append);
+
+Retrun value is affected rows count
 
-$ret_val is maybe affected rows count
+The following is update sample.
 
-    # Sample
     $dbi->update('books', {title => 'Perl', author => 'Taro'}, {id => 5});
 
+You can add statement.
+
+    $dbi->update('books', {title => 'Perl', author => 'Taro'},
+                 {id => 5}, "some statement");
+
 =head2 update_all
 
 Update all rows
 
-    $ret_val = $self->update_all($table, \%updat_params);
+    $affected = $dbi->update_all($table, \%updat_params);
 
-$ret_val is maybe affected rows count
+Retrun value is affected rows count
+
+The following is update_all sample.
 
-    # Sample
     $dbi->update_all('books', {author => 'taro'});
 
 =head2 delete
 
 Delete rows
 
-    $ret_val = $self->delete($table, \%where);
+    $affected = $dbi->delete($table, \%where);
+    $affected = $dbi->delete($table, \%where, $append);
 
-$ret_val is maybe affected rows count
+Retrun value is affected rows count
     
-    # Sample
+The following is delete sample.
+
     $dbi->delete('books', {id => 5});
 
+You can add statement.
+
+    $dbi->delete('books', {id => 5}, "some statement");
+
 =head2 delete_all
 
 Delete all rows
 
-    $ret_val = $self->delete_all($table);
+    $affected = $dbi->delete_all($table);
 
-$ret_val is maybe affected rows count
+Retrun value is affected rows count
 
-    # Sample
-    $dib->delete_all('books');
+The following is delete_all sample.
+
+    $dbi->delete_all('books');
 
 =head2 select
     
 Select rows
 
-    $resut = $self->select(
+    $resut = $dbi->select(
         $table,                # must be string or array;
-        \@$columns,            # must be array reference. this is optional
-        \%$where_params,       # must be hash reference.  this is optional
-        $append_statement,     # must be string.          this is optional
-        $query_edit_callback   # must be code reference.  this is optional
+        \@$columns,            # must be array reference. this can be ommited
+        \%$where_params,       # must be hash reference.  this can be ommited
+        $append_statement,     # must be string.          this can be ommited
+        $query_edit_callback   # must be code reference.  this can be ommited
     );
 
-$reslt is L<DBI::Custom::Result> object
+$reslt is L<DBIx::Custom::Result> object
 
 The following is some select samples
 
@@ -1308,7 +1278,30 @@ Get last insert id
 
 This method is implemented by subclass.
 
-=head1 Caution
+=head2 prepare
+
+Prepare statement handle.
+
+    $sth = $dbi->prepare('select * from books;');
+
+This method is same as DBI prepare method.
+
+See also L<DBI>.
+
+=head2 do
+
+Execute SQL
+
+    $affected = $dbi->do('insert into books (title, author) values (?, ?)',
+                        'Perl', 'taro');
+
+Retrun value is affected rows count.
+
+This method is same as DBI do method.
+
+See also L<DBI>
+
+=head1 DBIx::Custom default configuration
 
 DBIx::Custom have DBI object.
 This module is work well in the following DBI condition.
@@ -1323,12 +1316,27 @@ If you change these mode,
 you cannot get correct error message, 
 or run_transaction may fail.
 
+=head1 Inheritance of DBIx::Custom
+
+DBIx::Custom is customizable DBI.
+You can inherit DBIx::Custom and custumize attributes.
+
+    package DBIx::Custom::Yours;
+    use base DBIx::Custom;
+    
+    my $class = __PACKAGE__;
+    
+    $class->user('your_name');
+    $class->password('your_password');
+
 =head1 AUTHOR
 
 Yuki Kimoto, C<< <kimoto.yuki at gmail.com> >>
 
 Github L<http://github.com/yuki-kimoto>
 
+I develope this module L<http://github.com/yuki-kimoto/DBIx-Custom>
+
 =head1 COPYRIGHT & LICENSE
 
 Copyright 2009 Yuki Kimoto, all rights reserved.

+5 -11

lib/DBIx/Custom/Basic.pm

View

@@ -8,12 +8,7 @@ use Encode qw/decode encode/;
 my $class = __PACKAGE__;
 
 $class->add_filter(
-    encode_utf8 => sub {
-        my $value = shift;
-        return $value unless defined $value;
-        utf8::upgrade($value) unless Encode::is_utf8($value);
-        return encode('UTF-8', $value);
-    },
+    encode_utf8 => sub { encode('UTF-8', shift) },
     decode_utf8 => sub { decode('UTF-8', shift) }
 );
 
@@ -57,9 +52,6 @@ Please see L<DBIx::Custom> documentation
 
 Encode and decode utf8 filter on
 
-    $self = $self->utf8_filter_on;
-    
-    # Sample
     $dbi->utf8_filter_on;
 
 This equel to
@@ -71,7 +63,9 @@ This equel to
 
 =head2 encode_utf8
 
-    # Encode to UTF-8 byte stream (utf8::upgrade is done if need)
+Encode internal string to UTF-8 byte stream
+If need, utf8::upgrade is also done.
+
     $dbi->filters->{encode_utf8}->($value);
     
 This filter is generally used as bind filter
@@ -80,7 +74,7 @@ This filter is generally used as bind filter
 
 =head2 decode_utf8
 
-    # Decode to perl internal string
+Decode UTF-8 byte stream to internal string
     $dbi->filters->{decode_utf8}->($value);
     
 This filter is generally used as fetch filter

+8 -25

lib/DBIx/Custom/MySQL.pm

View

@@ -53,24 +53,9 @@ DBIx::Custom::MySQL - DBIx::Custom MySQL implementation
 
     # New
     my $dbi = DBIx::Custom::MySQL->new(user => 'taro', $password => 'kliej&@K',
-                                      database => 'sample_db');
-    # Insert 
-    $dbi->insert('books', {title => 'perl', author => 'taro'});
-    
-    # Update 
-    # same as 'update books set title = 'aaa', author = 'ken' where id = 5;
-    $dbi->update('books', {title => 'aaa', author => 'ken'}, {id => 5});
-    
-    # Delete
-    $dbi->delete('books', {author => 'taro'});
-    
-    # select * from books;
-    $dbi->select('books');
-    
-    # select * from books where ahthor = 'taro'; 
-    $dbi->select('books', {author => 'taro'});
+                                       database => 'sample_db');
 
-=head1 See DBIx::Custom and DBI::Custom::Basic documentation at first
+=head1 See DBIx::Custom and DBIx::Custom::Basic documentation at first
 
 This class is L<DBIx::Custom::Basic> subclass,
 and L<DBIx::Custom::Basic> is L<DBIx::Custom> subclass.
@@ -84,20 +69,18 @@ Please see L<DBIx::Custom::Basic> and <DBIx::Custom> documentation.
 
 Connect to database
 
-    $self = $self->connect;
-    
-    # Sample
-    $dbi->connect;
+    $self->connect;
 
 This override L<DBIx::Custom> connect.
 
-If you set database, host, or port, data source is automatically created and connect
+If you set database, host, or port, data source is automatically created.
 
 =head2 last_insert_id
 
-    $last_insert_id = $self->last_insert_id;
-    
-    # Sample
+    $last_insert_id = $dbi->last_insert_id;
+
+The folloing is last_insert_id sample.
+
     $dbi->insert('books', {title => 'Perl', author => 'taro'});
     $last_insert_id = $dbi->last_insert_id;
 

+21 -22

lib/DBIx/Custom/Query.pm

View

@@ -27,20 +27,19 @@ Object::Simple->build_class;
 DBIx::Custom::Query - DBIx::Custom query
 
 =head1 SYNOPSIS
-
-    # Create query
-    my $dbi = DBIx::Custom->new;
-    my $query = $dbi->create_query($template);
     
-    # Set query attributes
+    # New
+    my $query = DBIx::Custom::Query->new;
+    
+    # Create by using create_query
+    my $query = DBIx::Custom->create_query($template);
+    
+    # Set attributes
     $query->bind_filter($dbi->filters->{default_bind_filter});
     $query->no_bind_filters('title', 'author');
     
     $query->fetch_filter($dbi->filters->{default_fetch_filter});
     $query->no_fetch_filters('title', 'author');
-    
-    # Execute query
-    $dbi->execute($query, $params);
 
 =head1 Accessors
 
@@ -48,50 +47,50 @@ DBIx::Custom::Query - DBIx::Custom query
 
 Set and get statement handle
 
-    $self = $self->sth($sql);
-    $sth  = $self->sth;
+    $query = $query->sth($sth);
+    $sth   = $query->sth;
 
 =head2 sql
 
 Set and get SQL
 
-    $self = $self->sql($sql);
-    $sql  = $self->sql;
+    $query = $query->sql($sql);
+    $sql   = $query->sql;
 
 =head2 bind_filter
 
 Set and get bind filter
 
-    $self        = $self->bind_filter($bind_filter);
-    $bind_filter = $self->bind_filter;
+    $query       = $query->bind_filter($bind_filter);
+    $bind_filter = $query->bind_filter;
 
 =head2 no_bind_filters
 
 Set and get keys of no filtering
 
-    $self            = $self->no_bind_filters($no_filters);
-    $no_bind_filters = $self->no_bind_filters;
+    $query           = $query->no_bind_filters($no_filters);
+    $no_bind_filters = $query->no_bind_filters;
 
 =head2 fetch_filter
 
 Set and get fetch filter
 
-    $self         = $self->fetch_filter($fetch_filter);
-    $fetch_filter = $self->fetch_filter;
+    $query        = $query->fetch_filter($fetch_filter);
+    $fetch_filter = $query->fetch_filter;
 
 =head2 no_fetch_filters
 
 Set and get keys of no filtering
 
-    $self             = $self->no_fetch_filters($no_filters);
-    $no_fetch_filters = $self->no_fetch_filters;
+    $query            = $query->no_fetch_filters($no_filters);
+    $no_fetch_filters = $query->no_fetch_filters;
 
 =head2 key_infos
 
 Set and get key informations
 
-    $self      = $self->key_infos($key_infos);
-    $key_infos = $self->key_infos;
+    $query     = $query->key_infos($key_infos);
+    $key_infos = $query->key_infos;
 
 =head1 AUTHOR
 

+48 -45

lib/DBIx/Custom/Result.pm

View

@@ -201,12 +201,16 @@ DBIx::Custom::Result - DBIx::Custom Resultset
 
 =head1 Synopsis
 
-    # $result is DBIx::Custom::Result object
-    my $dbi = DBIx::Custom->new;
-    my $result = $dbi->query($sql_template, $param);
+    my $result = $dbi->query($query);
     
-    while (my ($val1, $val2) = $result->fetch) {
-        # do something
+    # Fetch
+    while (my @row = $result->fetch) {
+        # Do something
+    }
+    
+    # Fetch hash
+    while (my %row = $result->fetch_hash) {
+        # Do something
     }
 
 =head1 Accessors
@@ -215,24 +219,21 @@ DBIx::Custom::Result - DBIx::Custom Resultset
 
 Set and Get statement handle
 
-    $self = $result->sth($sth);
-    $sth  = $reuslt->sth
+    $result = $result->sth($sth);
+    $sth    = $reuslt->sth
     
-    # Sample
-    $dbi->sth->errstr
-
 =head2 fetch_filter
 
 Set and Get fetch filter
 
-    $self         = $result->fetch_filter($sth);
-    $fetch_filter = $result->fech_filter;
+    $result         = $result->fetch_filter($sth);
+    $fetch_filter   = $result->fech_filter;
 
 =head2 no_fetch_filters
 
 Set and Get no filter keys when fetching
 
-    $self             = $result->no_fetch_filters($no_fetch_filters);
+    $result           = $result->no_fetch_filters($no_fetch_filters);
     $no_fetch_filters = $result->no_fetch_filters;
 
 =head1 Methods
@@ -241,10 +242,11 @@ Set and Get no filter keys when fetching
 
 Fetch a row
 
-    $row = $self->fetch; # array reference
-    @row = $self->fecth; # array
+    $row = $result->fetch; # array reference
+    @row = $result->fecth; # array
+
+The following is fetch sample
 
-    # Sample
     while (my $row = $result->fetch) {
         # do something
         my $val1 = $row->[0];
@@ -255,10 +257,11 @@ Fetch a row
 
 Fetch row as hash
 
-    $row = $self->fetch_hash; # hash reference
-    %row = $self->fetch_hash; # hash
+    $row = $result->fetch_hash; # hash reference
+    %row = $result->fetch_hash; # hash
+
+The following is fetch_hash sample
 
-    # Sample
     while (my $row = $result->fetch_hash) {
         # do something
         my $val1 = $row->{key1};
@@ -269,10 +272,11 @@ Fetch row as hash
 
 Fetch only first row(Scalar context)
 
-    $row = $self->fetch_first; # array reference
-    @row = $self->fetch_first; # array
+    $row = $result->fetch_first; # array reference
+    @row = $result->fetch_first; # array
     
-    # Sample
+The following is fetch_first sample
+
     $row = $result->fetch_first;
     
 This method fetch only first row and finish statement handle
@@ -281,10 +285,11 @@ This method fetch only first row and finish statement handle
     
 Fetch only first row as hash
 
-    $row = $self->fetch_hash_first; # hash reference
-    %row = $self->fetch_hash_first; # hash
+    $row = $result->fetch_hash_first; # hash reference
+    %row = $result->fetch_hash_first; # hash
     
-    # Sample
+The following is fetch_hash_first sample
+
     $row = $result->fetch_hash_first;
     
 This method fetch only first row and finish statement handle
@@ -293,10 +298,11 @@ This method fetch only first row and finish statement handle
 
 Fetch rows
 
-    $rows = $self->fetch_rows($row_count); # array ref of array ref
-    @rows = $self->fetch_rows($row_count); # array of array ref
+    $rows = $result->fetch_rows($row_count); # array ref of array ref
+    @rows = $result->fetch_rows($row_count); # array of array ref
     
-    # Sample 
+The following is fetch_rows sample
+
     while(my $rows = $result->fetch_rows(10)) {
         # do someting
     }
@@ -305,10 +311,11 @@ Fetch rows
 
 Fetch rows as hash
 
-    $rows = $self->fetch_hash_rows($row_count); # array ref of hash ref
-    @rows = $self->fetch_hash_rows($row_count); # array of hash ref
+    $rows = $result->fetch_hash_rows($row_count); # array ref of hash ref
+    @rows = $result->fetch_hash_rows($row_count); # array of hash ref
     
-    # Sample 
+The following is fetch_hash_rows sample
+
     while(my $rows = $result->fetch_hash_rows(10)) {
         # do someting
     }
@@ -317,31 +324,31 @@ Fetch rows as hash
 
 Fetch all rows
 
-    $rows = $self->fetch_all; # array ref of array ref
-    @rows = $self->fecth_all; # array of array ref
+    $rows = $result->fetch_all; # array ref of array ref
+    @rows = $result->fecth_all; # array of array ref
+
+The following is fetch_all sample
 
-    # Sample
     my $rows = $result->fetch_all;
 
 =head2 fetch_hash_all
 
 Fetch all row as array ref of hash ref (Scalar context)
 
-    $rows = $self->fetch_hash_all; # array ref of hash ref
-    @rows = $self->fecth_all_hash; # array of hash ref
+    $rows = $result->fetch_hash_all; # array ref of hash ref
+    @rows = $result->fecth_all_hash; # array of hash ref
+
+The following is fetch_hash_all sample
 
-    # Sample
     my $rows = $result->fetch_hash_all;
 
 =head2 error
 
 Get error infomation
 
-    $error_messege = $self->error;
-    ($error_message, $error_number, $error_state) = $self->error;
+    $error_messege = $result->error;
+    ($error_message, $error_number, $error_state) = $result->error;
     
-    # Sample
-    $error = $result->error;
 
 You can get get information. This is same as the following.
 
@@ -353,10 +360,6 @@ You can get get information. This is same as the following.
 
 Finish statement handle
 
-    $ret_val = $self->finish
-    
-    # Sample
-    my $row = $reuslt->fetch; # fetch a row
     $result->finish
 
 This is equel to

+23 -67

lib/DBIx/Custom/SQL/Template.pm

View

@@ -486,19 +486,6 @@ DBIx::Custom::SQL::Template - DBIx::Custom SQL Template
     my $param = {k1 => 1, k2 => 2, k3 => 3};
     
     my $query = $sql_template->create_query($tmpl);
-    
-    
-    # Using query from DBIx::Custom
-    use DBIx::Custom;
-    my $dbi = DBI->new(
-       data_source => $data_source,
-       user        => $user,
-       password    => $password, 
-       dbi_options => {PrintError => 0, RaiseError => 1}
-    );
-    
-    $query = $dbi->create_query($tmpl); # This is SQL::Template create_query
-    $dbi->query($query, $param);
 
 =head1 Accessors
 
@@ -506,65 +493,34 @@ DBIx::Custom::SQL::Template - DBIx::Custom SQL Template
 
 Set and get tag processors
 
-    # For object
-    $self           = $self->tag_processors($tag_processors);
-    $tag_processors = $self->tag_processors;
-
-    # For class
-    $class          = $class->tag_processors($tag_processors);
-    $tag_processors = $class->tag_processors;
-
-    # Sample
-    $placeholder_tag_processor = $sql_tmpl->tag_processor->{'?'};
+    $sql_tmpl       = $sql_tmpl->tag_processors($name1 => $tag_processor1
+                                                $name2 => $tag_processor2);
+    $tag_processors = $sql_tmpl->tag_processors;
 
 =head2 tag_start
 
 Set and get start tag
     
-    # For object
-    $self      = $self->tag_start($tag_start);
-    $tag_start = $self->tag_start;
-    
-    # For class
-    $class     = $class->tag_start($tag_start);
-    $tag_start = $class->tag_start;
-    
-    # Sample
-    $sql_tmpl->tag_start('{');
+    $sql_tmpl  = $sql_tmpl->tag_start('{');
+    $tag_start = $sql_tmpl->tag_start;
 
-Default is '{'
+tag_start default is '{'
 
 =head2 tag_end
 
 Set and get end tag
     
-    # For object
-    $self    = $self->tag_start($tag_end);
-    $tag_end = $self->tag_start;
-    
-    # For class
-    $self    = $self->tag_start($tag_end);
-    $tag_end = $self->tag_start;
-    
-    # Sample
-    $sql_tmpl->tag_start('}');
+    $sql_tmpl    = $sql_tmpl->tag_start('}');
+    $tag_end = $sql_tmpl->tag_start;
 
-Default is '}'
+tag_start default is '}'
     
 =head2 tag_syntax
     
 Set and get tag syntax
     
-    # For object
-    $self       = $self->tag_syntax($tag_syntax);
-    $tag_syntax = $self->tag_syntax;
-
-    # For class
-    $class      = $class->tag_syntax($tag_syntax);
-    $tag_syntax = $class->tag_syntax;
-    
-    # Sample
-    $syntax = $sql_tmpl->tag_syntax;
+    $sql_tmpl   = $sql_tmpl->tag_syntax($tag_syntax);
+    $tag_syntax = $sql_tmpl->tag_syntax;
 
 =head1 Methods
 
@@ -572,7 +528,7 @@ Set and get tag syntax
     
 Create L<DBIx::Custom::Query> object parsing SQL template
 
-    $query = $self->create_query($tmpl);
+    $query = $sql_tmpl->create_query($tmpl);
     
     # Sample
     $query = $sql_tmpl->create_sql(
@@ -603,13 +559,10 @@ query has two infomation
 
 Add tag processor
     
-    # For object
-    $self = $self->add_tag_processor($tag_processor);
-    
-    # For class
-    $class = $class->add_tag_processor($tag_processor);
-    
-    # Sample
+    $sql_tmpl = $sql_tmpl->add_tag_processor($tag_processor);
+
+The following is add_tag_processor sample
+
     $sql_tmpl->add_tag_processor(
         '?' => sub {
             my ($tag_name, $tag_args) = @_;
@@ -646,7 +599,7 @@ If you want to know more, Please see DBIx::Custom::SQL::Template source code.
 
 Clone DBIx::Custom::SQL::Template object
 
-    $clone = $self->clone;
+    $clone = $sql_tmpl->clone;
     
 =head1 Available Tags
     
@@ -668,15 +621,18 @@ Available Tags
     {insert}         (key1, key2, key3) values (?, ?, ?)
     {update}         set key1 = ?, key2 = ?, key3 = ?
     
-    # Sample
+
+The following is insert SQL sample
+
     $query = $sql_tmpl->create_sql(
         "insert into table {insert key1 key2}"
     );
+    
     # Expanded
     $query->sql : "insert into table (key1, key2) values (?, ?)"
+
+The following is update SQL sample
     
-    
-    # Sample
     $query = $sql_tmpl->create_sql(
         "update table {update key1 key2} where {= key3}"
     );

+9 -39

lib/DBIx/Custom/SQLite.pm

View

@@ -72,30 +72,10 @@ DBIx::Custom::SQLite - DBIx::Custom SQLite implementation
     my $dbi = DBIx::Custom::SQLite->new(user => 'taro', $password => 'kliej&@K',
                                         database => 'sample');
     
-    # Insert 
-    $dbi->insert('books', {title => 'perl', author => 'taro'});
+    # Connect memory database
+    my $dbi->connect_memory;
     
-    # Update 
-    # same as 'update books set title = 'aaa', author = 'ken' where id = 5;
-    $dbi->update('books', {title => 'aaa', author => 'ken'}, {id => 5});
-    
-    # Delete
-    $dbi->delete('books', {author => 'taro'});
-    
-    # select * from books;
-    $dbi->select('books');
-    
-    # select * from books where ahthor = 'taro'; 
-    $dbi->select('books', {author => 'taro'}); 
-    
-    # select author, title from books where author = 'taro'
-    $dbi->select('books', [qw/author title/], {author => 'taro'});
-    
-    # select author, title from books where author = 'taro' order by id limit 1;
-    $dbi->select('books', [qw/author title/], {author => 'taro'},
-                 'order by id limit 1');
-
-=head1 See DBIx::Custom and DBI::Custom::Basic documentation at first
+=head1 See DBIx::Custom and DBIx::Custom::Basic documentation at first
 
 This class is L<DBIx::Custom::Basic> subclass.
 and L<DBIx::Custom::Basic> is L<DBIx::Custom> subclass
@@ -103,46 +83,36 @@ and L<DBIx::Custom::Basic> is L<DBIx::Custom> subclass
 You can use all methods of L<DBIx::Custom::Basic> and <DBIx::Custom>
 Please see L<DBIx::Custom::Basic> and <DBIx::Custom> documentation
 
-=head1 methods
+=head1 Methods
 
 =head2 connect
 
 Connect to database
 
-    $self = $self->connect;
-    
-    # Sample
     $dbi->connect;
 
-This override L<DBIx::Custom> connect.
-
-If you set database, data source is automatically created and connect
+If you set database, host, or port, data source is automatically created.
 
 =head2 connect_memory
 
 Connect memory database
 
-    $self = $self->connect_memory;
-    
-    # Sample
     $dbi->connect_memory;
 
 =head2 reconnect_memory
 
 Reconnect to memory databsse
 
-    $self = $self->reconnect_memory;
-    
-    # Sample
-    $self = $dbi->reconnect_memory;
+    $dbi->reconnect_memory;
 
 =head2 last_insert_id
 
 Get last insert id
 
-    $last_insert_id = $self->last_insert_id;
+    $last_insert_id = $dbi->last_insert_id;
     
-    # Sample
+The folloing is last_insert_id sample.
+
     $dbi->insert('books', {title => 'Perl', author => 'taro'});
     $last_insert_id = $dbi->last_insert_id;
 

t/dbi-custom-basic-sqlite.t → t/dbix-custom-basic-sqlite.t

View

File renamed without changes.

t/dib-custom-basic-timeformat.t → t/dbix-custom-basic-timeformat.t

View

File renamed without changes.

t/dbi-custom-core-mysql-private.t → t/dbix-custom-core-mysql-private.t

View

File renamed without changes.

+88 -71

t/dbi-custom-core-sqlite.t → t/dbix-custom-core-sqlite.t

View

@@ -88,6 +88,23 @@ ok(defined $ret_val, "$test : auto connect");
 $ret_val = $dbi->do($DROP_TABLE->{0});
 ok(defined $ret_val, "$test : basic");
 
+test 'create_table';
+$dbi = DBIx::Custom->new($NEW_ARGS->{0});
+$ret_val = $dbi->create_table(
+                   'table1',
+                   'key1 char(255)',
+                   'key2 char(255)'
+                 );
+ok(defined $ret_val, "$test : create_table");
+
+eval{$dbi->insert('table1', {key1 => 1, key2 => 2})};
+ok(!$@, "$test : table exist");
+
+$ret_val = $dbi->drop_table('table1');
+ok(defined $ret_val, "$test : drop table");
+
+eval{$dbi->select('table1')};
+ok($@, "$test : table not exist");
 
 # Prepare table
 $dbi = DBIx::Custom->new($NEW_ARGS->{0});
@@ -101,7 +118,7 @@ $sth->execute(3, 4);
 test 'DBIx::Custom::Result test';
 $tmpl = "select key1, key2 from table1";
 $query = $dbi->create_query($tmpl);
-$result = $dbi->execute($query);
+$result = $dbi->query($query);
 
 @rows = ();
 while (my $row = $result->fetch) {
@@ -109,40 +126,40 @@ while (my $row = $result->fetch) {
 }
 is_deeply(\@rows, [[1, 2], [3, 4]], "$test : fetch scalar context");
 
-$result = $dbi->execute($query);
+$result = $dbi->query($query);
 @rows = ();
 while (my @row = $result->fetch) {
     push @rows, [@row];
 }
 is_deeply(\@rows, [[1, 2], [3, 4]], "$test : fetch list context");
 
-$result = $dbi->execute($query);
+$result = $dbi->query($query);
 @rows = ();
 while (my $row = $result->fetch_hash) {
     push @rows, {%$row};
 }
 is_deeply(\@rows, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}], "$test : fetch_hash scalar context");
 
-$result = $dbi->execute($query);
+$result = $dbi->query($query);
 @rows = ();
 while (my %row = $result->fetch_hash) {
     push @rows, {%row};
 }
 is_deeply(\@rows, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}], "$test : fetch hash list context");
 
-$result = $dbi->execute($query);
+$result = $dbi->query($query);
 $rows = $result->fetch_all;
 is_deeply($rows, [[1, 2], [3, 4]], "$test : fetch_all scalar context");
 
-$result = $dbi->execute($query);
+$result = $dbi->query($query);
 @rows = $result->fetch_all;
 is_deeply(\@rows, [[1, 2], [3, 4]], "$test : fetch_all list context");
 
-$result = $dbi->execute($query);
+$result = $dbi->query($query);
 @rows = $result->fetch_hash_all;
 is_deeply($rows, [[1, 2], [3, 4]], "$test : fetch_hash_all scalar context");
 
-$result = $dbi->execute($query);
+$result = $dbi->query($query);
 @rows = $result->fetch_all;
 is_deeply(\@rows, [[1, 2], [3, 4]], "$test : fetch_hash_all list context");
 
@@ -152,15 +169,15 @@ $dbi->do($DROP_TABLE->{0});
 $dbi->do($CREATE_TABLE->{0});
 $tmpl = "insert into table1 {insert key1 key2}";
 $query = $dbi->create_query($tmpl);
-$ret_val = $dbi->execute($query, {key1 => 1, key2 => 2});
+$ret_val = $dbi->query($query, {key1 => 1, key2 => 2});
 ok($ret_val, $test);
 
 
-test 'Direct execute';
+test 'Direct query';
 $dbi->do($DROP_TABLE->{0});
 $dbi->do($CREATE_TABLE->{0});
 $insert_tmpl = "insert into table1 {insert key1 key2}";
-$dbi->execute($insert_tmpl, {key1 => 1, key2 => 2}, sub {
+$dbi->query($insert_tmpl, {key1 => 1, key2 => 2}, sub {
     my $query = shift;
     $query->bind_filter(sub {
         my ($value, $key) = @_;
@@ -170,7 +187,7 @@ $dbi->execute($insert_tmpl, {key1 => 1, key2 => 2}, sub {
         return $value;
     });
 });
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 3}], $test);
 
@@ -192,7 +209,7 @@ $insert_query->bind_filter(sub {
     }
     return $value;
 });
-$dbi->execute($insert_query, {key1 => 1, key2 => 2});
+$dbi->query($insert_query, {key1 => 1, key2 => 2});
 $select_query = $dbi->create_query($SELECT_TMPL->{0});
 $select_query->fetch_filter(sub {
     my ($value, $key, $dbi, $infos) = @_;
@@ -205,15 +222,15 @@ $select_query->fetch_filter(sub {
     }
     return $value;
 });
-$result = $dbi->execute($select_query);
+$result = $dbi->query($select_query);
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 2, key2 => 6}], "$test : bind_filter fetch_filter");
 
 $dbi->do("delete from table1;");
 $insert_query->no_bind_filters('key1');
 $select_query->no_fetch_filters('key2');
-$dbi->execute($insert_query, {key1 => 1, key2 => 2});
-$result = $dbi->execute($select_query);
+$dbi->query($insert_query, {key1 => 1, key2 => 2});
+$result = $dbi->query($select_query);
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2}], "$test : no_fetch_filters no_bind_filters");
 
@@ -230,16 +247,16 @@ $insert_query->bind_filter(sub {
     }
     return $value;
 });
-$dbi->execute($insert_query, {table1 => {key1 => 1, key2 => 2}});
+$dbi->query($insert_query, {table1 => {key1 => 1, key2 => 2}});
 $select_query = $dbi->create_query($SELECT_TMPL->{0});
-$result       = $dbi->execute($select_query);
+$result       = $dbi->query($select_query);
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 3, key2 => 2}], "$test : insert with table name");
 
 test 'Filter in';
 $insert_tmpl  = "insert into table1 {insert key1 key2};";
 $insert_query = $dbi->create_query($insert_tmpl);
-$dbi->execute($insert_query, {key1 => 2, key2 => 4});
+$dbi->query($insert_query, {key1 => 2, key2 => 4});
 $select_tmpl = "select * from table1 where {in table1.key1 2} and {in table1.key2 2}";
 $select_query = $dbi->create_query($select_tmpl);
 $select_query->bind_filter(sub {
@@ -251,7 +268,7 @@ $select_query->bind_filter(sub {
     }
     return $value;
 });
-$result = $dbi->execute($select_query, {table1 => {key1 => [1,5], key2 => [2,5]}});
+$result = $dbi->query($select_query, {table1 => {key1 => [1,5], key2 => [2,5]}});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 2, key2 => 4}], "$test : bind_filter");
 
@@ -265,37 +282,37 @@ $sth->execute(6, 7, 8, 9, 10);
 
 $tmpl = "select * from table1 where {= key1} and {<> key2} and {< key3} and {> key4} and {>= key5};";
 $query = $dbi->create_query($tmpl);
-$result = $dbi->execute($query, {key1 => 1, key2 => 3, key3 => 4, key4 => 3, key5 => 5});
+$result = $dbi->query($query, {key1 => 1, key2 => 3, key3 => 4, key4 => 3, key5 => 5});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : basic tag1");
 
 $tmpl = "select * from table1 where {= table1.key1} and {<> table1.key2} and {< table1.key3} and {> table1.key4} and {>= table1.key5};";
 $query = $dbi->create_query($tmpl);
-$result = $dbi->execute($query, {table1 => {key1 => 1, key2 => 3, key3 => 4, key4 => 3, key5 => 5}});
+$result = $dbi->query($query, {table1 => {key1 => 1, key2 => 3, key3 => 4, key4 => 3, key5 => 5}});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : basic tag1 with table");
 
 $tmpl = "select * from table1 where {= table1.key1} and {<> table1.key2} and {< table1.key3} and {> table1.key4} and {>= table1.key5};";
 $query = $dbi->create_query($tmpl);
-$result = $dbi->execute($query, {'table1.key1' => 1, 'table1.key2' => 3, 'table1.key3' => 4, 'table1.key4' => 3, 'table1.key5' => 5});
+$result = $dbi->query($query, {'table1.key1' => 1, 'table1.key2' => 3, 'table1.key3' => 4, 'table1.key4' => 3, 'table1.key5' => 5});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : basic tag1 with table dot");
 
 $tmpl = "select * from table1 where {<= key1} and {like key2};";
 $query = $dbi->create_query($tmpl);
-$result = $dbi->execute($query, {key1 => 1, key2 => '%2%'});
+$result = $dbi->query($query, {key1 => 1, key2 => '%2%'});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : basic tag2");
 
 $tmpl = "select * from table1 where {<= table1.key1} and {like table1.key2};";
 $query = $dbi->create_query($tmpl);
-$result = $dbi->execute($query, {table1 => {key1 => 1, key2 => '%2%'}});
+$result = $dbi->query($query, {table1 => {key1 => 1, key2 => '%2%'}});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : basic tag2 with table");
 
 $tmpl = "select * from table1 where {<= table1.key1} and {like table1.key2};";
 $query = $dbi->create_query($tmpl);
-$result = $dbi->execute($query, {'table1.key1' => 1, 'table1.key2' => '%2%'});
+$result = $dbi->query($query, {'table1.key1' => 1, 'table1.key2' => '%2%'});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : basic tag2 with table dot");
 
@@ -309,19 +326,19 @@ $sth->execute(6, 7, 8, 9, 10);
 
 $tmpl = "select * from table1 where {in key1 2};";
 $query = $dbi->create_query($tmpl);
-$result = $dbi->execute($query, {key1 => [9, 1]});
+$result = $dbi->query($query, {key1 => [9, 1]});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : basic");
 
 $tmpl = "select * from table1 where {in table1.key1 2};";
 $query = $dbi->create_query($tmpl);
-$result = $dbi->execute($query, {table1 => {key1 => [9, 1]}});
+$result = $dbi->query($query, {table1 => {key1 => [9, 1]}});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : with table");
 
 $tmpl = "select * from table1 where {in table1.key1 2};";
 $query = $dbi->create_query($tmpl);
-$result = $dbi->execute($query, {'table1.key1' => [9, 1]});
+$result = $dbi->query($query, {'table1.key1' => [9, 1]});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : with table dot");
 
@@ -329,41 +346,41 @@ is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$te
 test 'DBIx::Custom::SQL::Template insert tag';
 $dbi->do("delete from table1");
 $insert_tmpl = 'insert into table1 {insert key1 key2 key3 key4 key5}';
-$dbi->execute($insert_tmpl, {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});
+$dbi->query($insert_tmpl, {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});
 
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : basic");
 
 $dbi->do("delete from table1");
-$dbi->execute($insert_tmpl, {'#insert' => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$dbi->query($insert_tmpl, {'#insert' => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : #insert");
 
 $dbi->do("delete from table1");
 $insert_tmpl = 'insert into table1 {insert table1.key1 table1.key2 table1.key3 table1.key4 table1.key5}';
-$dbi->execute($insert_tmpl, {table1 => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$dbi->query($insert_tmpl, {table1 => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : with table name");
 
 $dbi->do("delete from table1");
 $insert_tmpl = 'insert into table1 {insert table1.key1 table1.key2 table1.key3 table1.key4 table1.key5}';
-$dbi->execute($insert_tmpl, {'table1.key1' => 1, 'table1.key2' => 2, 'table1.key3' => 3, 'table1.key4' => 4, 'table1.key5' => 5});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$dbi->query($insert_tmpl, {'table1.key1' => 1, 'table1.key2' => 2, 'table1.key3' => 3, 'table1.key4' => 4, 'table1.key5' => 5});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : with table name dot");
 
 $dbi->do("delete from table1");
-$dbi->execute($insert_tmpl, {'#insert' => {table1 => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}}});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$dbi->query($insert_tmpl, {'#insert' => {table1 => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}}});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : #insert with table name");
 
 $dbi->do("delete from table1");
-$dbi->execute($insert_tmpl, {'#insert' => {'table1.key1' => 1, 'table1.key2' => 2, 'table1.key3' => 3, 'table1.key4' => 4, 'table1.key5' => 5}});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$dbi->query($insert_tmpl, {'#insert' => {'table1.key1' => 1, 'table1.key2' => 2, 'table1.key3' => 3, 'table1.key4' => 4, 'table1.key5' => 5}});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : #insert with table name dot");
 
@@ -371,45 +388,45 @@ is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$te
 test 'DBIx::Custom::SQL::Template update tag';
 $dbi->do("delete from table1");
 $insert_tmpl = "insert into table1 {insert key1 key2 key3 key4 key5}";
-$dbi->execute($insert_tmpl, {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});
-$dbi->execute($insert_tmpl, {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});
+$dbi->query($insert_tmpl, {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});
+$dbi->query($insert_tmpl, {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});
 
 $update_tmpl = 'update table1 {update key1 key2 key3 key4} where {= key5}';
-$dbi->execute($update_tmpl, {key1 => 1, key2 => 1, key3 => 1, key4 => 1, key5 => 5});
+$dbi->query($update_tmpl, {key1 => 1, key2 => 1, key3 => 1, key4 => 1, key5 => 5});
 
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 1, key3 => 1, key4 => 1, key5 => 5},
                   {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10}], "$test : basic");
 
-$dbi->execute($update_tmpl, {'#update' => {key1 => 2, key2 => 2, key3 => 2, key4 => 2}, key5 => 5});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$dbi->query($update_tmpl, {'#update' => {key1 => 2, key2 => 2, key3 => 2, key4 => 2}, key5 => 5});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 2, key2 => 2, key3 => 2, key4 => 2, key5 => 5},
                   {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10}], "$test : #update");
 
 $update_tmpl = 'update table1 {update table1.key1 table1.key2 table1.key3 table1.key4} where {= table1.key5}';
-$dbi->execute($update_tmpl, {table1 => {key1 => 3, key2 => 3, key3 => 3, key4 => 3, key5 => 5}});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$dbi->query($update_tmpl, {table1 => {key1 => 3, key2 => 3, key3 => 3, key4 => 3, key5 => 5}});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 3, key2 => 3, key3 => 3, key4 => 3, key5 => 5},
                   {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10}], "$test : with table name");
 
 $update_tmpl = 'update table1 {update table1.key1 table1.key2 table1.key3 table1.key4} where {= table1.key5}';
-$dbi->execute($update_tmpl, {'table1.key1' => 4, 'table1.key2' => 4, 'table1.key3' => 4, 'table1.key4' => 4, 'table1.key5' => 5});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$dbi->query($update_tmpl, {'table1.key1' => 4, 'table1.key2' => 4, 'table1.key3' => 4, 'table1.key4' => 4, 'table1.key5' => 5});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 4, key2 => 4, key3 => 4, key4 => 4, key5 => 5},
                   {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10}], "$test : with table name dot");
 
-$dbi->execute($update_tmpl, {'#update' => {table1 => {key1 => 5, key2 => 5, key3 => 5, key4 => 5}}, table1 => {key5 => 5}});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$dbi->query($update_tmpl, {'#update' => {table1 => {key1 => 5, key2 => 5, key3 => 5, key4 => 5}}, table1 => {key5 => 5}});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 5, key2 => 5, key3 => 5, key4 => 5, key5 => 5},
                   {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10}], "$test : update tag #update with table name");
 
-$dbi->execute($update_tmpl, {'#update' => {'table1.key1' => 6, 'table1.key2' => 6, 'table1.key3' => 6, 'table1.key4' => 6}, 'table1.key5' => 5});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$dbi->query($update_tmpl, {'#update' => {'table1.key1' => 6, 'table1.key2' => 6, 'table1.key3' => 6, 'table1.key4' => 6}, 'table1.key5' => 5});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 6, key2 => 6, key3 => 6, key4 => 6, key5 => 5},
                   {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10}], "$test : update tag #update with table name dot");
@@ -421,10 +438,10 @@ $dbi->do($CREATE_TABLE->{0});
 $dbi->run_transaction(sub {
     my $dbi = shift;
     $insert_tmpl = 'insert into table1 {insert key1 key2}';
-    $dbi->execute($insert_tmpl, {key1 => 1, key2 => 2});
-    $dbi->execute($insert_tmpl, {key1 => 3, key2 => 4});
+    $dbi->query($insert_tmpl, {key1 => 1, key2 => 2});
+    $dbi->query($insert_tmpl, {key1 => 3, key2 => 4});
 });
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows   = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}], "$test : commit");
 
@@ -435,14 +452,14 @@ eval{
     $dbi->run_transaction(sub {
         my $dbi = shift;
         $insert_tmpl = 'insert into table1 {insert key1 key2}';
-        $dbi->execute($insert_tmpl, {key1 => 1, key2 => 2});
+        $dbi->query($insert_tmpl, {key1 => 1, key2 => 2});
         die "Fatal Error";
-        $dbi->execute($insert_tmpl, {key1 => 3, key2 => 4});
+        $dbi->query($insert_tmpl, {key1 => 3, key2 => 4});
     })
 };
 like($@, qr/Fatal Error.*Rollback is success/ms, "$test : Rollback success message");
 ok(!$dbi->dbh->{RaiseError}, "$test : restore RaiseError value");
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows   = $result->fetch_hash_all;
 is_deeply($rows, [], "$test : rollback");
 
@@ -480,7 +497,7 @@ ok($@, "$test : create_query invalid SQL template");
 $dbi = DBIx::Custom->new($NEW_ARGS->{0});
 $dbi->do($CREATE_TABLE->{0});
 $query = $dbi->create_query("select * from table1 where {= key1}");
-eval{$dbi->execute($query, {key2 => 1})};
+eval{$dbi->query($query, {key2 => 1})};
 like($@, qr/Corresponding key is not found in your parameters/, 
         "$test : execute corresponding key not found");
 
@@ -490,7 +507,7 @@ $dbi = DBIx::Custom->new($NEW_ARGS->{0});
 $dbi->do($CREATE_TABLE->{0});
 $dbi->insert('table1', {key1 => 1, key2 => 2});
 $dbi->insert('table1', {key1 => 3, key2 => 4});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows   = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}], "$test : basic");
 
@@ -505,7 +522,7 @@ $dbi->insert('table1', {key1 => 1, key2 => 2}, sub {
         return $value;
     });
 });
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows   = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 3, key2 => 2}], "$test : edit_query_callback");
 
@@ -529,7 +546,7 @@ $dbi->do($CREATE_TABLE->{1});
 $dbi->insert('table1', {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});
 $dbi->insert('table1', {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});
 $dbi->update('table1', {key2 => 11}, {key1 => 1});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows   = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 11, key3 => 3, key4 => 4, key5 => 5},
                   {key1 => 6, key2 => 7,  key3 => 8, key4 => 9, key5 => 10}],
@@ -539,7 +556,7 @@ $dbi->do("delete from table1");
 $dbi->insert('table1', {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});
 $dbi->insert('table1', {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});
 $dbi->update('table1', {key2 => 12}, {key2 => 2, key3 => 3});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows   = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 12, key3 => 3, key4 => 4, key5 => 5},
                   {key1 => 6, key2 => 7,  key3 => 8, key4 => 9, key5 => 10}],
@@ -558,7 +575,7 @@ $dbi->update('table1', {key2 => 11}, {key1 => 1}, sub {
         return $value;
     });
 });
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows   = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 22, key3 => 3, key4 => 4, key5 => 5},
                   {key1 => 6, key2 => 7,  key3 => 8, key4 => 9, key5 => 10}],
@@ -599,7 +616,7 @@ $dbi->update_all('table1', {key2 => 10}, sub {
         return $value * 2;
     })
 });
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows   = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 1, key2 => 20, key3 => 3, key4 => 4, key5 => 5},
                   {key1 => 6, key2 => 20, key3 => 8, key4 => 9, key5 => 10}],
@@ -612,7 +629,7 @@ $dbi->do($CREATE_TABLE->{0});
 $dbi->insert('table1', {key1 => 1, key2 => 2});
 $dbi->insert('table1', {key1 => 3, key2 => 4});
 $dbi->delete('table1', {key1 => 1});
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows   = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 3, key2 => 4}], "$test : basic");
 
@@ -626,7 +643,7 @@ $dbi->delete('table1', {key2 => 1}, sub {
         return $value * 2;
     });
 });
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows   = $result->fetch_hash_all;
 is_deeply($rows, [{key1 => 3, key2 => 4}], "$test : query edit callback");
 
@@ -663,7 +680,7 @@ $dbi->do($CREATE_TABLE->{0});
 $dbi->insert('table1', {key1 => 1, key2 => 2});
 $dbi->insert('table1', {key1 => 3, key2 => 4});
 $dbi->delete_all('table1');
-$result = $dbi->execute($SELECT_TMPL->{0});
+$result = $dbi->query($SELECT_TMPL->{0});
 $rows   = $result->fetch_hash_all;
 is_deeply($rows, [], "$test : basic");
 

+34 -22

t/dbi-custom-core.t → t/dbix-custom-core.t

View

@@ -26,19 +26,19 @@ $dbi = DBIx::Custom->new(
     database => 'a',
     password => 'b',
     data_source => 'c',
-    dbi_options => {d => 1, e => 2},
+    options => {d => 1, e => 2},
     filters => {
         f => 3,
     },
     bind_filter => 'f',
     fetch_filter => 'g',
     result_class => 'g',
-    sql_template => $SQL_TMPL->{0},
+    sql_tmpl => $SQL_TMPL->{0},
 );
 is_deeply($dbi,{user => 'a', database => 'a', password => 'b', data_source => 'c', 
-                dbi_options => {d => 1, e => 2}, filters => {f => 3}, bind_filter => 'f',
+                options => {d => 1, e => 2}, filters => {f => 3}, bind_filter => 'f',
                 fetch_filter => 'g', result_class => 'g',
-                sql_template => $SQL_TMPL->{0}}, $test);
+                sql_tmpl => $SQL_TMPL->{0}}, $test);
 isa_ok($dbi, 'DBIx::Custom');
 
 
@@ -52,7 +52,7 @@ test 'Sub class constructor';
       ->database('a')
       ->password('b')
       ->data_source('c')
-      ->dbi_options({d => 1, e => 2})
+      ->options({d => 1, e => 2})
       ->filters(
           f => 3
       )
@@ -62,7 +62,7 @@ test 'Sub class constructor';
       ->bind_filter('f')
       ->fetch_filter('g')
       ->result_class('DBIx::Custom::Result')
-      ->sql_template($SQL_TMPL->{0})
+      ->sql_tmpl($SQL_TMPL->{0})
     ;
 }
 $dbi = DBIx::Custom::T1->new(
@@ -70,7 +70,7 @@ $dbi = DBIx::Custom::T1->new(
     database => 'ao',
     password => 'bo',
     data_source => 'co',
-    dbi_options => {do => 10, eo => 20},
+    options => {do => 10, eo => 20},
     filters => {
         fo => 30,
     },
@@ -80,19 +80,19 @@ $dbi = DBIx::Custom::T1->new(
     bind_filter => 'fo',
     fetch_filter => 'go',
     result_class => 'ho',
-    sql_template => $SQL_TMPL->{0},
+    sql_tmpl => $SQL_TMPL->{0},
 );
 is($dbi->user, 'ao', "$test : user");
 is($dbi->database, 'ao', "$test : database");
 is($dbi->password, 'bo', "$test : passowr");
 is($dbi->data_source, 'co', "$test : data_source");
-is_deeply($dbi->dbi_options, {do => 10, eo => 20}, "$test : dbi_options");
+is_deeply($dbi->options, {do => 10, eo => 20}, "$test : options");
 is_deeply(scalar $dbi->filters, {fo => 30}, "$test : filters");
 is_deeply(scalar $dbi->formats, {fo => 30}, "$test : formats");
 is($dbi->bind_filter, 'fo', "$test : bind_filter");
 is($dbi->fetch_filter, 'go', "$test : fetch_filter");
 is($dbi->result_class, 'ho', "$test : result_class");
-is($dbi->sql_template->tag_start, 0, "$test : sql_template");
+is($dbi->sql_tmpl->tag_start, 0, "$test : sql_tmpl");
 isa_ok($dbi, 'DBIx::Custom::T1');
 
 test 'Sub class constructor default';
@@ -101,13 +101,13 @@ is($dbi->user, 'a', "$test : user");
 is($dbi->database, 'a', "$test : database");
 is($dbi->password, 'b', "$test : password");
 is($dbi->data_source, 'c', "$test : data_source");
-is_deeply($dbi->dbi_options, {d => 1, e => 2}, "$test : dbi_options");
+is_deeply($dbi->options, {d => 1, e => 2}, "$test : options");
 is_deeply({$dbi->filters}, {f => 3}, "$test : filters");
 is_deeply({$dbi->formats}, {f => 3}, "$test : formats");
 is($dbi->bind_filter, 'f', "$test : bind_filter");
 is($dbi->fetch_filter, 'g', "$test : fetch_filter");
 is($dbi->result_class, 'DBIx::Custom::Result', "$test : result_class");
-is($dbi->sql_template->tag_start, 0, "$test : sql_template");
+is($dbi->sql_tmpl->tag_start, 0, "$test : sql_tmpl");
 isa_ok($dbi, 'DBIx::Custom::T1');
 
 
@@ -121,13 +121,13 @@ is($dbi->user, 'a', "$test : user");
 is($dbi->database, 'a', "$test : database");
 is($dbi->password, 'b', "$test : passowrd");
 is($dbi->data_source, 'c', "$test : data_source");
-is_deeply($dbi->dbi_options, {d => 1, e => 2}, "$test : dbi_options");
+is_deeply($dbi->options, {d => 1, e => 2}, "$test : options");
 is_deeply(scalar $dbi->filters, {f => 3}, "$test : filters");
 is_deeply(scalar $dbi->formats, {f => 3}, "$test : formats");
 is($dbi->bind_filter, 'f', "$test : bind_filter");
 is($dbi->fetch_filter, 'g', "$test : fetch_filter");
 is($dbi->result_class, 'DBIx::Custom::Result', "$test : result_class");
-is($dbi->sql_template->tag_start, 0, "$test sql_template");
+is($dbi->sql_tmpl->tag_start, 0, "$test sql_tmpl");
 isa_ok($dbi, 'DBIx::Custom::T1_2');
 
 
@@ -141,7 +141,7 @@ test 'Customized sub class constructor default';
       ->database('ao')
       ->password('bo')
       ->data_source('co')
-      ->dbi_options({do => 10, eo => 20})
+      ->options({do => 10, eo => 20})
       ->filters(
         fo => 30
       )
@@ -151,7 +151,7 @@ test 'Customized sub class constructor default';
       ->bind_filter('fo')
       ->fetch_filter('go')
       ->result_class('ho')
-      ->sql_template($SQL_TMPL->{1})
+      ->sql_tmpl($SQL_TMPL->{1})
     ;
 }
 $dbi = DBIx::Custom::T1_3->new;
@@ -159,13 +159,13 @@ is($dbi->user, 'ao', "$test : user");
 is($dbi->database, 'ao', "$test : database");
 is($dbi->password, 'bo', "$test : password");
 is($dbi->data_source, 'co', "$test : data_source");
-is_deeply($dbi->dbi_options, {do => 10, eo => 20}, "$test : dbi_options");
+is_deeply($dbi->options, {do => 10, eo => 20}, "$test : options");
 is_deeply(scalar $dbi->filters, {fo => 30}, "$test : filters");
 is_deeply(scalar $dbi->formats, {fo => 30}, "$test : formats");
 is($dbi->bind_filter, 'fo', "$test : bind_filter");
 is($dbi->fetch_filter, 'go', "$test : fetch_filter");
 is($dbi->result_class, 'ho', "$test : result_class");
-is($dbi->sql_template->tag_start, 1, "$test : sql_template");
+is($dbi->sql_tmpl->tag_start, 1, "$test : sql_tmpl");
 isa_ok($dbi, 'DBIx::Custom::T1_3');
 
 
@@ -175,7 +175,7 @@ $dbi = DBIx::Custom::T1_3->new(
     database => 'a',
     password => 'b',
     data_source => 'c',
-    dbi_options => {d => 1, e => 2},
+    options => {d => 1, e => 2},
     filters => {
         f => 3,
     },
@@ -185,19 +185,19 @@ $dbi = DBIx::Custom::T1_3->new(
     bind_filter => 'f',
     fetch_filter => 'g',
     result_class => 'h',
-    sql_template => $SQL_TMPL->{2},
+    sql_tmpl => $SQL_TMPL->{2},
 );
 is($dbi->user, 'a', "$test : user");
 is($dbi->database, 'a', "$test : database");
 is($dbi->password, 'b', "$test : password");
 is($dbi->data_source, 'c', "$test : data_source");
-is_deeply($dbi->dbi_options, {d => 1, e => 2}, "$test : dbi_options");
+is_deeply($dbi->options, {d => 1, e => 2}, "$test : options");
 is_deeply({$dbi->filters}, {f => 3}, "$test : filters");
 is_deeply({$dbi->formats}, {f => 3}, "$test : formats");
 is($dbi->bind_filter, 'f', "$test : bind_filter");
 is($dbi->fetch_filter, 'g', "$test : fetch_filter");
 is($dbi->result_class, 'h', "$test : result_class");
-is($dbi->sql_template->tag_start, 2, "$test : sql_template");
+is($dbi->sql_tmpl->tag_start, 2, "$test : sql_tmpl");
 isa_ok($dbi, 'DBIx::Custom');
 
 
@@ -218,3 +218,15 @@ $dbi->fetch_filter('b');
 $dbi->filter_off;
 ok(!$dbi->bind_filter,  "$test : bind_filter  off");
 ok(!$dbi->fetch_filter, "$test : fetch_filter off");
+
+__END__
+test 'Accessor';
+$dbi = DBIx::Custom->new;
+$dbi->options(opt1 => 1, opt2 => 2);
+is_deeply(scalar $dbi->options, {opt1 => 1, opt2 => 2}, "$test : options");
+
+$dbi->no_bind_filters('a', 'b');
+is_deeply(scalar $dbi->no_bind_filters, ['a', 'b'], "$test: no_bind_filters");
+
+$dbi->no_fetch_filters('a', 'b');
+is_deeply(scalar $dbi->no_fetch_filters, ['a', 'b'], "$test: no_fetch_filters");

t/dbi-custom-mysql-private.t → t/dbix-custom-mysql-private.t

View

File renamed without changes.

t/dbi-custom-mysql-timeformat.t → t/dbix-custom-mysql-timeformat.t

View

File renamed without changes.

t/dbi-custom-query.t → t/dbix-custom-query.t

View

File renamed without changes.

t/dbi-custom-result-sqlite.t → t/dbix-custom-result-sqlite.t

View

File renamed without changes.

t/dbi-custom-sql-template.t → t/dbix-custom-sql-template.t

View

File renamed without changes.

t/dbi-custom-sqlite-timeformat.t → t/dbix-custom-sqlite-timeformat.t

View

File renamed without changes.

t/dbi-custom-sqlite.t → t/dbix-custom-sqlite.t

View

File renamed without changes.

t/pod-coverage.t 1000644 → 1000755

View

File mode changed.

t/pod.t 1000644 → 1000755

View

File mode changed.

...	...	@@ -8,12 +8,7 @@ use Encode qw/decode encode/;
8	8	my $class = __PACKAGE__;
9	9
10	10	$class->add_filter(
11		- encode_utf8 => sub {
12		- my $value = shift;
13		- return $value unless defined $value;
14		- utf8::upgrade($value) unless Encode::is_utf8($value);
15		- return encode('UTF-8', $value);
16		- },
	11	+ encode_utf8 => sub { encode('UTF-8', shift) },
17	12	decode_utf8 => sub { decode('UTF-8', shift) }
18	13	);
19	14
...	...	@@ -57,9 +52,6 @@ Please see L<DBIx::Custom> documentation
57	52
58	53	Encode and decode utf8 filter on
59	54
60		- $self = $self->utf8_filter_on;
61		-
62		- # Sample
63	55	$dbi->utf8_filter_on;
64	56
65	57	This equel to
...	...	@@ -71,7 +63,9 @@ This equel to
71	63
72	64	=head2 encode_utf8
73	65
74		- # Encode to UTF-8 byte stream (utf8::upgrade is done if need)
	66	+Encode internal string to UTF-8 byte stream
	67	+If need, utf8::upgrade is also done.
	68	+
75	69	$dbi->filters->{encode_utf8}->($value);
76	70
77	71	This filter is generally used as bind filter
...	...	@@ -80,7 +74,7 @@ This filter is generally used as bind filter
80	74
81	75	=head2 decode_utf8
82	76
83		- # Decode to perl internal string
	77	+Decode UTF-8 byte stream to internal string
84	78	$dbi->filters->{decode_utf8}->($value);
85	79
86	80	This filter is generally used as fetch filter

...	...	@@ -53,24 +53,9 @@ DBIx::Custom::MySQL - DBIx::Custom MySQL implementation
53	53
54	54	# New
55	55	my $dbi = DBIx::Custom::MySQL->new(user => 'taro', $password => 'kliej&@K',
56		- database => 'sample_db');
57		- # Insert
58		- $dbi->insert('books', {title => 'perl', author => 'taro'});
59		-
60		- # Update
61		- # same as 'update books set title = 'aaa', author = 'ken' where id = 5;
62		- $dbi->update('books', {title => 'aaa', author => 'ken'}, {id => 5});
63		-
64		- # Delete
65		- $dbi->delete('books', {author => 'taro'});
66		-
67		- # select * from books;
68		- $dbi->select('books');
69		-
70		- # select * from books where ahthor = 'taro';
71		- $dbi->select('books', {author => 'taro'});
	56	+ database => 'sample_db');
72	57
73		-=head1 See DBIx::Custom and DBI::Custom::Basic documentation at first
	58	+=head1 See DBIx::Custom and DBIx::Custom::Basic documentation at first
74	59
75	60	This class is L<DBIx::Custom::Basic> subclass,
76	61	and L<DBIx::Custom::Basic> is L<DBIx::Custom> subclass.
...	...	@@ -84,20 +69,18 @@ Please see L<DBIx::Custom::Basic> and <DBIx::Custom> documentation.
84	69
85	70	Connect to database
86	71
87		- $self = $self->connect;
88		-
89		- # Sample
90		- $dbi->connect;
	72	+ $self->connect;
91	73
92	74	This override L<DBIx::Custom> connect.
93	75
94		-If you set database, host, or port, data source is automatically created and connect
	76	+If you set database, host, or port, data source is automatically created.
95	77
96	78	=head2 last_insert_id
97	79
98		- $last_insert_id = $self->last_insert_id;
99		-
100		- # Sample
	80	+ $last_insert_id = $dbi->last_insert_id;
	81	+
	82	+The folloing is last_insert_id sample.
	83	+
101	84	$dbi->insert('books', {title => 'Perl', author => 'taro'});
102	85	$last_insert_id = $dbi->last_insert_id;
103	86

...	...	@@ -27,20 +27,19 @@ Object::Simple->build_class;
27	27	DBIx::Custom::Query - DBIx::Custom query
28	28
29	29	=head1 SYNOPSIS
30		-
31		- # Create query
32		- my $dbi = DBIx::Custom->new;
33		- my $query = $dbi->create_query($template);
34	30
35		- # Set query attributes
	31	+ # New
	32	+ my $query = DBIx::Custom::Query->new;
	33	+
	34	+ # Create by using create_query
	35	+ my $query = DBIx::Custom->create_query($template);
	36	+
	37	+ # Set attributes
36	38	$query->bind_filter($dbi->filters->{default_bind_filter});
37	39	$query->no_bind_filters('title', 'author');
38	40
39	41	$query->fetch_filter($dbi->filters->{default_fetch_filter});
40	42	$query->no_fetch_filters('title', 'author');
41		-
42		- # Execute query
43		- $dbi->execute($query, $params);
44	43
45	44	=head1 Accessors
46	45
...	...	@@ -48,50 +47,50 @@ DBIx::Custom::Query - DBIx::Custom query
48	47
49	48	Set and get statement handle
50	49
51		- $self = $self->sth($sql);
52		- $sth = $self->sth;
	50	+ $query = $query->sth($sth);
	51	+ $sth = $query->sth;
53	52
54	53	=head2 sql
55	54
56	55	Set and get SQL
57	56
58		- $self = $self->sql($sql);
59		- $sql = $self->sql;
	57	+ $query = $query->sql($sql);
	58	+ $sql = $query->sql;
60	59
61	60	=head2 bind_filter
62	61
63	62	Set and get bind filter
64	63
65		- $self = $self->bind_filter($bind_filter);
66		- $bind_filter = $self->bind_filter;
	64	+ $query = $query->bind_filter($bind_filter);
	65	+ $bind_filter = $query->bind_filter;
67	66
68	67	=head2 no_bind_filters
69	68
70	69	Set and get keys of no filtering
71	70
72		- $self = $self->no_bind_filters($no_filters);
73		- $no_bind_filters = $self->no_bind_filters;
	71	+ $query = $query->no_bind_filters($no_filters);
	72	+ $no_bind_filters = $query->no_bind_filters;
74	73
75	74	=head2 fetch_filter
76	75
77	76	Set and get fetch filter
78	77
79		- $self = $self->fetch_filter($fetch_filter);
80		- $fetch_filter = $self->fetch_filter;
	78	+ $query = $query->fetch_filter($fetch_filter);
	79	+ $fetch_filter = $query->fetch_filter;
81	80
82	81	=head2 no_fetch_filters
83	82
84	83	Set and get keys of no filtering
85	84
86		- $self = $self->no_fetch_filters($no_filters);
87		- $no_fetch_filters = $self->no_fetch_filters;
	85	+ $query = $query->no_fetch_filters($no_filters);
	86	+ $no_fetch_filters = $query->no_fetch_filters;
88	87
89	88	=head2 key_infos
90	89
91	90	Set and get key informations
92	91
93		- $self = $self->key_infos($key_infos);
94		- $key_infos = $self->key_infos;
	92	+ $query = $query->key_infos($key_infos);
	93	+ $key_infos = $query->key_infos;
95	94
96	95	=head1 AUTHOR
97	96

...	...	@@ -201,12 +201,16 @@ DBIx::Custom::Result - DBIx::Custom Resultset
201	201
202	202	=head1 Synopsis
203	203
204		- # $result is DBIx::Custom::Result object
205		- my $dbi = DBIx::Custom->new;
206		- my $result = $dbi->query($sql_template, $param);
	204	+ my $result = $dbi->query($query);
207	205
208		- while (my ($val1, $val2) = $result->fetch) {
209		- # do something
	206	+ # Fetch
	207	+ while (my @row = $result->fetch) {
	208	+ # Do something
	209	+ }
	210	+
	211	+ # Fetch hash
	212	+ while (my %row = $result->fetch_hash) {
	213	+ # Do something
210	214	}
211	215
212	216	=head1 Accessors
...	...	@@ -215,24 +219,21 @@ DBIx::Custom::Result - DBIx::Custom Resultset
215	219
216	220	Set and Get statement handle
217	221
218		- $self = $result->sth($sth);
219		- $sth = $reuslt->sth
	222	+ $result = $result->sth($sth);
	223	+ $sth = $reuslt->sth
220	224
221		- # Sample
222		- $dbi->sth->errstr
223		-
224	225	=head2 fetch_filter
225	226
226	227	Set and Get fetch filter
227	228
228		- $self = $result->fetch_filter($sth);
229		- $fetch_filter = $result->fech_filter;
	229	+ $result = $result->fetch_filter($sth);
	230	+ $fetch_filter = $result->fech_filter;
230	231
231	232	=head2 no_fetch_filters
232	233
233	234	Set and Get no filter keys when fetching
234	235
235		- $self = $result->no_fetch_filters($no_fetch_filters);
	236	+ $result = $result->no_fetch_filters($no_fetch_filters);
236	237	$no_fetch_filters = $result->no_fetch_filters;
237	238
238	239	=head1 Methods
...	...	@@ -241,10 +242,11 @@ Set and Get no filter keys when fetching
241	242
242	243	Fetch a row
243	244
244		- $row = $self->fetch; # array reference
245		- @row = $self->fecth; # array
	245	+ $row = $result->fetch; # array reference
	246	+ @row = $result->fecth; # array
	247	+
	248	+The following is fetch sample
246	249
247		- # Sample
248	250	while (my $row = $result->fetch) {
249	251	# do something
250	252	my $val1 = $row->[0];
...	...	@@ -255,10 +257,11 @@ Fetch a row
255	257
256	258	Fetch row as hash
257	259
258		- $row = $self->fetch_hash; # hash reference
259		- %row = $self->fetch_hash; # hash
	260	+ $row = $result->fetch_hash; # hash reference
	261	+ %row = $result->fetch_hash; # hash
	262	+
	263	+The following is fetch_hash sample
260	264
261		- # Sample
262	265	while (my $row = $result->fetch_hash) {
263	266	# do something
264	267	my $val1 = $row->{key1};
...	...	@@ -269,10 +272,11 @@ Fetch row as hash
269	272
270	273	Fetch only first row(Scalar context)
271	274
272		- $row = $self->fetch_first; # array reference
273		- @row = $self->fetch_first; # array
	275	+ $row = $result->fetch_first; # array reference
	276	+ @row = $result->fetch_first; # array
274	277
275		- # Sample
	278	+The following is fetch_first sample
	279	+
276	280	$row = $result->fetch_first;
277	281
278	282	This method fetch only first row and finish statement handle
...	...	@@ -281,10 +285,11 @@ This method fetch only first row and finish statement handle
281	285
282	286	Fetch only first row as hash
283	287
284		- $row = $self->fetch_hash_first; # hash reference
285		- %row = $self->fetch_hash_first; # hash
	288	+ $row = $result->fetch_hash_first; # hash reference
	289	+ %row = $result->fetch_hash_first; # hash
286	290
287		- # Sample
	291	+The following is fetch_hash_first sample
	292	+
288	293	$row = $result->fetch_hash_first;
289	294
290	295	This method fetch only first row and finish statement handle
...	...	@@ -293,10 +298,11 @@ This method fetch only first row and finish statement handle
293	298
294	299	Fetch rows
295	300
296		- $rows = $self->fetch_rows($row_count); # array ref of array ref
297		- @rows = $self->fetch_rows($row_count); # array of array ref
	301	+ $rows = $result->fetch_rows($row_count); # array ref of array ref
	302	+ @rows = $result->fetch_rows($row_count); # array of array ref
298	303
299		- # Sample
	304	+The following is fetch_rows sample
	305	+
300	306	while(my $rows = $result->fetch_rows(10)) {
301	307	# do someting
302	308	}
...	...	@@ -305,10 +311,11 @@ Fetch rows
305	311
306	312	Fetch rows as hash
307	313
308		- $rows = $self->fetch_hash_rows($row_count); # array ref of hash ref
309		- @rows = $self->fetch_hash_rows($row_count); # array of hash ref
	314	+ $rows = $result->fetch_hash_rows($row_count); # array ref of hash ref
	315	+ @rows = $result->fetch_hash_rows($row_count); # array of hash ref
310	316
311		- # Sample
	317	+The following is fetch_hash_rows sample
	318	+
312	319	while(my $rows = $result->fetch_hash_rows(10)) {
313	320	# do someting
314	321	}
...	...	@@ -317,31 +324,31 @@ Fetch rows as hash
317	324
318	325	Fetch all rows
319	326
320		- $rows = $self->fetch_all; # array ref of array ref
321		- @rows = $self->fecth_all; # array of array ref
	327	+ $rows = $result->fetch_all; # array ref of array ref
	328	+ @rows = $result->fecth_all; # array of array ref
	329	+
	330	+The following is fetch_all sample
322	331
323		- # Sample
324	332	my $rows = $result->fetch_all;
325	333
326	334	=head2 fetch_hash_all
327	335
328	336	Fetch all row as array ref of hash ref (Scalar context)
329	337
330		- $rows = $self->fetch_hash_all; # array ref of hash ref
331		- @rows = $self->fecth_all_hash; # array of hash ref
	338	+ $rows = $result->fetch_hash_all; # array ref of hash ref
	339	+ @rows = $result->fecth_all_hash; # array of hash ref
	340	+
	341	+The following is fetch_hash_all sample
332	342
333		- # Sample
334	343	my $rows = $result->fetch_hash_all;
335	344
336	345	=head2 error
337	346
338	347	Get error infomation
339	348
340		- $error_messege = $self->error;
341		- ($error_message, $error_number, $error_state) = $self->error;
	349	+ $error_messege = $result->error;
	350	+ ($error_message, $error_number, $error_state) = $result->error;
342	351
343		- # Sample
344		- $error = $result->error;
345	352
346	353	You can get get information. This is same as the following.
347	354
...	...	@@ -353,10 +360,6 @@ You can get get information. This is same as the following.
353	360
354	361	Finish statement handle
355	362
356		- $ret_val = $self->finish
357		-
358		- # Sample
359		- my $row = $reuslt->fetch; # fetch a row
360	363	$result->finish
361	364
362	365	This is equel to

...	...	@@ -486,19 +486,6 @@ DBIx::Custom::SQL::Template - DBIx::Custom SQL Template
486	486	my $param = {k1 => 1, k2 => 2, k3 => 3};
487	487
488	488	my $query = $sql_template->create_query($tmpl);
489		-
490		-
491		- # Using query from DBIx::Custom
492		- use DBIx::Custom;
493		- my $dbi = DBI->new(
494		- data_source => $data_source,
495		- user => $user,
496		- password => $password,
497		- dbi_options => {PrintError => 0, RaiseError => 1}
498		- );
499		-
500		- $query = $dbi->create_query($tmpl); # This is SQL::Template create_query
501		- $dbi->query($query, $param);
502	489
503	490	=head1 Accessors
504	491
...	...	@@ -506,65 +493,34 @@ DBIx::Custom::SQL::Template - DBIx::Custom SQL Template
506	493
507	494	Set and get tag processors
508	495
509		- # For object
510		- $self = $self->tag_processors($tag_processors);
511		- $tag_processors = $self->tag_processors;
512		-
513		- # For class
514		- $class = $class->tag_processors($tag_processors);
515		- $tag_processors = $class->tag_processors;
516		-
517		- # Sample
518		- $placeholder_tag_processor = $sql_tmpl->tag_processor->{'?'};
	496	+ $sql_tmpl = $sql_tmpl->tag_processors($name1 => $tag_processor1
	497	+ $name2 => $tag_processor2);
	498	+ $tag_processors = $sql_tmpl->tag_processors;
519	499
520	500	=head2 tag_start
521	501
522	502	Set and get start tag
523	503
524		- # For object
525		- $self = $self->tag_start($tag_start);
526		- $tag_start = $self->tag_start;
527		-
528		- # For class
529		- $class = $class->tag_start($tag_start);
530		- $tag_start = $class->tag_start;
531		-
532		- # Sample
533		- $sql_tmpl->tag_start('{');
	504	+ $sql_tmpl = $sql_tmpl->tag_start('{');
	505	+ $tag_start = $sql_tmpl->tag_start;
534	506
535		-Default is '{'
	507	+tag_start default is '{'
536	508
537	509	=head2 tag_end
538	510
539	511	Set and get end tag
540	512
541		- # For object
542		- $self = $self->tag_start($tag_end);
543		- $tag_end = $self->tag_start;
544		-
545		- # For class
546		- $self = $self->tag_start($tag_end);
547		- $tag_end = $self->tag_start;
548		-
549		- # Sample
550		- $sql_tmpl->tag_start('}');
	513	+ $sql_tmpl = $sql_tmpl->tag_start('}');
	514	+ $tag_end = $sql_tmpl->tag_start;
551	515
552		-Default is '}'
	516	+tag_start default is '}'
553	517
554	518	=head2 tag_syntax
555	519
556	520	Set and get tag syntax
557	521
558		- # For object
559		- $self = $self->tag_syntax($tag_syntax);
560		- $tag_syntax = $self->tag_syntax;
561		-
562		- # For class
563		- $class = $class->tag_syntax($tag_syntax);
564		- $tag_syntax = $class->tag_syntax;
565		-
566		- # Sample
567		- $syntax = $sql_tmpl->tag_syntax;
	522	+ $sql_tmpl = $sql_tmpl->tag_syntax($tag_syntax);
	523	+ $tag_syntax = $sql_tmpl->tag_syntax;
568	524
569	525	=head1 Methods
570	526
...	...	@@ -572,7 +528,7 @@ Set and get tag syntax
572	528
573	529	Create L<DBIx::Custom::Query> object parsing SQL template
574	530
575		- $query = $self->create_query($tmpl);
	531	+ $query = $sql_tmpl->create_query($tmpl);
576	532
577	533	# Sample
578	534	$query = $sql_tmpl->create_sql(
...	...	@@ -603,13 +559,10 @@ query has two infomation
603	559
604	560	Add tag processor
605	561
606		- # For object
607		- $self = $self->add_tag_processor($tag_processor);
608		-
609		- # For class
610		- $class = $class->add_tag_processor($tag_processor);
611		-
612		- # Sample
	562	+ $sql_tmpl = $sql_tmpl->add_tag_processor($tag_processor);
	563	+
	564	+The following is add_tag_processor sample
	565	+
613	566	$sql_tmpl->add_tag_processor(
614	567	'?' => sub {
615	568	my ($tag_name, $tag_args) = @_;
...	...	@@ -646,7 +599,7 @@ If you want to know more, Please see DBIx::Custom::SQL::Template source code.
646	599
647	600	Clone DBIx::Custom::SQL::Template object
648	601
649		- $clone = $self->clone;
	602	+ $clone = $sql_tmpl->clone;
650	603
651	604	=head1 Available Tags
652	605
...	...	@@ -668,15 +621,18 @@ Available Tags
668	621	{insert} (key1, key2, key3) values (?, ?, ?)
669	622	{update} set key1 = ?, key2 = ?, key3 = ?
670	623
671		- # Sample
	624	+
	625	+The following is insert SQL sample
	626	+
672	627	$query = $sql_tmpl->create_sql(
673	628	"insert into table {insert key1 key2}"
674	629	);
	630	+
675	631	# Expanded
676	632	$query->sql : "insert into table (key1, key2) values (?, ?)"
	633	+
	634	+The following is update SQL sample
677	635
678		-
679		- # Sample
680	636	$query = $sql_tmpl->create_sql(
681	637	"update table {update key1 key2} where {= key3}"
682	638	);

...	...	@@ -72,30 +72,10 @@ DBIx::Custom::SQLite - DBIx::Custom SQLite implementation
72	72	my $dbi = DBIx::Custom::SQLite->new(user => 'taro', $password => 'kliej&@K',
73	73	database => 'sample');
74	74
75		- # Insert
76		- $dbi->insert('books', {title => 'perl', author => 'taro'});
	75	+ # Connect memory database
	76	+ my $dbi->connect_memory;
77	77
78		- # Update
79		- # same as 'update books set title = 'aaa', author = 'ken' where id = 5;
80		- $dbi->update('books', {title => 'aaa', author => 'ken'}, {id => 5});
81		-
82		- # Delete
83		- $dbi->delete('books', {author => 'taro'});
84		-
85		- # select * from books;
86		- $dbi->select('books');
87		-
88		- # select * from books where ahthor = 'taro';
89		- $dbi->select('books', {author => 'taro'});
90		-
91		- # select author, title from books where author = 'taro'
92		- $dbi->select('books', [qw/author title/], {author => 'taro'});
93		-
94		- # select author, title from books where author = 'taro' order by id limit 1;
95		- $dbi->select('books', [qw/author title/], {author => 'taro'},
96		- 'order by id limit 1');
97		-
98		-=head1 See DBIx::Custom and DBI::Custom::Basic documentation at first
	78	+=head1 See DBIx::Custom and DBIx::Custom::Basic documentation at first
99	79
100	80	This class is L<DBIx::Custom::Basic> subclass.
101	81	and L<DBIx::Custom::Basic> is L<DBIx::Custom> subclass
...	...	@@ -103,46 +83,36 @@ and L<DBIx::Custom::Basic> is L<DBIx::Custom> subclass
103	83	You can use all methods of L<DBIx::Custom::Basic> and <DBIx::Custom>
104	84	Please see L<DBIx::Custom::Basic> and <DBIx::Custom> documentation
105	85
106		-=head1 methods
	86	+=head1 Methods
107	87
108	88	=head2 connect
109	89
110	90	Connect to database
111	91
112		- $self = $self->connect;
113		-
114		- # Sample
115	92	$dbi->connect;
116	93
117		-This override L<DBIx::Custom> connect.
118		-
119		-If you set database, data source is automatically created and connect
	94	+If you set database, host, or port, data source is automatically created.
120	95
121	96	=head2 connect_memory
122	97
123	98	Connect memory database
124	99
125		- $self = $self->connect_memory;
126		-
127		- # Sample
128	100	$dbi->connect_memory;
129	101
130	102	=head2 reconnect_memory
131	103
132	104	Reconnect to memory databsse
133	105
134		- $self = $self->reconnect_memory;
135		-
136		- # Sample
137		- $self = $dbi->reconnect_memory;
	106	+ $dbi->reconnect_memory;
138	107
139	108	=head2 last_insert_id
140	109
141	110	Get last insert id
142	111
143		- $last_insert_id = $self->last_insert_id;
	112	+ $last_insert_id = $dbi->last_insert_id;
144	113
145		- # Sample
	114	+The folloing is last_insert_id sample.
	115	+
146	116	$dbi->insert('books', {title => 'Perl', author => 'taro'});
147	117	$last_insert_id = $dbi->last_insert_id;
148	118

...	...	@@ -26,19 +26,19 @@ $dbi = DBIx::Custom->new(
26	26	database => 'a',
27	27	password => 'b',
28	28	data_source => 'c',
29		- dbi_options => {d => 1, e => 2},
	29	+ options => {d => 1, e => 2},
30	30	filters => {
31	31	f => 3,
32	32	},
33	33	bind_filter => 'f',
34	34	fetch_filter => 'g',
35	35	result_class => 'g',
36		- sql_template => $SQL_TMPL->{0},
	36	+ sql_tmpl => $SQL_TMPL->{0},
37	37	);
38	38	is_deeply($dbi,{user => 'a', database => 'a', password => 'b', data_source => 'c',
39		- dbi_options => {d => 1, e => 2}, filters => {f => 3}, bind_filter => 'f',
	39	+ options => {d => 1, e => 2}, filters => {f => 3}, bind_filter => 'f',
40	40	fetch_filter => 'g', result_class => 'g',
41		- sql_template => $SQL_TMPL->{0}}, $test);
	41	+ sql_tmpl => $SQL_TMPL->{0}}, $test);
42	42	isa_ok($dbi, 'DBIx::Custom');
43	43
44	44
...	...	@@ -52,7 +52,7 @@ test 'Sub class constructor';
52	52	->database('a')
53	53	->password('b')
54	54	->data_source('c')
55		- ->dbi_options({d => 1, e => 2})
	55	+ ->options({d => 1, e => 2})
56	56	->filters(
57	57	f => 3
58	58	)
...	...	@@ -62,7 +62,7 @@ test 'Sub class constructor';
62	62	->bind_filter('f')
63	63	->fetch_filter('g')
64	64	->result_class('DBIx::Custom::Result')
65		- ->sql_template($SQL_TMPL->{0})
	65	+ ->sql_tmpl($SQL_TMPL->{0})
66	66	;
67	67	}
68	68	$dbi = DBIx::Custom::T1->new(
...	...	@@ -70,7 +70,7 @@ $dbi = DBIx::Custom::T1->new(
70	70	database => 'ao',
71	71	password => 'bo',
72	72	data_source => 'co',
73		- dbi_options => {do => 10, eo => 20},
	73	+ options => {do => 10, eo => 20},
74	74	filters => {
75	75	fo => 30,
76	76	},
...	...	@@ -80,19 +80,19 @@ $dbi = DBIx::Custom::T1->new(
80	80	bind_filter => 'fo',
81	81	fetch_filter => 'go',
82	82	result_class => 'ho',
83		- sql_template => $SQL_TMPL->{0},
	83	+ sql_tmpl => $SQL_TMPL->{0},
84	84	);
85	85	is($dbi->user, 'ao', "$test : user");
86	86	is($dbi->database, 'ao', "$test : database");
87	87	is($dbi->password, 'bo', "$test : passowr");
88	88	is($dbi->data_source, 'co', "$test : data_source");
89		-is_deeply($dbi->dbi_options, {do => 10, eo => 20}, "$test : dbi_options");
	89	+is_deeply($dbi->options, {do => 10, eo => 20}, "$test : options");
90	90	is_deeply(scalar $dbi->filters, {fo => 30}, "$test : filters");
91	91	is_deeply(scalar $dbi->formats, {fo => 30}, "$test : formats");
92	92	is($dbi->bind_filter, 'fo', "$test : bind_filter");
93	93	is($dbi->fetch_filter, 'go', "$test : fetch_filter");
94	94	is($dbi->result_class, 'ho', "$test : result_class");
95		-is($dbi->sql_template->tag_start, 0, "$test : sql_template");
	95	+is($dbi->sql_tmpl->tag_start, 0, "$test : sql_tmpl");
96	96	isa_ok($dbi, 'DBIx::Custom::T1');
97	97
98	98	test 'Sub class constructor default';
...	...	@@ -101,13 +101,13 @@ is($dbi->user, 'a', "$test : user");
101	101	is($dbi->database, 'a', "$test : database");
102	102	is($dbi->password, 'b', "$test : password");
103	103	is($dbi->data_source, 'c', "$test : data_source");
104		-is_deeply($dbi->dbi_options, {d => 1, e => 2}, "$test : dbi_options");
	104	+is_deeply($dbi->options, {d => 1, e => 2}, "$test : options");
105	105	is_deeply({$dbi->filters}, {f => 3}, "$test : filters");
106	106	is_deeply({$dbi->formats}, {f => 3}, "$test : formats");
107	107	is($dbi->bind_filter, 'f', "$test : bind_filter");
108	108	is($dbi->fetch_filter, 'g', "$test : fetch_filter");
109	109	is($dbi->result_class, 'DBIx::Custom::Result', "$test : result_class");
110		-is($dbi->sql_template->tag_start, 0, "$test : sql_template");
	110	+is($dbi->sql_tmpl->tag_start, 0, "$test : sql_tmpl");
111	111	isa_ok($dbi, 'DBIx::Custom::T1');
112	112
113	113
...	...	@@ -121,13 +121,13 @@ is($dbi->user, 'a', "$test : user");
121	121	is($dbi->database, 'a', "$test : database");
122	122	is($dbi->password, 'b', "$test : passowrd");
123	123	is($dbi->data_source, 'c', "$test : data_source");
124		-is_deeply($dbi->dbi_options, {d => 1, e => 2}, "$test : dbi_options");
	124	+is_deeply($dbi->options, {d => 1, e => 2}, "$test : options");
125	125	is_deeply(scalar $dbi->filters, {f => 3}, "$test : filters");
126	126	is_deeply(scalar $dbi->formats, {f => 3}, "$test : formats");
127	127	is($dbi->bind_filter, 'f', "$test : bind_filter");
128	128	is($dbi->fetch_filter, 'g', "$test : fetch_filter");
129	129	is($dbi->result_class, 'DBIx::Custom::Result', "$test : result_class");
130		-is($dbi->sql_template->tag_start, 0, "$test sql_template");
	130	+is($dbi->sql_tmpl->tag_start, 0, "$test sql_tmpl");
131	131	isa_ok($dbi, 'DBIx::Custom::T1_2');
132	132
133	133
...	...	@@ -141,7 +141,7 @@ test 'Customized sub class constructor default';
141	141	->database('ao')
142	142	->password('bo')
143	143	->data_source('co')
144		- ->dbi_options({do => 10, eo => 20})
	144	+ ->options({do => 10, eo => 20})
145	145	->filters(
146	146	fo => 30
147	147	)
...	...	@@ -151,7 +151,7 @@ test 'Customized sub class constructor default';
151	151	->bind_filter('fo')
152	152	->fetch_filter('go')
153	153	->result_class('ho')
154		- ->sql_template($SQL_TMPL->{1})
	154	+ ->sql_tmpl($SQL_TMPL->{1})
155	155	;
156	156	}
157	157	$dbi = DBIx::Custom::T1_3->new;
...	...	@@ -159,13 +159,13 @@ is($dbi->user, 'ao', "$test : user");
159	159	is($dbi->database, 'ao', "$test : database");
160	160	is($dbi->password, 'bo', "$test : password");
161	161	is($dbi->data_source, 'co', "$test : data_source");
162		-is_deeply($dbi->dbi_options, {do => 10, eo => 20}, "$test : dbi_options");
	162	+is_deeply($dbi->options, {do => 10, eo => 20}, "$test : options");
163	163	is_deeply(scalar $dbi->filters, {fo => 30}, "$test : filters");
164	164	is_deeply(scalar $dbi->formats, {fo => 30}, "$test : formats");
165	165	is($dbi->bind_filter, 'fo', "$test : bind_filter");
166	166	is($dbi->fetch_filter, 'go', "$test : fetch_filter");
167	167	is($dbi->result_class, 'ho', "$test : result_class");
168		-is($dbi->sql_template->tag_start, 1, "$test : sql_template");
	168	+is($dbi->sql_tmpl->tag_start, 1, "$test : sql_tmpl");
169	169	isa_ok($dbi, 'DBIx::Custom::T1_3');
170	170
171	171
...	...	@@ -175,7 +175,7 @@ $dbi = DBIx::Custom::T1_3->new(
175	175	database => 'a',
176	176	password => 'b',
177	177	data_source => 'c',
178		- dbi_options => {d => 1, e => 2},
	178	+ options => {d => 1, e => 2},
179	179	filters => {
180	180	f => 3,
181	181	},
...	...	@@ -185,19 +185,19 @@ $dbi = DBIx::Custom::T1_3->new(
185	185	bind_filter => 'f',
186	186	fetch_filter => 'g',
187	187	result_class => 'h',
188		- sql_template => $SQL_TMPL->{2},
	188	+ sql_tmpl => $SQL_TMPL->{2},
189	189	);
190	190	is($dbi->user, 'a', "$test : user");
191	191	is($dbi->database, 'a', "$test : database");
192	192	is($dbi->password, 'b', "$test : password");
193	193	is($dbi->data_source, 'c', "$test : data_source");
194		-is_deeply($dbi->dbi_options, {d => 1, e => 2}, "$test : dbi_options");
	194	+is_deeply($dbi->options, {d => 1, e => 2}, "$test : options");
195	195	is_deeply({$dbi->filters}, {f => 3}, "$test : filters");
196	196	is_deeply({$dbi->formats}, {f => 3}, "$test : formats");
197	197	is($dbi->bind_filter, 'f', "$test : bind_filter");
198	198	is($dbi->fetch_filter, 'g', "$test : fetch_filter");
199	199	is($dbi->result_class, 'h', "$test : result_class");
200		-is($dbi->sql_template->tag_start, 2, "$test : sql_template");
	200	+is($dbi->sql_tmpl->tag_start, 2, "$test : sql_tmpl");
201	201	isa_ok($dbi, 'DBIx::Custom');
202	202
203	203
...	...	@@ -218,3 +218,15 @@ $dbi->fetch_filter('b');
218	218	$dbi->filter_off;
219	219	ok(!$dbi->bind_filter, "$test : bind_filter off");
220	220	ok(!$dbi->fetch_filter, "$test : fetch_filter off");
	221	+
	222	+__END__
	223	+test 'Accessor';
	224	+$dbi = DBIx::Custom->new;
	225	+$dbi->options(opt1 => 1, opt2 => 2);
	226	+is_deeply(scalar $dbi->options, {opt1 => 1, opt2 => 2}, "$test : options");
	227	+
	228	+$dbi->no_bind_filters('a', 'b');
	229	+is_deeply(scalar $dbi->no_bind_filters, ['a', 'b'], "$test: no_bind_filters");
	230	+
	231	+$dbi->no_fetch_filters('a', 'b');
	232	+is_deeply(scalar $dbi->no_fetch_filters, ['a', 'b'], "$test: no_fetch_filters");