@@ -1,3 +1,8 @@

+0.1401

+  renamed fetch_rows to fetch_multi

+  renamed fetch_hash_rows to fetch_hash_multi

+0.1301

+  Changed many(not backword compatible)

 0.1201

   Changed many(not backword compatible)

 0.1101

@@ -627,15 +627,15 @@ sub _add_query_cache {

 =head1 NAME

-DBIx::Custom - Customizable DBI

+DBIx::Custom - DBI with hash bind and filtering system 

 =head1 VERSION

-Version 0.1201

+Version 0.1301

 =cut

-our $VERSION = '0.1201';

+our $VERSION = '0.1301';

 =head1 STATE

@@ -658,17 +658,31 @@ This module is not stable. Method name and functionality will be change.

     $dbi->insert('books', {title => 'perl', author => 'Ken'});

     # Update 

-    $dbi->update('books', {title => 'aaa', author => 'Ken'}, {id => 5});

+    $dbi->update('books', {title => 'aaa', author => 'Ken'}, {where => {id => 5}});

     # Delete

-    $dbi->delete('books', {author => 'Ken'});

+    $dbi->delete('books', {where => {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');

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

+    my $result = $dbi->select('books', {where => {author => 'taro'}}); 

+    

+    my $result = $dbi->select(

+       'books', 

+       {

+           columns => [qw/author title/],

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

+        }

+    );

+    

+    my $result = $dbi->select(

+        'books',

+        {

+            columns => [qw/author title/],

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

+            append  => 'order by id limit 1'

+        }

+    );

 =head1 ATTRIBUTES

@@ -1,82 +0,0 @@

-package DBIx::Custom::KeyInfo;

-

-use strict;

-use warnings;

-

-use base 'Object::Simple';

-

-__PACKAGE__->attr([qw/column id table pos/]);

-

-sub new {

-    my $self = shift;

-    

-    if (@_ == 1) {

-        $self = $self->SUPER::new;

-        $self->parse($_[0]);

-        return $self;

-    }

-    

-    return $self->SUPER::new(@_);

-}

-

-sub parse {

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

-    

-    # Parse

-    ($key || '') =~ /^(?:(.+?)\.)?(.+?)(?:#(.+))?$/;

-    $self->table($1 || '');

-    $self->column($2 || '');

-    $self->id($3 || '');

-    

-    return $self;

-}

-

-1;

-

-=head1 NAME

-

-DBIx::Custom::KeyInfo - DBIx::Custom column

-

-=head1 SYNOPSIS

-    

-    # New

-    my $key_info = DBIx::Custom::KeyInfo->new;

-    

-    # Parse

-    $key_info->parse('books.author@IDxxx');

-    

-    # Attributes

-    my $name  = $key_info->name;

-    my $table = $key_info->table;

-    my $id    = $key_info->id;

-

-=head1 ATTRIBUTES

-

-=head2 id

-

-    $key_info = $key_info->id($id);

-    $id     = $key_info->id

-

-=head2 name

-

-    $key_info = $key_info->name($name);

-    $name   = $key_info->name

-

-=head2 table

-

-    $key_info = $key_info->table($table);

-    $table  = $key_info->table

-

-=head1 METHODS

-

-=head2 new

-

-    $key_info = DBIx::Custom::KeyInfo->new(\%args);

-    $key_info = DBIx::Custom::KeyInfo->new(%args);

-    $key_info = DBIx::Custom::KeyInfo->new('books.author@where');

-

-=head2 parse

-

-    $key_info->parse('books.author@IDxxx');

-

-=cut

@@ -96,7 +96,7 @@ sub fetch_hash_single {

     return wantarray ? %$row : $row;

 }

-sub fetch_rows {

+sub fetch_multi {

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

     # Not specified Row count

@@ -117,7 +117,7 @@ sub fetch_rows {

     return wantarray ? @$rows : $rows;

 }

-sub fetch_hash_rows {

+sub fetch_hash_multi {

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

     # Not specified Row count

@@ -279,29 +279,29 @@ The following is fetch_hash_single sample

 This method fetch only single row and finish statement handle

-=head2 fetch_rows

+=head2 fetch_multi

 Fetch rows

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

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

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

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

-The following is fetch_rows sample

+The following is fetch_multi sample

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

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

         # do someting

     }

-=head2 fetch_hash_rows

+=head2 fetch_hash_multi

 Fetch rows as hash

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

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

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

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

-The following is fetch_hash_rows sample

+The following is fetch_hash_multi sample

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

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

         # do someting

     }

@@ -1,536 +0,0 @@

-package DBIx::Custom::SQL::Template;

-

-use strict;

-use warnings;

-

-use base 'Object::Simple';

-use Carp 'croak';

-use DBIx::Custom::Query;

-

-__PACKAGE__->attr('table');

-__PACKAGE__->dual_attr('tag_processors', default => sub { {} },

-                                         inherit => 'hash_copy');

-

-__PACKAGE__->dual_attr('tag_start', default => '{', inherit => 'scalar_copy');

-__PACKAGE__->dual_attr('tag_end',   default => '}', inherit => 'scalar_copy');

-

-__PACKAGE__->dual_attr('tag_syntax', inherit => 'scalar_copy');

-

-__PACKAGE__->add_tag_processor(

-    '?'      => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-    '='      => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-    '<>'     => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-    '>'      => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-    '<'      => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-    '>='     => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-    '<='     => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-    'like'   => \&DBIx::Custom::SQL::Template::TagProcessors::expand_basic_tag,

-    'in'     => \&DBIx::Custom::SQL::Template::TagProcessors::expand_in_tag,

-    'insert' => \&DBIx::Custom::SQL::Template::TagProcessors::expand_insert_tag,

-    'update' => \&DBIx::Custom::SQL::Template::TagProcessors::expand_update_tag

-);

-

-__PACKAGE__->tag_syntax(<< 'EOS');

-[tag]                     [expand]

-{? name}                  ?

-{= name}                  name = ?

-{<> name}                 name <> ?

-

-{< name}                  name < ?

-{> name}                  name > ?

-{>= name}                 name >= ?

-{<= name}                 name <= ?

-

-{like name}               name like ?

-{in name number}          name in [?, ?, ..]

-

-{insert key1 key2} (key1, key2) values (?, ?)

-{update key1 key2}    set key1 = ?, key2 = ?

-EOS

-

-

-sub add_tag_processor {

-    my $invocant = shift;

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

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

-    return $invocant;

-}

-

-sub clone {

-    my $self = shift;

-    my $new = $self->new;

-    

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

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

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

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

-    

-    return $new;

-}

-

-sub create_query {

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

-    

-    # Parse template

-    my $tree = $self->_parse_template($template);

-    

-    # Build query

-    my $query = $self->_build_query($tree);

-    

-    return $query;

-}

-

-sub _parse_template {

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

-    

-    my $table = '';

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

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

-        $template = $template->[1];

-    }

-    $template ||= '';

-    

-    my $tree = [];

-    

-    # Tags

-    my $tag_start = quotemeta $self->tag_start;

-    my $tag_end   = quotemeta $self->tag_end;

-    

-    # Tokenize

-    my $state = 'text';

-    

-    # Save original template

-    my $original_template = $template;

-    

-    # Parse template

-    while ($template =~ s/([^$tag_start]*?)$tag_start([^$tag_end].*?)$tag_end//sm) {

-        my $text = $1;

-        my $tag  = $2;

-        

-        # Parse tree

-        push @$tree, {type => 'text', tag_args => [$text]} if $text;

-        

-        if ($tag) {

-            # Get tag name and arguments

-            my ($tag_name, @tag_args) = split /\s+/, $tag;

-            

-            # Tag processor is exist?

-            unless ($self->tag_processors->{$tag_name}) {

-                my $tag_syntax = $self->tag_syntax;

-                croak("Tag '{$tag}' in SQL template is not exist.\n\n" .

-                      "<SQL template tag syntax>\n" .

-                      "$tag_syntax\n" .

-                      "<Your SQL template>\n" .

-                      "$original_template\n\n");

-            }

-            

-            # Check tag arguments

-            foreach my $tag_arg (@tag_args) {

-                # Cannot cantain placehosder '?'

-                croak("Tag '{t }' arguments cannot contain '?'")

-                  if $tag_arg =~ /\?/;

-            }

-            

-            # Add tag to parsing tree

-            push @$tree, {type => 'tag', tag_name => $tag_name, tag_args => [@tag_args]};

-        }

-    }

-    

-    # Add text to parsing tree 

-    push @$tree, {type => 'text', tag_args => [$template]} if $template;

-    

-    return $tree;

-}

-

-sub _build_query {

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

-    

-    # SQL

-    my $sql = '';

-    

-    # All parameter key infomation

-    my $all_key_infos = [];

-    

-    # Build SQL 

-    foreach my $node (@$tree) {

-        

-        # Get type, tag name, and arguments

-        my $type     = $node->{type};

-        my $tag_name = $node->{tag_name};

-        my $tag_args = $node->{tag_args};

-        

-        # Text

-        if ($type eq 'text') {

-            # Join text

-            $sql .= $tag_args->[0];

-        }

-        

-        # Tag

-        elsif ($type eq 'tag') {

-            

-            # Get tag processor

-            my $tag_processor = $self->tag_processors->{$tag_name};

-            

-            # Tag processor is code ref?

-            croak("Tag processor '$tag_name' must be code reference")

-              unless ref $tag_processor eq 'CODE';

-            

-            # Expand tag using tag processor

-            my ($expand, $key_infos)

-              = $tag_processor->($tag_name, $tag_args, $self->table || '');

-            

-            # Check tag processor return value

-            croak("Tag processor '$tag_name' must return (\$expand, \$key_infos)")

-              if !defined $expand || ref $key_infos ne 'ARRAY';

-            

-            # Check placeholder count

-            croak("Placeholder count in SQL created by tag processor '$tag_name' " .

-                  "must be same as key informations count")

-              unless $self->_placeholder_count($expand) eq @$key_infos;

-            

-            # Add key information

-            push @$all_key_infos, @$key_infos;

-            

-            # Join expand tag to SQL

-            $sql .= $expand;

-        }

-    }

-    

-    # Add semicolon

-    $sql .= ';' unless $sql =~ /;$/;

-    

-    # Query

-    my $query = DBIx::Custom::Query->new(sql => $sql, key_infos => $all_key_infos);

-    

-    return $query;

-}

-

-sub _placeholder_count {

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

-    $expand ||= '';

-    

-    my $count = 0;

-    my $pos   = -1;

-    while (($pos = index($expand, '?', $pos + 1)) != -1) {

-        $count++;

-    }

-    return $count;

-}

-

-1;

-

-package DBIx::Custom::SQL::Template::TagProcessors;

-

-use strict;

-use warnings;

-

-use Carp 'croak';

-use DBIx::Custom::KeyInfo;

-

-sub expand_basic_tag {

-    my ($tag_name, $tag_args, $table) = @_;

-    

-    # Key

-    my $key = $tag_args->[0];

-    

-    # Key is not exist

-    croak("You must be pass key as argument to tag '{$tag_name }'")

-      unless $key;

-    

-    # Key info

-    my $key_info = DBIx::Custom::KeyInfo->new($key);

-    $key_info->table($table) unless $key_info->table;

-

-    # Expanded tag

-    my $column = $key_info->table

-               ? $key_info->table . '.' . $key_info->column

-               : $key_info->column;

-    my $expand = $tag_name eq '?'

-               ? '?'

-               : "$column $tag_name ?";

-

-    return ($expand, [$key_info]);

-}

-

-sub expand_in_tag {

-    my ($tag_name, $tag_args, $table) = @_;

-    my ($key, $placeholder_count) = @$tag_args;

-    

-    # Key must be specified

-    croak("You must be pass key as first argument of tag '{$tag_name }'\n" . 

-          "Usage: {$tag_name \$key \$placeholder_count}")

-      unless $key;

-    

-    # Place holder count must be specified

-    croak("You must be pass placeholder count as second argument of tag '{$tag_name }'\n" . 

-          "Usage: {$tag_name \$key \$placeholder_count}")

-      if !$placeholder_count || $placeholder_count =~ /\D/;

-

-    # Expand tag

-    my $key_info = DBIx::Custom::KeyInfo->new($key);

-    my $column = $key_info->table

-               ? $key_info->table . '.' . $key_info->column

-               : $key_info->column;

-

-    my $expand = "$column $tag_name (";

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

-        $expand .= '?, ';

-    }

-    

-    $expand =~ s/, $//;

-    $expand .= ')';

-    

-    # Create parameter key infomations

-    my $key_infos = [];

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

-        

-        # Add parameter key infos

-        my $key_info = DBIx::Custom::KeyInfo->new($key);

-        $key_info->table($table) unless $key_info->table;

-        $key_info->pos($i);

-        push @$key_infos, $key_info;

-    }

-    

-    return ($expand, $key_infos);

-}

-

-sub expand_insert_tag {

-    my ($tag_name, $tag_args, $table) = @_;

-    my $keys = $tag_args;

-    

-    # Insert key (k1, k2, k3, ..)

-    my $insert_keys = '(';

-    

-    # placeholder (?, ?, ?, ..)

-    my $place_holders = '(';

-    

-    foreach my $key (@$keys) {

-        # Get table and clumn name

-        my $key_info = DBIx::Custom::KeyInfo->new($key);

-        my $column   = $key_info->column;

-        

-        # Join insert column

-        $insert_keys   .= "$column, ";

-        

-        # Join place holder

-        $place_holders .= "?, ";

-    }

-    

-    # Delete last ', '

-    $insert_keys =~ s/, $//;

-    

-    # Close 

-    $insert_keys .= ')';

-    $place_holders =~ s/, $//;

-    $place_holders .= ')';

-    

-    # Expand tag

-    my $expand = "$insert_keys values $place_holders";

-    

-    # Create parameter key infomations

-    my $key_infos = [];

-    foreach my $key (@$keys) {

-        my $key_info = DBIx::Custom::KeyInfo->new($key);

-        $key_info->table($table) unless $key_info->table;

-        push @$key_infos, $key_info;

-    }

-    

-    return ($expand, $key_infos);

-}

-

-sub expand_update_tag {

-    my ($tag_name, $tag_args, $table) = @_;

-    my $keys = $tag_args;

-    

-    # Expanded tag

-    my $expand = 'set ';

-    

-    foreach my $key (@$keys) {

-        # Get table and clumn name

-        my $key_info = DBIx::Custom::KeyInfo->new($key);

-        my $column = $key_info->column;

-

-        # Join key and placeholder

-        $expand .= "$column = ?, ";

-    }

-    

-    # Delete last ', '

-    $expand =~ s/, $//;

-    

-    my $key_infos = [];

-    foreach my $key (@$keys) {

-        my $key_info = DBIx::Custom::KeyInfo->new($key);

-        $key_info->table($table) unless $key_info->table;

-        push @$key_infos, $key_info;

-    }

-    

-    return ($expand, $key_infos);

-}

-

-package DBIx::Custom::SQL::Template;

-

-1;

-

-=head1 NAME

-

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

-

-=head1 SYNOPSIS

-    

-    my $sql_tmpl = DBIx::Custom::SQL::Template->new;

-    

-    my $tmpl   = "select from table {= k1} && {<> k2} || {like k3}";

-    my $param = {k1 => 1, k2 => 2, k3 => 3};

-    

-    my $query = $sql_template->create_query($tmpl);

-

-=head1 ATTRIBUTES

-

-=head2 tag_processors

-

-    $sql_tmpl       = $sql_tmpl->tag_processors($name1 => $tag_processor1

-                                                $name2 => $tag_processor2);

-    $tag_processors = $sql_tmpl->tag_processors;

-

-=head2 tag_start

-    

-    $sql_tmpl  = $sql_tmpl->tag_start('{');

-    $tag_start = $sql_tmpl->tag_start;

-

-Default is '{'

-

-=head2 tag_end

-    

-    $sql_tmpl    = $sql_tmpl->tag_start('}');

-    $tag_end = $sql_tmpl->tag_start;

-

-Default is '}'

-    

-=head2 tag_syntax

-    

-    $sql_tmpl   = $sql_tmpl->tag_syntax($tag_syntax);

-    $tag_syntax = $sql_tmpl->tag_syntax;

-

-=head1 METHODS

-

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

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

-

-=head2 create_query

-    

-Create L<DBIx::Custom::Query> object parsing SQL template

-

-    $query = $sql_tmpl->create_query($tmpl);

-    

-    # Sample

-    $query = $sql_tmpl->create_sql(

-         "select * from table where {= title} && {like author} || {<= price}")

-    

-    # Expanded

-    $qeury->sql : "select * from table where title = ? && author like ? price <= ?;"

-    $query->key_infos : [['title'], ['author'], ['price']]

-    

-    # Sample with table name

-    ($sql, @bind_values) = $sql_tmpl->create_sql(

-            "select * from table where {= table.title} && {like table.author}",

-            {table => {title => 'Perl', author => '%Taro%'}}

-        )

-    

-    # Expanded

-    $query->sql : "select * from table where table.title = ? && table.title like ?;"

-    $query->key_infos :[ [['table.title'],['table', 'title']],

-                         [['table.author'],['table', 'author']] ]

-

-This method create query using by L<DBIx::Custom>.

-query has two infomation

-

-    1. sql       : SQL

-    2. key_infos : Parameter access key information

-

-=head2 add_tag_processor

-

-Add tag processor

-    

-    $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) = @_;

-            

-            my $key1 = $tag_args->[0];

-            my $key2 = $tag_args->[1];

-            

-            my $key_infos = [];

-            

-            # Expand tag and create key informations

-            

-            # Return expand tags and key informations

-            return ($expand, $key_infos);

-        }

-    );

-

-Tag processor recieve 2 argument

-

-    1. Tag name            (?, =, <>, or etc)

-    2. Tag arguments       (arg1 and arg2 in {tag_name arg1 arg2})

-

-Tag processor return 2 value

-

-    1. Expanded Tag (For exsample, '{= title}' is expanded to 'title = ?')

-    2. Key infomations

-    

-You must be return expanded tag and key infomations.

-

-Key information is a little complex. so I will explan this in future.

-

-If you want to know more, Please see DBIx::Custom::SQL::Template source code.

-

-=head2 clone

-

-Clone DBIx::Custom::SQL::Template object

-

-    $clone = $sql_tmpl->clone;

-    

-=head1 Available Tags

-    

-Available Tags

-

-    [tag]            [expand]

-    {? name}         ?

-    {= name}         name = ?

-    {<> name}        name <> ?

-    

-    {< name}         name < ?

-    {> name}         name > ?

-    {>= name}        name >= ?

-    {<= name}        name <= ?

-    

-    {like name}      name like ?

-    {in name}        name in [?, ?, ..]

-    

-    {insert}         (key1, key2, key3) values (?, ?, ?)

-    {update}         set key1 = ?, key2 = ?, key3 = ?

-    

-

-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

-    

-    $query = $sql_tmpl->create_sql(

-        "update table {update key1 key2} where {= key3}"

-    );

-    

-    # Expanded

-    $query->sql : "update table set key1 = ?, key2 = ? where key3 = ?;"

-    

-=cut

-

@@ -111,75 +111,75 @@ is_deeply({@row}, {key1 => 1, key2 => 2}, "$test : row");

 ok(!@row, "$test : finished");

-test 'fetch_rows';

+test 'fetch_multi';

 $dbh->do("insert into table1 (key1, key2) values ('5', '6');");

 $dbh->do("insert into table1 (key1, key2) values ('7', '8');");

 $dbh->do("insert into table1 (key1, key2) values ('9', '10');");

 $result = query($dbh, $sql);

-$rows = $result->fetch_rows(2);

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

 is_deeply($rows, [[1, 2],

-                  [3, 4]], "$test : fetch_rows first");

-$rows = $result->fetch_rows(2);

+                  [3, 4]], "$test : fetch_multi first");

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

 is_deeply($rows, [[5, 6],

-                  [7, 8]], "$test : fetch_rows secound");

