@@ -1,4 +1,5 @@

 0.1667

+    - added EXPERIMENTAL updat_param no_set option.

     - added EXPERIMENTAL reserved_word_quote attribute.

 0.1666

     - removed from cache() and cache_method() document for a while and cache() value

@@ -1,6 +1,6 @@

 package DBIx::Custom;

-our $VERSION = '0.1667';

+our $VERSION = '0.1668';

 use 5.008001;

 use strict;

@@ -655,17 +655,25 @@ sub insert_param {

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

     # Insert parameter tag

-    my @tag;

-    push @tag, '{insert_param';

+    my @names;

+    my @placeholders;

+    

     my $safety = $self->safety_character;

+    my $q = $self->reserved_word_quote;

+    

     foreach my $column (keys %$param) {

         croak qq{"$column" is not safety column name}

           unless $column =~ /^[$safety\.]+$/;

-        push @tag, $column;

+        

+        my $c = "$q$column$q";

+        $c =~ s/\./$q.$q/;

+        

+        push @names, $c;

+        push @placeholders, "{? $c}";

     }

-    push @tag, '}';

-    return join ' ', @tag;

+    return '(' . join(', ', @names) . ') ' . 'values' .

+           ' (' . join(', ', @placeholders) . ')';

 }

 sub include_model {

@@ -731,6 +739,27 @@ sub include_model {

     return $self;

 }

+sub merge_param {

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

+    

+    my $param = {};

+    

+    foreach my $p (@params) {

+        foreach my $column (keys %$p) {

+            if (exists $param->{$column}) {

+                $param->{$column} = [$param->{$column}]

+                  unless ref $param->{$column} eq 'ARRAY';

+                push @{$param->{$column}}, $p->{$column};

+            }

+            else {

+                $param->{$column} = $p->{$column};

+            }

+        }

+    }

+    

+    return $param;

+}

+

 sub method {

     my $self = shift;

@@ -1150,20 +1179,29 @@ sub update_at {

 }

 sub update_param {

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

+    my ($self, $param, $opt) = @_;

+    

+    # Insert parameter tag

+    my @params;

-    # Update parameter tag

-    my @tag;

-    push @tag, '{update_param';

     my $safety = $self->safety_character;

+    my $q = $self->reserved_word_quote;

+    

     foreach my $column (keys %$param) {

         croak qq{"$column" is not safety column name}

           unless $column =~ /^[$safety\.]+$/;

-        push @tag, $column;

+        

+        my $c = "$q$column$q";

+        $c =~ s/\./$q.$q/;

+        

+        push @params, "$c = {? $c}";

     }

-    push @tag, '}';

-    return join ' ', @tag;

+    my $clause;

+    $clause .= 'set ' unless $opt->{no_set};

+    $clause .= join(', ', @params);

+    

+    return $clause;

 }

 sub where {

@@ -2140,7 +2178,7 @@ Place holders are set to 5 and 'Perl'.

 Create insert parameter tag.

-    {insert_param title age}

+    (title, author) values ({? title}, {? author});

 =head2 C<include_model> EXPERIMENTAL

@@ -2190,6 +2228,16 @@ You can get model object by C<model()>.

 See L<DBIx::Custom::Model> to know model features.

+=head2 C<merge_param> EXPERIMENTAL

+

+    my $param = $dbi->merge_param({key1 => 1}, {key1 => 1, key2 => 2});

+

+Merge paramters.

+

+$param:

+

+    {key1 => [1, 1], key2 => 2}

+

 =head2 C<method> EXPERIMENTAL

     $dbi->method(

@@ -2699,7 +2747,16 @@ Place holders are set to 'Perl' and 5.

 Create update parameter tag.

-    {update_param title age}

+    set title = {? title}, author = {? author}

+

+You can create tag without 'set ' by C<no_set> option. This option is EXPERIMENTAL.

+

+    my $update_param = $dbi->update_param(

+        {title => 'a', age => 2}

+        {no_set => 1}

+    );

+

+    title = {? title}, author = {? author}

 =head2 C<where>

@@ -1788,6 +1788,43 @@ is_deeply($rows, [{key1 => 1, key2 => 11, key3 => 3, key4 => 4, key5 => 5},

                   "basic");

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

+$dbi->execute($CREATE_TABLE->{1});

+$dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

+$dbi->insert(table => 'table1', param => {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});

+

+$param = {key2 => 11, key3 => 33};

+$update_param = $dbi->update_param($param);

+$sql = <<"EOS";

+update {table table1} $update_param

+where key1 = 1

+EOS

+$dbi->execute($sql, param => $param);

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

+$rows   = $result->fetch_hash_all;

+is_deeply($rows, [{key1 => 1, key2 => 11, key3 => 33, key4 => 4, key5 => 5},

+                  {key1 => 6, key2 => 7,  key3 => 8, key4 => 9, key5 => 10}],

+                  "basic");

+

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

+$dbi->execute($CREATE_TABLE->{1});

+$dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

+$dbi->insert(table => 'table1', param => {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});

+

+$param = {key2 => 11, key3 => 33};

+$update_param = $dbi->update_param($param, {no_set => 1});

+$sql = <<"EOS";

+update {table table1} set $update_param

+where key1 = 1

+EOS

+$dbi->execute($sql, param => $param);

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

+$rows   = $result->fetch_hash_all;

+is_deeply($rows, [{key1 => 1, key2 => 11, key3 => 33, key4 => 4, key5 => 5},

+                  {key1 => 6, key2 => 7,  key3 => 8, key4 => 9, key5 => 10}],

+                  "update param no_set");

+

+            

 eval { $dbi->update_param({";" => 1}) };

 like($@, qr/not safety/);

@@ -1795,14 +1832,26 @@ like($@, qr/not safety/);

 test 'insert_param';

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

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

-$param = {key1 => 1};

+$param = {key1 => 1, key2 => 2};

 $insert_param = $dbi->insert_param($param);

 $sql = <<"EOS";

 insert into {table table1} $insert_param

 EOS

+$dbi->execute($sql, param => $param);

+is($dbi->select(table => 'table1')->fetch_hash_first->{key1}, 1);

+is($dbi->select(table => 'table1')->fetch_hash_first->{key2}, 2);

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

+$dbi->reserved_word_quote('"');

+$dbi->execute($CREATE_TABLE->{1});

+$param = {key1 => 1, key2 => 2};

+$insert_param = $dbi->insert_param($param);

+$sql = <<"EOS";

+insert into {table table1} $insert_param

+EOS

 $dbi->execute($sql, param => $param);

 is($dbi->select(table => 'table1')->fetch_hash_first->{key1}, 1);

+is($dbi->select(table => 'table1')->fetch_hash_first->{key2}, 2);

 eval { $dbi->insert_param({";" => 1}) };

 like($@, qr/not safety/);

@@ -2044,3 +2093,13 @@ $model = $dbi->create_model(

 );

 $model->method(foo => sub { shift->select(@_) });

 is_deeply($model->foo->fetch_hash_first, {key1 => 1, key3 => 3});

+

+test 'merge_param';

+{

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

+    my $param1 = {key1 => 1, key2 => 2, key3 => 3};

+    my $param2 = {key1 => 1, key2 => 2};

+    my $param3 = {key1 => 1};

+    my $param = $dbi->merge_param($param1, $param2, $param3);

+    is_deeply($param, {key1 => [1, 1, 1], key2 => [2, 2], key3 => 3});

+}