@@ -1,4 +1,8 @@

+0.1731

+    - removed DEPRECATED status from insert method's id option

+    - renamed EXPERIMENTAL insert_or_update to update_or_insert

 0.1730

+    - added EXPERIMENTAL insert_or_update method

     - method method of DBIx::Custom::Model is renamed to helper,

       method is DEPRECATED!

     - method method is renamed to helper, method is DEPRECATED!

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

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.1730';

+our $VERSION = '0.1731';

 use 5.008001;

 use Carp 'croak';

@@ -627,6 +627,7 @@ sub insert {

     my $prefix = delete $args{prefix};

     my $wrap = delete $args{wrap};

     my $timestamp = $args{timestamp};

+    delete $args{where};

     # Timestamp

     if ($timestamp && (my $insert_timestamp = $self->insert_timestamp)) {

@@ -639,7 +640,6 @@ sub insert {

     # Merge parameter

     if (defined $id) {

-        warn "insert method's id option is DEPRECATED!";

         my $id_param = $self->_create_param_from_id($id, $primary_key);

         $param = $self->merge_param($id_param, $param);

     }

@@ -656,6 +656,42 @@ sub insert {

     return $self->execute($sql, $param, table => $table, %args);

 }

+sub update_or_insert {

+    my $self = shift;

+

+    # Arguments

+    my $param  = shift;

+    my %args = @_;

+    my $id = delete $args{id};

+    my $primary_key = delete $args{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  = delete $args{table};

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

+      unless defined $table;

+    my $select_option = delete $args{select_option};

+    

+    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 @options = (table => $table);

+    push @options, id => $id, primary_key => $primary_key if defined $id;

+    push @options, %args;

+    

+    if ($row) {

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

+    }

+    else {

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

+    }

+}

+

 sub insert_timestamp {

     my $self = shift;

@@ -3439,6 +3475,46 @@ Create update parameter tag.

     set title = :title, author = :author

+=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'}

+    );

+    

+Update or insert.

+

+In both examples, the following SQL is executed.

+

+    # In case insert

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

+    

+    # In case update

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

+

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

+

+=over 4

+

+=item C<select_option>

+

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

+

+select method option,

+select method is used to check the row is already exists.

+

 =head2 C<update_timestamp>

     $dbi->update_timestamp(updated_at => sub { localtime });

@@ -12,7 +12,7 @@ use DBIx::Custom;

     package DBIx::Custom;

     no warnings 'redefine';

-    has dbi_option => sub {

+    has option => sub {

         {

             Callbacks => {

               connected => sub {

@@ -538,6 +538,51 @@ $result = $dbi->execute("select * from $table1");

 $rows   = $result->all;

 is($rows->[0]->{$key1}, $rows->[0]->{$key2});

+test 'update_or_insert';

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

+$dbi->execute($create_table1);

+$dbi->update_or_insert(

+    {$key2 => 2},

+    table => $table1,

+    primary_key => $key1,

+    id => 1

+);

+$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,

+    primary_key => $key1,

+    id => 1

+);

+$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");

+

+

+test 'default_bind_filter';

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

+$dbi->register_filter(

+    twice       => sub { $_[0] * 2 },

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

+);

+$dbi->default_bind_filter('twice');

+$dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2}, filter => {$key1 => 'three_times'});

+$result = $dbi->execute("select * from $table1");

+$rows   = $result->all;

+is_deeply($rows, [{$key1 => 3, $key2 => 4}], "filter");

+$dbi->default_bind_filter(undef);

+

 test 'update';

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

 $dbi->execute($create_table1_2);

@@ -34,7 +34,7 @@ my $result;

 test 'connect';

 eval {

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

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

         dsn => "dbi:mysql:database=$database;host=localhost;port=10000",

         user => $user,

         password => $password

@@ -42,6 +42,21 @@ eval {

 };

 ok(!$@);

+eval { $dbi->do('drop table table1') };

+$dbi->do('create table table1 (key1 varchar(255), key2 varchar(255)) engine=InnoDB');

+

+test 'update_or_insert';

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

+$dbi->update_or_insert(

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

+    table => 'table1',

+    where => {key1 => 1},

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

+);

+

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

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

+

 # Test memory leaks

 for (1 .. 200) {

     $dbi = DBIx::Custom->connect(