-$rows = $result->fetch_rows(2);

-is_deeply($rows, [[9, 10]], "$test : fetch_rows third");

-$rows = $result->fetch_rows(2);

+                  [7, 8]], "$test : fetch_multi secound");

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

+is_deeply($rows, [[9, 10]], "$test : fetch_multi third");

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

 ok(!$rows);

-test 'fetch_rows list context';

+test 'fetch_multi list context';

 $result = query($dbh, $sql);

-@rows = $result->fetch_rows(2);

+@rows = $result->fetch_multi(2);

 is_deeply([@rows], [[1, 2],

-                  [3, 4]], "$test : fetch_rows first");

-@rows = $result->fetch_rows(2);

+                  [3, 4]], "$test : fetch_multi first");

+@rows = $result->fetch_multi(2);

 is_deeply([@rows], [[5, 6],

-                  [7, 8]], "$test : fetch_rows secound");

-@rows = $result->fetch_rows(2);

-is_deeply([@rows], [[9, 10]], "$test : fetch_rows third");

-@rows = $result->fetch_rows(2);

+                  [7, 8]], "$test : fetch_multi secound");

+@rows = $result->fetch_multi(2);

+is_deeply([@rows], [[9, 10]], "$test : fetch_multi third");

+@rows = $result->fetch_multi(2);

 ok(!@rows);

