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

+0.1611

+  renamed update tag to update_param

+  renamed insert tag to insert_param

+  renamed sql_builder to query_builder

 0.1610

   added filter_check attribute.

 0.1609

@@ -24,7 +24,7 @@ __PACKAGE__->register_filter(

 );

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

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

+__PACKAGE__->attr(query_builder  => sub {DBIx::Custom::QueryBuilder->new});

 __PACKAGE__->attr(cache => 1);

 __PACKAGE__->attr(cache_method => sub {

@@ -107,7 +107,7 @@ sub insert {

     my @insert_keys = keys %$param;

     # Templte for insert

-    my $source = "insert into $table {insert "

+    my $source = "insert into $table {insert_param "

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

     $source .= " $append" if $append;

@@ -149,7 +149,7 @@ sub update {

       if !@where_keys && !$allow_update_all;

     # Update clause

-    my $update_clause = '{update ' . join(' ', @update_keys) . '}';

+    my $update_clause = '{update_param ' . join(' ', @update_keys) . '}';

     # Where clause

     my $where_clause = '';

@@ -339,7 +339,7 @@ sub create_query {

     unless ($query) {

         # Create SQL object

-        my $builder = $self->sql_builder;

+        my $builder = $self->query_builder;

         # Create query

         $query = eval{$builder->build_query($source)};

@@ -489,7 +489,7 @@ DBIx::Custom - DBI interface, having hash parameter binding and filtering system

 =cut

-our $VERSION = '0.1610';

+our $VERSION = '0.1611';

 =head1 STABILITY

@@ -501,25 +501,25 @@ Method name and implementations will be changed for a while.

 Connect to the database.

     use DBIx::Custom;

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

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

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

 Insert, update, and delete

     # Insert 

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

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

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

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

     # Update 

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

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

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

                  where  => {id => 5},

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

     # Update all

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

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

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

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

     # Delete

@@ -595,7 +595,7 @@ Fetch row.

     }

-=head1 DESCRIPTION

+=head1 DESCRIPTIONS

 =head2 1. Features

@@ -616,33 +616,37 @@ to execute SQL easily.

 L<DBIx::Custom> respects SQL. SQL is very complex and not beautiful,

 but de-facto standard,

 so all people learing database know it.

-If you know SQL,

-you learn a little thing to do your works, using L<DBIx::Custom>

+If you already know SQL,

+you learn a little thing to use L<DBIx::Custom>.

-=head2 1. Connect to the database

+=head2 2. Connect to the database

 C<connect()> method create a new L<DBIx::Custom>

 object and connect to the database.

     use DBIx::Custom;

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

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

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

-If database is SQLite, use L<DBIx::Custom::SQLite>. you connect database easy way.

+If database is SQLite, use L<DBIx::Custom::SQLite> instead.

+you connect database easily.

     use DBIx::Custom::SQLite;

-    my $dbi = DBIx::Custom->connect(database => 'books');

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

 If database is  MySQL, use L<DBIx::Costom::MySQL>.

     use DBIx::Custom::MySQL;

-    my $dbi = DBIx::Custom->connect(database => 'books',

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

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

+        database => 'dbname',

+        user     => 'ken',

+        password => '!LFKD%$&'

+    );

-=head2 2. Suger methods

+=head2 3. Suger methods

 L<DBIx::Custom> has suger methods, such as C<insert()>, C<update()>,

-C<delete()> and C<select()>. If you want to do small works,

+C<delete()> or C<select()>. If you want to do small works,

 You don't have to create SQL statements.

 =head3 insert()

@@ -650,35 +654,35 @@ You don't have to create SQL statements.

 Execute insert statement.

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

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

+                 param  => {title => 'Perl', author => 'Ken'});

 The following SQL is executed.

     insert into (title, author) values (?, ?);

-The values of C<title> and C<author> is embedded into placeholders.

+The values of C<title> and C<author> is embedded into the placeholders.

-C<append> and C<filter> argument can be specified

-to C<insert()> method if you need.

+C<append> and C<filter> argument can be specified.

+See also "METHODS" section.

 =head3 update()

 Execute update statement.

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

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

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

                  where  => {id => 5});

 The following SQL is executed.

     update books set title = ?, author = ?;

-The values of C<title> and C<author> is embedded into placeholders.

+The values of C<title> and C<author> is embedded into the placeholders.

-C<append> and C<filter> argument can be specified

-to C<update()> method if you need.

+C<append> and C<filter> argument can be specified.

+See also "METHOD" section.

-If you want to update all rows, use C<update_all()> method instead.

+If you want to update all rows, use C<update_all()> method.

 =head3 delete()

@@ -693,10 +697,10 @@ The following SQL is executed.

 The value of C<id> is embedded into the placehodler.

-C<append> and C<filter> argument can be specified

-to C<delete()> method if you need.

+C<append> and C<filter> argument can be specified.

+see also "METHODS" section.

-If you want to delete all rows, use C<delete_all()> method instead.

+If you want to delete all rows, use C<delete_all()> method.

 =head3 select()

@@ -709,7 +713,7 @@ The following SQL is executed.

     select * from books;

 the result of C<select()> method is L<DBIx::Custom::Result> object.

-You can fetch row.

+You can fetch a row by C<fetch()> method.

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

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

@@ -717,20 +721,21 @@ You can fetch row.

     }

 L<DBIx::Custom::Result> has various methods to fetch row.

-See "3. Fetch row".

+See "4. Fetch row".

-Specify C<column> and C<where> arguments.

+C<column> and C<where> arguments specified.

     my $result = $dbi->select(

         table  => 'books',

         column => [qw/author title/],

-        where  => {author => 'Ken'});

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

+    );

 The following SQL is executed.

     select author, title from books where author = ?;

-the value of C<author> is embdded into placeholder.

+the value of C<author> is embdded into the placeholder.

 If you want to join tables, specify C<relation> argument. 

@@ -742,13 +747,12 @@ If you want to join tables, specify C<relation> argument.

 The following SQL is executed.

-    select books.name as book_name from books

+    select books.name as book_name from books, rental

     where books.id = rental.book_id;

-C<append> argument add a string to the end of SQL statement.

-You can add "order by" or "limit" cluase.

+If you want to add some string to the end of SQL statement,

+use C<append> argument.

-    # Select, more complex

     my $result = $dbi->select(

         table  => 'books',

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

@@ -759,13 +763,15 @@ The following SQL is executed.

     select * books where author = ? order by price limit 5;

-C<filter> argument can be specified to filter parameters

-if you need.

+C<filter> argument can be specified.

+see also "METHODS" section.

-=head2 3. Fetch row

+=head2 4. Fetch row

 C<select()> method return L<DBIx::Custom::Result> object.

 You can fetch row by various methods.

+Note that in this section, array means array reference,

+and hash meanse hash reference.

 Fetch row into array.

@@ -820,15 +826,15 @@ Fetch all rows into array of hash

     my $rows = $result->fetch_hash_all;

-If you want to access raw statement handle of L<DBI>, use C<sth()> attribute.

+If you want to access statement handle of L<DBI>, use C<sth()> attribute.

     my $sth = $result->sth;

-=head2 4. Hash parameter binding

+=head2 5. Hash parameter binding

 L<DBIx::Custom> provides hash parameter binding.

-At frist, I show normal way of parameter binding.

+At frist, I show normal parameter binding.

     use DBI;

     my $dbh = DBI->connect(...);

@@ -838,10 +844,10 @@ At frist, I show normal way of parameter binding.

     $sth->execute('Ken', '%Perl%');

 This is very good way because database system can enable SQL caching,

-and parameter is quoted automatically, it is secure.

+and parameter is quoted automatically. this is secure.

 L<DBIx::Custom> hash parameter binding system improve

-normal parameter binding way to specify hash parameter.

+normal parameter binding to use hash parameter.

     my $result = $dbi->execute(

         "select * from books where {= author} and {like title};"

@@ -849,15 +855,12 @@ normal parameter binding way to specify hash parameter.

     );

 This is same as the normal way, execpt that the parameter is hash.

-{= author} is called C<tag>. tag is expand to placeholder string internally.

+{= author} and {like title} is called C<tag>.

+tag is expand to placeholder string internally.

     select * from books where {= author} and {like title}

       -> select * from books where author = ? and title like ?;

-The following tags is available.

-

-=head1 Tags

-

 The following tags is available.

     [TAG]                       [REPLACED]

@@ -873,8 +876,8 @@ The following tags is available.

     {like NAME}            ->   NAME like ?

     {in NAME COUNT}        ->   NAME in [?, ?, ..]

-    {insert NAME1 NAME2}   ->   (NAME1, NAME2) values (?, ?)

-    {update NAME1 NAME2}   ->   set NAME1 = ?, NAME2 = ?

+    {insert_param NAME1 NAME2}   ->   (NAME1, NAME2) values (?, ?)

+    {update_param NAME1 NAME2}   ->   set NAME1 = ?, NAME2 = ?

 See also L<DBIx::Custom::QueryBuilder>.

@@ -884,7 +887,7 @@ You can change this tag.

     $dbi->query_builder->start_tag('|');

     $dbi->query_builder->end_tag('|');

-=head2 5. Filtering

+=head2 6. Filtering

 Usually, Perl string is kept as internal string.

 If you want to save the string to database, You must encode the string.

@@ -910,13 +913,16 @@ You can specify these filters to C<filter> argument of C<execute()> method.

         filter => {author => 'to_upper_case, title => 'encode_utf8'}

     );

-you can also specify filter in suger methods, such as select(), update(), update_all,

-delete(), delete_all(), select().

+C<filter> argument can be specified to suger methods, such as

+C<insert()>, C<update()>, C<update_all>,

+C<delete()>, C<delete_all()>, C<select()>.

+    # insert(), having filter argument

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

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

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

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

-

+    

+    # select(), having filter argument

     my $result = $dbi->select(

         table  => 'books',

         column => [qw/author title/],

@@ -929,20 +935,20 @@ Filter works each parmeter, but you prepare default filter for all parameters.

     $dbi->default_bind_filter('encode_utf8');

-C<filter()> argument overwrites the filter specified by C<default_bind_filter()>.

+C<filter()> argument overwrites this default filter.

     $dbi->default_bind_filter('encode_utf8');

     $dbi->insert(

         table  => 'books',

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

+        param  => {title => 'Perl', author => 'Ken', price => 1000},

         filter => {author => 'to_upper_case', price => undef}

     );

-This is same as the following one.

+This is same as the following example.

     $dbi->insert(

         table  => 'books',

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

+        param  => {title => 'Perl', author => 'Ken', price => 1000},

         filter => {title => 'encode_uft8' author => 'to_upper_case'}

     );

@@ -951,12 +957,13 @@ You can also specify filter when the row is fetched. This is reverse of bind fil

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

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

-you can specify C<default_fetch_filter()>.

+Filter works each column value, but you prepare a default filter

+for all clumn value.

     $dbi->default_fetch_filter('decode_utf8');

-C<DBIx::Custom::Result::filter()> overwrites the filter specified

-by C<default_fetch_filter()>

+C<filter()> method of L<DBIx::Custom::Result>

+overwrites this default filter.

     $dbi->default_fetch_filter('decode_utf8');

     my $result = $dbi->select(

@@ -973,21 +980,27 @@ This is same as the following one.

     );

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

-In fetch filter, column name must be lower case even if column conatain upper case charactor. This is requirment not to depend database systems.

+Note that in fetch filter, column names must be lower case

+even if the column name conatains upper case charactors.

+This is requirment not to depend database systems.

-=head2 6. Performance

+=head2 7. Performance

 =head3 Disable filter checking

-C<filter_check> is 1 by defaut. This is useful in debug.

+Filter checking is executed by default.

+This is done to check right filter name is specified,

+but sometimes damage performance.

-This filter check maybe damege performance.

-If you require performance, set C<filter_check> to 0.

+If you disable this filter checking,

+Set C<filter_check> attribute to 0.

-=head3 Using execute() method instead suger methods

+    $dbi->filter_check(0);

-If you execute insert statement by using select() method,

-you sometimes can't meet performance requirment.

+=head3 Use execute() method instead suger methods

+

+If you execute insert statement by C<insert()> method,

+you sometimes can't get required performance.

 C<insert()> method is a little slow because SQL statement and statement handle

 is created every time.

@@ -995,14 +1008,9 @@ is created every time.

 In that case, you can prepare a query by C<create_query()> method.

     my $query = $dbi->create_query(

-        "insert into books {insert title author};"

+        "insert into books {insert_param title author};"

     );

-    # (In the case of update statement)

-    my $query = $dbi->create_query(

-        "update books {update author};";

-    );

-

 Execute query repeatedly

     my $inputs = [

@@ -1051,7 +1059,7 @@ otherwise, called to get cache.

         }

     });

-=head2 7. More features

+=head2 8. More features

 =head3 Get DBI object

@@ -1155,12 +1163,12 @@ Default filter when row is fetched.

 Result class for select statement.

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

-=head2 C<sql_builder>

+=head2 C<query_builder>

-    my $sql_class = $dbi->sql_builder;

-    $dbi          = $dbi->sql_builder(DBIx::Custom::QueryBuilder->new);

+    my $sql_class = $dbi->query_builder;

+    $dbi          = $dbi->query_builder(DBIx::Custom::QueryBuilder->new);

-SQL builder. sql_builder must be 

+SQL builder. C<query_builder()> must be 

 the instance of L<DBIx::Custom::QueryBuilder> subclass.

 Default to L<DBIx::Custom::QueryBuilder> object.

@@ -1359,7 +1367,7 @@ B<Example:>

         appned => 'for update'

     );

