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

 0.1740

+    - EXPERIMENTAL update_or_insert need id and primary_key option

+      and added option option

     - insert method created_at and updated_at option can receive scalar reference

     - update method updated_at option can receive scalar reference

     - select column option [COLUMN => ALIAS] syntax is DEPRECATED!

@@ -1158,41 +1158,13 @@ sub update {

 sub update_all { shift->update(allow_update_all => 1, @_) };

 sub update_or_insert {

-    my $self = shift;

-

-    # Options

-    my $param  = shift;

-    my %opt = @_;

-    my $id = $opt{id};

-    my $primary_key = $opt{primary_key};

-    $primary_key = [$primary_key] unless ref $primary_key eq 'ARRAY';

-    croak "update_or_insert method need primary_key option " .

-          "when id is specified" . _subname

-      if defined $id && !defined $primary_key;

-    my $table  = $opt{table};

-    croak qq{"table" option must be specified } . _subname

-      unless defined $table;

-    my $select_option = $opt{select_option};

-    my $reuse = $opt{reuse};

-    $opt{select_option}->{reuse} = $opt{reuse} if $opt{reuse};

-    

-    my $rows = $self->select(table => $table, id => $id,

-        primary_key => $primary_key, %$select_option)->all;

-    

-    croak "selected row count must be one or zero" . _subname

-      if @$rows > 1;

-    

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

-    my @opt = (table => $table);

-    push @opt, id => $id, primary_key => $primary_key if defined $id;

-    push @opt, %opt;

-    

-    if ($row) {

-        return $self->update($param, @opt);

-    }

-    else {

-        return $self->insert($param, @opt);

-    }

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

+    croak "update_or_insert method need primary_key and id option "

+      unless defined $opt{id} && defined $opt{primary_key};

+    my $statement_opt = $opt{option} || {};

+    my $row = $self->select(%opt, %{$statement_opt->{select} || {}})->one;

+    return $row ? $self->update($param, %opt, %{$statement_opt->{update} || {}})

+                : $self->insert($param, %opt, %{$statement_opt->{insert} || {}});

 }

 sub update_timestamp {

@@ -3319,34 +3291,48 @@ Options is same as C<update> method.

 =head2 C<update_or_insert EXPERIMENTAL>

-    # Where

-    $dbi->update_or_insert(

-        {id => 1, title => 'Perl'},

-        table => 'book',

-        where => {id => 1},

-        select_option => {append => 'for update'}

-    );

-    

     # ID

     $dbi->update_or_insert(

         {title => 'Perl'},

         table => 'book',

         id => 1,

         primary_key => 'id',

-        select_option => {append => 'for update'}

+        option => {

+            select => {

+                 append => 'for update'

+            }

+        }

     );

-    

+

 Update or insert.

-In both examples, the following SQL is executed.

+C<update_or_insert> method execute C<select> method first to find row.

+If the row is exists, C<update> is executed.

+If not, C<insert> is executed.

-    # In case insert

-    insert into book (id, title) values (?, ?)

-    

-    # In case update

-    update book set (id = ?, title = ?) where book.id = ?

+C<OPTIONS>

+

+C<update_or_insert> method use all common option

+in C<select>, C<update>, C<delete>, and has the following new ones.

+

+=over 4

+

+=item C<option>

+

+    option => {

+        select => {

+            append => '...'

+        },

+        insert => {

+            prefix => '...'

+        },

+        update => {

+            filter => {}

+        }

+    }

-The following opitons are available adding to C<update> option.

+If you want to pass option to each method,

+you can use C<option> option.

 =over 4

@@ -616,6 +616,7 @@ is($row->{$key2}, $row->{$key3});

 test 'update_or_insert';

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1);

+$DB::single = 1;

 $dbi->update_or_insert(

     {$key2 => 2},

     table => $table1,

@@ -634,15 +635,14 @@ $dbi->update_or_insert(

 $rows = $dbi->select(id => 1, table => $table1, primary_key => $key1)->all;

 is_deeply($rows, [{$key1 => 1, $key2 => 3}], "basic");

-eval { $dbi->execute("drop table $table1") };

-$dbi->execute($create_table1);

-$dbi->update_or_insert(

-    {$key1 => 1, $key2 => 2},

-    table => $table1,

-    where => {$key1 => 1}

-);

-$row = $dbi->select(id => 1, table => $table1, primary_key => $key1)->one;

-is_deeply($row, {$key1 => 1, $key2 => 2}, "basic");

+eval {

+    $dbi->update_or_insert(

+        {$key2 => 3},

+        table => $table1,

+    );

+};

+

+like($@, qr/primary_key/);

 test 'default_bind_filter';

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

@@ -47,16 +47,37 @@ $dbi->do('create table table1 (key1 varchar(255), key2 varchar(255)) engine=Inno

 test 'update_or_insert';

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

+$ENV{DBIX_CUSTOM_DEBUG} = 1;

 $dbi->update_or_insert(

-    {key1 => 1, key2 => 2},

+    {key2 => 2},

     table => 'table1',

-    where => {key1 => 1},

-    select_option => {append => 'for update'}

+    id => 1,

+    primary_key => 'key1',

+    option => {

+        select => {append => 'for update'},

+        insert => {append => '    #'},

+        update => {append => '     #'}

+    }

 );

 my $row = $dbi->select(id => 1, table => 'table1', primary_key => 'key1')->one;

 is_deeply($row, {key1 => 1, key2 => 2}, "basic");

+$dbi->update_or_insert(

+    {key2 => 3},

+    table => 'table1',

+    id => 1,

+    primary_key => 'key1',

+    option => {

+        select => {append => 'for update'},

+        insert => {append => '    #'},

+        update => {append => '     #'}

+    }

+);

+

+my $row = $dbi->select(id => 1, table => 'table1', primary_key => 'key1')->one;

+is_deeply($row, {key1 => 1, key2 => 3}, "basic");

+

 # Test memory leaks

 for (1 .. 200) {

     $dbi = DBIx::Custom->connect(