-test 'fetch_rows error';

+test 'fetch_multi error';

 $result = query($dbh, $sql);

-eval {$result->fetch_rows};

+eval {$result->fetch_multi};

 like($@, qr/Row count must be specified/, "$test : Not specified row count");

-test 'fetch_hash_rows';

+test 'fetch_hash_multi';

 $result = query($dbh, $sql);

-$rows = $result->fetch_hash_rows(2);

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

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

-                  {key1 => 3, key2 => 4}], "$test : fetch_rows first");

-$rows = $result->fetch_hash_rows(2);

+                  {key1 => 3, key2 => 4}], "$test : fetch_multi first");

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

 is_deeply($rows, [{key1 => 5, key2 => 6},

-                  {key1 => 7, key2 => 8}], "$test : fetch_rows secound");

-$rows = $result->fetch_hash_rows(2);

-is_deeply($rows, [{key1 => 9, key2 => 10}], "$test : fetch_rows third");

-$rows = $result->fetch_hash_rows(2);

+                  {key1 => 7, key2 => 8}], "$test : fetch_multi secound");

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

+is_deeply($rows, [{key1 => 9, key2 => 10}], "$test : fetch_multi third");

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

 ok(!$rows);

-test 'fetch_rows list context';

+test 'fetch_multi list context';

 $result = query($dbh, $sql);