-    # select books.name as book_name from books, rental 

+    # select books.name as book_name from books, rental

     # where books.id = rental.book_id;

     my $result = $dbi->select(

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

@@ -11,17 +11,17 @@ use DBIx::Custom::QueryBuilder::TagProcessors;

 __PACKAGE__->dual_attr('tag_processors', default => sub { {} }, inherit => 'hash_copy');

 __PACKAGE__->register_tag_processor(

-    '?'      => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_placeholder_tag,

-    '='      => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_equal_tag,

-    '<>'     => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_not_equal_tag,

-    '>'      => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_greater_than_tag,

-    '<'      => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_lower_than_tag,

-    '>='     => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_greater_than_equal_tag,

-    '<='     => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_lower_than_equal_tag,

-    'like'   => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_like_tag,

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

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

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

+    '?'     => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_placeholder_tag,

+    '='     => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_equal_tag,

+    '<>'    => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_not_equal_tag,

+    '>'     => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_greater_than_tag,

+    '<'     => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_lower_than_tag,

+    '>='    => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_greater_than_equal_tag,

+    '<='    => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_lower_than_equal_tag,

+    'like'  => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_like_tag,

+    'in'    => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_in_tag,

+    'insert_param' => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_insert_param_tag,

+    'update_param' => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_update_param_tag

 );

 __PACKAGE__->attr(tag_start => '{');

@@ -324,12 +324,12 @@ In tag.

 =head2 C<insert>

-Insert tag.

+Insert parameter tag.

-    {insert NAME1 NAME2}   ->   (NAME1, NAME2) values (?, ?)

+    {insert_param NAME1 NAME2}   ->   (NAME1, NAME2) values (?, ?)

 =head2 C<update>

-Updata tag.

+Updata parameter tag.

-    {update NAME1 NAME2}   ->   set NAME1 = ?, NAME2 = ?

+    {update_param NAME1 NAME2}   ->   set NAME1 = ?, NAME2 = ?

@@ -55,10 +55,10 @@ sub expand_in_tag {

     return [$s, $columns];

 }

-sub expand_insert_tag {

+sub expand_insert_param_tag {

     my @columns = @_;

-    # Part of insert statement

+    # Insert parameters

     my $s = '(';

     $s .= "$_, " for @columns;

     $s =~ s/, $//;

@@ -71,10 +71,10 @@ sub expand_insert_tag {

     return [$s, \@columns];

 }

-sub expand_update_tag {

+sub expand_update_param_tag {

     my @columns = @_;

-    # Part of update statement

+    # Update paramters

     my $s = 'set ';

     $s .= "$_ = ?, " for @columns;

     $s =~ s/, $//;

@@ -148,12 +148,12 @@ same as the count of column names.

     ('NAME', 3)  -> ['NAME in (?, ?, ?)', ['NAME', 'NAME', 'NAME']]

-=head2 C<expand_insert_tag>

+=head2 C<expand_insert_param_tag>

     ('NAME1', 'NAME2')

       ->  ['(NAME1, NAME2) values (?, ?, ?)', ['NAME1', 'NAME2']]

-=head2 C<expand_update_tag>

+=head2 C<expand_update_param_tag>

     ('NAME1', 'NAME2')

       ->  ['set NAME1 = ?, NAME2 = ?', ['NAME1', 'NAME2']]

@@ -97,7 +97,7 @@ is_deeply($rows, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}], "$test : fetc

 test 'Insert query return value';

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

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

-$source = "insert into table1 {insert key1 key2}";

+$source = "insert into table1 {insert_param key1 key2}";

 $query = $dbi->create_query($source);

 $ret_val = $dbi->execute($query, param => {key1 => 1, key2 => 2});

 ok($ret_val, $test);

@@ -106,7 +106,7 @@ ok($ret_val, $test);

 test 'Direct query';

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

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

-$insert_tmpl = "insert into table1 {insert key1 key2}";

+$insert_tmpl = "insert into table1 {insert_param key1 key2}";

 $dbi->execute($insert_tmpl, param => {key1 => 1, key2 => 2});

 $result = $dbi->execute($SELECT_TMPLS->{0});

 $rows = $result->fetch_hash_all;

@@ -118,7 +118,7 @@ $dbi->execute($CREATE_TABLE->{0});

 $dbi->register_filter(twice       => sub { $_[0] * 2}, 

                     three_times => sub { $_[0] * 3});

-$insert_tmpl  = "insert into table1 {insert key1 key2};";

+$insert_tmpl  = "insert into table1 {insert_param key1 key2};";

 $insert_query = $dbi->create_query($insert_tmpl);

 $insert_query->filter({key1 => 'twice'});

 $dbi->execute($insert_query, param => {key1 => 1, key2 => 2});

@@ -129,7 +129,7 @@ $dbi->execute($DROP_TABLE->{0});

 test 'Filter in';

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

-$insert_tmpl  = "insert into table1 {insert key1 key2};";

+$insert_tmpl  = "insert into table1 {insert_param key1 key2};";

 $insert_query = $dbi->create_query($insert_tmpl);

 $dbi->execute($insert_query, param => {key1 => 2, key2 => 4});

 $select_tmpl = "select * from table1 where {in table1.key1 2} and {in table1.key2 2}";

@@ -171,7 +171,7 @@ is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$te

 test 'DBIx::Custom::SQLTemplate insert tag';

 $dbi->execute("delete from table1");

-$insert_tmpl = 'insert into table1 {insert key1 key2 key3 key4 key5}';

+$insert_tmpl = 'insert into table1 {insert_param key1 key2 key3 key4 key5}';

 $dbi->execute($insert_tmpl, param => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

 $result = $dbi->execute($SELECT_TMPLS->{0});

@@ -180,11 +180,11 @@ is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$te

 test 'DBIx::Custom::SQLTemplate update tag';

 $dbi->execute("delete from table1");

-$insert_tmpl = "insert into table1 {insert key1 key2 key3 key4 key5}";

+$insert_tmpl = "insert into table1 {insert_param key1 key2 key3 key4 key5}";

 $dbi->execute($insert_tmpl, param => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

 $dbi->execute($insert_tmpl, param => {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});

-$update_tmpl = 'update table1 {update key1 key2 key3 key4} where {= key5}';

+$update_tmpl = 'update table1 {update_param key1 key2 key3 key4} where {= key5}';

 $dbi->execute($update_tmpl, param => {key1 => 1, key2 => 1, key3 => 1, key4 => 1, key5 => 5});

 $result = $dbi->execute($SELECT_TMPLS->{0});