-@rows = $result->fetch_hash_rows(2);

+@rows = $result->fetch_hash_multi(2);

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

-                    {key1 => 3, key2 => 4}], "$test : fetch_rows first");

-@rows = $result->fetch_hash_rows(2);

+                    {key1 => 3, key2 => 4}], "$test : fetch_multi first");

+@rows = $result->fetch_hash_multi(2);

 is_deeply([@rows], [{key1 => 5, key2 => 6},

-                    {key1 => 7, key2 => 8}], "$test : fetch_rows secound");

-@rows = $result->fetch_hash_rows(2);

-is_deeply([@rows], [{key1 => 9, key2 => 10}], "$test : fetch_rows third");

-@rows = $result->fetch_hash_rows(2);

+                    {key1 => 7, key2 => 8}], "$test : fetch_multi secound");

+@rows = $result->fetch_hash_multi(2);

+is_deeply([@rows], [{key1 => 9, key2 => 10}], "$test : fetch_multi third");

+@rows = $result->fetch_hash_multi(2);

 ok(!@rows);

 $dbh->do("delete from table1 where key1 = 5 or key1 = 7 or key1 = 9");

-test 'fetch_rows error';

+test 'fetch_multi error';

 $result = query($dbh, $sql);

-eval {$result->fetch_hash_rows};

+eval {$result->fetch_hash_multi};

 like($@, qr/Row count must be specified/, "$test : Not specified row count");

@@ -1,15 +0,0 @@

-#!perl -T

-

-use Test::More tests => 7;

-

-BEGIN {

-	use_ok( 'DBIx::Custom' );

-	use_ok( 'DBIx::Custom::Basic' );

-	use_ok( 'DBIx::Custom::MySQL' );

-	use_ok( 'DBIx::Custom::Query' );

-	use_ok( 'DBIx::Custom::Result' );

-	use_ok( 'DBIx::Custom::SQLTemplate' );

-	use_ok( 'DBIx::Custom::SQLite' );

-}

-

-diag( "Testing DBIx::Custom $DBIx::Custom::VERSION, Perl $], $^X" );

@@ -1,51 +0,0 @@

-#!perl -T

-

-use strict;

-use warnings;

-use Test::More tests => 3;

-

-sub not_in_file_ok {

-    my ($filename, %regex) = @_;

-    open( my $fh, '<', $filename )

-        or die "couldn't open $filename for reading: $!";

-

-    my %violated;

-

-    while (my $line = <$fh>) {

-        while (my ($desc, $regex) = each %regex) {

-            if ($line =~ $regex) {

-                push @{$violated{$desc}||=[]}, $.;

-            }

-        }

-    }

-

-    if (%violated) {

-        fail("$filename contains boilerplate text");

-        diag "$_ appears on lines @{$violated{$_}}" for keys %violated;

-    } else {

-        pass("$filename contains no boilerplate text");

-    }

-}

-

-sub module_boilerplate_ok {

-    my ($module) = @_;

-    not_in_file_ok($module =>

-        'the great new $MODULENAME'   => qr/ - The great new /,

-        'boilerplate description'     => qr/Quick summary of what the module/,

-        'stub function definition'    => qr/function[12]/,

-    );

-}

-

-

-  not_in_file_ok(README =>

-    "The README is used..."       => qr/The README is used/,

-    "'version information here'"  => qr/to provide version information/,

-  );

-

-  not_in_file_ok(Changes =>

-    "placeholder date/time"       => qr(Date/time)

-  );

-

-  module_boilerplate_ok('lib/DBIx/Custom.pm');

-

-

@@ -1,55 +0,0 @@

-use Test::More;

-use strict;

-use warnings;

-use utf8;

-use Encode qw/decode encode/;

-

-BEGIN {

-    eval { require DBD::SQLite; 1 }

-        or plan skip_all => 'DBD::SQLite required';

-    eval { DBD::SQLite->VERSION >= 1 }

-        or plan skip_all => 'DBD::SQLite >= 1.00 required';

-

-    plan 'no_plan';

-    use_ok('DBIx::Custom');

-}

-

-# Function for test name

-my $test;

-sub test {

-    $test = shift;

-}

-

-# Constant varialbes for test

-my $CREATE_TABLE = {

-    0 => 'create table table1 (key1 char(255), key2 char(255));',

-    1 => 'create table table1 (key1 char(255), key2 char(255), key3 char(255), key4 char(255), key5 char(255));',

-    2 => 'create table table2 (key1 char(255), key3 char(255));'

-};

-

-my $SELECT_TMPL = {

-    0 => 'select * from table1;'

-};

-

-my $DROP_TABLE = {

-    0 => 'drop table table1'

-};

-

-my $NEW_ARGS = {

-    0 => {data_source => 'dbi:SQLite:dbname=:memory:'}

-};

-

-# Variables for test

-my $dbi;

-my $decoded_str;

-my $encoded_str;

-my $array;

-my $ret_val;

-

-use DBIx::Custom::Basic;

-

-test 'Filter';

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

-ok($dbi->filters->{encode_utf8}, "$test : exists default_bind_filter");

-ok($dbi->filters->{decode_utf8}, "$test : exists default_fetch_filter");

-

@@ -1,67 +0,0 @@

-use Test::More;

-use strict;

-use warnings;

-

-BEGIN {

-    eval { require Time::Piece; 1 }

-        or plan skip_all => 'Time::Piece required';

-    

-    eval { Time::Piece->VERSION >= 1.15 }

-        or plan skip_all => 'Time::Piece >= 1.15 requred';

-        

-    plan 'no_plan';

-    use_ok('DBIx::Custom');

-}

-

-# Function for test name

-my $test;

-sub test {

-    $test = shift;

-}

-

-# Varialbe for tests

-

-my $format;

-my $data;

-my $timepiece;

-my $dbi;

-

-use DBIx::Custom::Basic;

-

-

-test 'SQL99 format';

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

-$data   = '2009-01-02 03:04:05';

-$format = $dbi->formats->{'SQL99_datetime'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%Y-%m-%d'), '2009-01-02', "$test : datetime date");

-is($timepiece->strftime('%H:%M:%S'), '03:04:05',  "$test : datetime time");

-

-$data   = '2009-01-02';

-$format = $dbi->formats->{'SQL99_date'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%Y-%m-%d'), '2009-01-02', "$test : date");

-

-$data   = '03:04:05';

-$format = $dbi->formats->{'SQL99_time'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%H:%M:%S'), '03:04:05',  "$test : time");

-

-

-test 'ISO-8601 format';

-$data   = '2009-01-02T03:04:05';

-$format = $dbi->formats->{'ISO-8601_datetime'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%Y-%m-%d'), '2009-01-02', "$test : datetime date");

-is($timepiece->strftime('%H:%M:%S'), '03:04:05',  "$test : datetime time");

-

-$data   = '2009-01-02';

-$format = $dbi->formats->{'ISO-8601_date'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%Y-%m-%d'), '2009-01-02', "$test : date");

-

-$data   = '03:04:05';

-$format = $dbi->formats->{'ISO-8601_time'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%H:%M:%S'), '03:04:05',  "$test : time");

-

@@ -1,36 +0,0 @@

-use Test::More;

-use strict;

-use warnings;

-

-# user password database

-our ($USER, $PASSWORD, $DATABASE) = connect_info();

-

-plan skip_all => 'private MySQL test' unless $USER;

-

-plan 'no_plan';

-

-use DBIx::Custom;

-use Scalar::Util 'blessed';

-{

-    my $dbi = DBIx::Custom->new(

-        user => $USER,

-        password => $PASSWORD,

-        data_source => "dbi:mysql:dbname=$DATABASE"

-    );

-    $dbi->connect;

-    

-    ok(blessed $dbi->dbh);

-    can_ok($dbi->dbh, qw/prepare/);

-}

-

-sub connect_info {

-    my $file = 'password.tmp';

-    open my $fh, '<', $file

-      or return;

-    

-    my ($user, $password, $database) = split(/\s/, (<$fh>)[0]);

-    

-    close $fh;

-    

-    return ($user, $password, $database);

-}

@@ -1,127 +0,0 @@

-use Test::More 'no_plan';

-use strict;

-use warnings;

-

-use DBIx::Custom;

-use DBIx::Custom::SQLTemplate;

-

-# Function for test name

-my $test;

-sub test {

-    $test = shift;

-}

-

-# Variables for test

-our $SQL_TMPL = {

-    0 => DBIx::Custom::SQLTemplate->new->tag_start(0),

-    1 => DBIx::Custom::SQLTemplate->new->tag_start(1),

-    2 => DBIx::Custom::SQLTemplate->new->tag_start(2)

-};

-my $dbi;

-

-

-test 'Constructor';

-$dbi = DBIx::Custom->new(

-    user => 'a',

-    database => 'a',

-    password => 'b',

-    data_source => 'c',

-    options => {d => 1, e => 2},

-    filters => {

-        f => 3,

-    },

-    default_bind_filter => 'f',

-    default_fetch_filter => 'g',

-    result_class => 'g',

-    sql_tmpl => $SQL_TMPL->{0},

-);

-is_deeply($dbi,{user => 'a', database => 'a', password => 'b', data_source => 'c', 

-                options => {d => 1, e => 2}, filters => {f => 3}, default_bind_filter => 'f',

-                default_fetch_filter => 'g', result_class => 'g',

-                sql_tmpl => $SQL_TMPL->{0}}, $test);

-isa_ok($dbi, 'DBIx::Custom');

-

-

-test 'Sub class constructor';

-{

-    package DBIx::Custom::T1;

-    use base 'DBIx::Custom';

-    

-    __PACKAGE__

-      ->filters({f => 3})

-      ->formats({f => 3})

-    ;

-}

-$dbi = DBIx::Custom::T1->new(

-    filters => {

-        fo => 30,

-    },

-    formats => {

-        fo => 30,

-    },

-);

-is_deeply(scalar $dbi->filters, {fo => 30}, "$test : filters");

-is_deeply(scalar $dbi->formats, {fo => 30}, "$test : formats");

-

-test 'Sub class constructor default';

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

-is_deeply($dbi->filters, {f => 3}, "$test : filters");

-is_deeply($dbi->formats, {f => 3}, "$test : formats");

-isa_ok($dbi, 'DBIx::Custom::T1');

-

-

-test 'Sub sub class constructor default';

-{

-    package DBIx::Custom::T1_2;

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

-}

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

-is_deeply(scalar $dbi->filters, {f => 3}, "$test : filters");

-is_deeply(scalar $dbi->formats, {f => 3}, "$test : formats");

-isa_ok($dbi, 'DBIx::Custom::T1_2');

-

-

-test 'Customized sub class constructor default';

-{

-    package DBIx::Custom::T1_3;

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

-    

-    __PACKAGE__

-      ->filters({fo => 30})

-      ->formats({fo => 30})

-    ;

-}

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

-is_deeply(scalar $dbi->filters, {fo => 30}, "$test : filters");

-is_deeply(scalar $dbi->formats, {fo => 30}, "$test : formats");

-isa_ok($dbi, 'DBIx::Custom::T1_3');

-

-

-test 'Customized sub class constructor';

-$dbi = DBIx::Custom::T1_3->new(

-    filters => {

-        f => 3,

-    },

-    formats => {

-        f => 3,

-    },

-);

-is_deeply($dbi->filters, {f => 3}, "$test : filters");

-is_deeply($dbi->formats, {f => 3}, "$test : formats");

-isa_ok($dbi, 'DBIx::Custom');

-

-

-test 'resist_filters';

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

-$dbi->resist_filter(a => sub {1});

-is($dbi->filters->{a}->(), 1, $test);

-

-test 'resist_formats';

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

-$dbi->resist_format(a => sub {1});

-is($dbi->formats->{a}->(), 1, $test);

-

-test 'Accessor';

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

-$dbi->options({opt1 => 1, opt2 => 2});

-is_deeply(scalar $dbi->options, {opt1 => 1, opt2 => 2}, "$test : options");

@@ -1,47 +0,0 @@

-use Test::More;

-use strict;

-use warnings;

-

-# user password database

-our ($USER, $PASSWORD, $DATABASE) = connect_info();

-

-plan skip_all => 'private MySQL test' unless $USER;

-

-plan 'no_plan';

-

-# Function for test name

-my $test;

-sub test {

-    $test = shift;

-}

-

-

-# Functions for tests

-sub connect_info {

-    my $file = 'password.tmp';

-    open my $fh, '<', $file

-      or return;

-    

-    my ($user, $password, $database) = split(/\s/, (<$fh>)[0]);

-    

-    close $fh;

-    

-    return ($user, $password, $database);

-}

-

-

-# Constat variables for tests

-my $CLASS = 'DBIx::Custom::MySQL';

-

-# Varialbes for tests

-my $dbi;

-

-use DBIx::Custom::MySQL;

-

-test 'connect';

-$dbi = $CLASS->new(user => $USER, password => $PASSWORD,

-                    database => $DATABASE);

-$dbi->connect;

-is(ref $dbi->dbh, 'DBI::db', $test);

-

-

@@ -1,85 +0,0 @@

-use Test::More;

-use strict;

-use warnings;

-

-BEGIN {

-    eval { require Time::Piece; 1 }

-        or plan skip_all => 'Time::Piece required';

-    

-    eval { Time::Piece->VERSION >= 1.15 }

-        or plan skip_all => 'Time::Piece >= 1.15 requred';

-        

-    plan 'no_plan';

-    use_ok('DBIx::Custom');

-}

-

-# Function for test name

-my $test;

-sub test {

-    $test = shift;

-}

-

-# Varialbe for tests

-

-my $format;

-my $data;

-my $timepiece;

-my $dbi;

-

-use DBIx::Custom::MySQL;

-

-

-test 'SQL99 format';

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

-$data   = '2009-01-02 03:04:05';

-$format = $dbi->formats->{'SQL99_datetime'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%Y-%m-%d'), '2009-01-02', "$test : datetime date");

-is($timepiece->strftime('%H:%M:%S'), '03:04:05',  "$test : datetime time");

-

-$data   = '2009-01-02';

-$format = $dbi->formats->{'SQL99_date'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%Y-%m-%d'), '2009-01-02', "$test : date");

-

-$data   = '03:04:05';

-$format = $dbi->formats->{'SQL99_time'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%H:%M:%S'), '03:04:05',  "$test : time");

-

-

-test 'ISO-8601 format';

-$data   = '2009-01-02T03:04:05';

-$format = $dbi->formats->{'ISO-8601_datetime'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%Y-%m-%d'), '2009-01-02', "$test : datetime date");

-is($timepiece->strftime('%H:%M:%S'), '03:04:05',  "$test : datetime time");

-

-$data   = '2009-01-02';

-$format = $dbi->formats->{'ISO-8601_date'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%Y-%m-%d'), '2009-01-02', "$test : date");

-

-$data   = '03:04:05';

-$format = $dbi->formats->{'ISO-8601_time'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%H:%M:%S'), '03:04:05',  "$test : time");

-

-

-test 'default format';

-$data   = '2009-01-02 03:04:05';

-$format = $dbi->formats->{'datetime'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%Y-%m-%d'), '2009-01-02', "$test : datetime date");

-is($timepiece->strftime('%H:%M:%S'), '03:04:05',  "$test : datetime time");

-

-$data   = '2009-01-02';

-$format = $dbi->formats->{'date'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%Y-%m-%d'), '2009-01-02', "$test : date");

-

-$data   = '03:04:05';

-$format = $dbi->formats->{'time'};

-$timepiece = Time::Piece->strptime($data, $format);

-is($timepiece->strftime('%H:%M:%S'), '03:04:05',  "$test : time");

-

@@ -1,29 +0,0 @@

-use Test::More 'no_plan';

-

-use strict;

-use warnings;

-use DBIx::Custom::Query;

-

-# Function for test name

-my $test;

-sub test{

-    $test = shift;

-}

-

-# Variables for test

-my $query;

-

-test 'Accessors';

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

-    sql              => 'a',

-    key_infos        => 'b',

-    query_filter      => 'c',

-    sth              => 'e',

-    fetch_filter     => 'f',

-);

-

-is($query->sql, 'a', "$test : sql");

-is($query->key_infos, 'b', "$test : key_infos ");

-is($query->query_filter, 'c', "$test : query_filter");

-is($query->sth, 'e', "$test : sth");

-

@@ -1,248 +0,0 @@

-use Test::More;

-use strict;

-use warnings;

-use DBI;

-

-BEGIN {

-    eval { require DBD::SQLite; 1 }

-        or plan skip_all => 'DBD::SQLite required';

-    eval { DBD::SQLite->VERSION >= 1 }

-        or plan skip_all => 'DBD::SQLite >= 1.00 required';

-

-    plan 'no_plan';

-    use_ok('DBIx::Custom::Result');

-}

-

-my $test;

-sub test {

-    $test = shift;

-}

-

-sub query {

-    my ($dbh, $sql) = @_;

-    my $sth = $dbh->prepare($sql);

-    $sth->execute;

-    return DBIx::Custom::Result->new(sth => $sth);

-}

-

-my $dbh;

-my $sql;

-my $sth;

-my @row;

-my $row;

-my @rows;

-my $rows;

-my $result;

-my $fetch_filter;

-my @error;

-my $error;

-

-$dbh = DBI->connect('dbi:SQLite:dbname=:memory:', undef, undef, {PrintError => 0, RaiseError => 1});

-$dbh->do("create table table1 (key1 char(255), key2 char(255));");

-$dbh->do("insert into table1 (key1, key2) values ('1', '2');");

-$dbh->do("insert into table1 (key1, key2) values ('3', '4');");

-

-$sql = "select key1, key2 from table1";

-

-test 'fetch scalar context';

-$result = query($dbh, $sql);

-@rows = ();

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

-    push @rows, [@$row];

-}