@@ -1,3 +1,10 @@

+0.1744

+    - id option work if id count is lower than primary key count.

+    - removed EXPERIMETNAL status from update_or_insert method and

+      DBIx::Custom::Model's update_or_insert method

+    - removed EXPERIMENTAL status from reuse option

+    - removed EXPERIMENTAL status from update_at option and created_at option

+    - removed EXPERIMETNAL status from now attribute

 0.1743

     - DBIx::Custom::Model execute method is DEPRECATED!

     - fixed bug that update_all can't receive parameter as first argument

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

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.1743';

+our $VERSION = '0.1744';

 use 5.008001;

 use Carp 'croak';

@@ -674,15 +674,6 @@ sub insert {

     $self->execute($sql, $param, %opt);

 }

-sub _merge_id_to_param {

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

-    

-    # Create parameter

-    $id = [$id] unless ref $id;

-    

-    return $param;

-}

-

 sub insert_timestamp {

     my $self = shift;

@@ -1162,9 +1153,17 @@ sub update_or_insert {

     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} || {}});

+

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

+    if (@$rows == 0) {

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

+    }

+    elsif (@$rows == 1) {

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

+    }

+    else {

+        croak "selected row must be one " . _subname;

+    }

 }

 sub update_timestamp {

@@ -1355,7 +1354,7 @@ sub _id_to_param {

     # Check primary key

     croak "primary_key option " .

-          "must be specified with id option " . _subname

+          "must be specified when id option is used" . _subname

       unless defined $primary_keys;

     $primary_keys = [$primary_keys] unless ref $primary_keys eq 'ARRAY';

@@ -1363,13 +1362,7 @@ sub _id_to_param {

     my $param = {};

     if (defined $id) {

         $id = [$id] unless ref $id;

-        croak qq{"id" must be constant value or array reference}

-            . " (" . (caller 1)[3] . ")"

-          unless !ref $id || ref $id eq 'ARRAY';

-        croak qq{"id" must contain values same count as primary key}

-            . " (" . (caller 1)[3] . ")"

-          unless @$primary_keys eq @$id;

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

+        for(my $i = 0; $i < @$id; $i++) {

            my $key = $primary_keys->[$i];

            $key = "$table." . $key if $table;

            $param->{$key} = $id->[$i];

@@ -1575,12 +1568,7 @@ sub _where_clause_and_param {

     my $obj;

-    if (ref $where eq 'ARRAY' && !ref $where->[0]) {

-        $w->{clause} = "where " . $where->[0];

-        $w->{param} = $where->[1];

-    }

-    elsif (ref $where) {

-

+    if (ref $where) {

         if (ref $where eq 'HASH') {

             my $clause = ['and'];

             my $column_join = '';

@@ -2160,12 +2148,12 @@ Filters, registered by C<register_filter> method.

 Get last successed SQL executed by C<execute> method.

-=head2 C<now EXPERIMENTAL>

+=head2 C<now>

     my $now = $dbi->now;

     $dbi = $dbi->now($now);

-Code reference which return time now, default to the following code reference.

+Code reference which return current time, default to the following code reference.

     sub {

         my ($sec, $min, $hour, $mday, $mon, $year) = localtime;

@@ -2174,7 +2162,10 @@ Code reference which return time now, default to the following code reference.

         return sprintf("%04d-%02d-%02d %02d:%02d:%02d");

     }

-This return the time like "2011-10-14 05:05:27".

+This return the time like C<2011-10-14 05:05:27>.

+

+This is used by C<insert> method's C<created_at> option and C<updated_at> option,

+and C<update> method's C<updated_at> option.

 =head2 C<models>

@@ -2652,7 +2643,7 @@ Table alias. Key is real table name, value is alias table name.

 If you set C<table_alias>, you can enable C<into1> and C<into2> type rule

 on alias table name.

-=item C<reuse EXPERIMENTAL>

+=item C<reuse>

     reuse => $hash_ref

@@ -2742,7 +2733,7 @@ and use the following new ones.

 =over 4

-=item C<created_at EXPERIMETNAL>

+=item C<created_at>

     created_at => 'created_datetime'

@@ -2786,7 +2777,7 @@ prefix before table name section

 Table name.

-=item C<updated_at EXPERIMENTAL>

+=item C<updated_at>

 This option is same as C<update> method C<updated_at> option.

@@ -2918,7 +2909,7 @@ This is used in C<param> of L<DBIx::Custom::Where> .

 Create a new L<DBIx::Custom::Order> object.

-=head2 C<q EXPERIMENTAL>

+=head2 C<q>

     my $quooted = $dbi->q("title");

@@ -3091,21 +3082,15 @@ Table name.

     # DBIx::Custom::Where object

     where => $dbi->where(

-        clause => ['and', 'author = :author', 'title like :title'],

+        clause => ['and', ':author{=}', ':title{like}'],

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

     );

-    # Array reference 1 (array reference, hash referenc). same as above

+    # Array reference, this is same as above

     where => [

-        ['and', 'author = :author', 'title like :title'],

+        ['and', ':author{=}', ':title{like}'],

         {author => 'Ken', title => '%Perl%'}

-    ];    

-    

-    # Array reference 2 (String, hash reference)

-    where => [

-        'title like :title',

-        {title => '%Perl%'}

-    ]

+    ];

     # String

     where => 'title is null'

@@ -3269,7 +3254,7 @@ is executed, the following SQL is executed.

     update book set price =  ? + 5;

-=item C<updated_at EXPERIMETNAL>

+=item C<updated_at>

     updated_at => 'updated_datetime'

@@ -3286,7 +3271,7 @@ C<now> attribute.

 Execute update statement for all rows.

 Options is same as C<update> method.

-=head2 C<update_or_insert EXPERIMENTAL>

+=head2 C<update_or_insert>

     # ID

     $dbi->update_or_insert(

@@ -74,9 +74,16 @@ sub update_or_insert {

           && (defined $opt{primary_key} || defined $self->{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} || {}});

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

+    if (@$rows == 0) {

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

+    }

+    elsif (@$rows == 1) {

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

+    }

+    else {

+        croak "selected row must be one " . _subname;

+    }

 }

 sub execute {

@@ -311,7 +318,7 @@ you don't have to specify options if you set attribute in model.

 Same as C<update_all> of L<DBIx::Custom> except that

 you don't have to specify options if you set attribute in model.

-=head2 C<update_or_insert EXPERIMENTAL>

+=head2 C<update_or_insert>

     $model->update_or_insert(...);

@@ -145,9 +145,73 @@ sub _parse {

 DBIx::Custom::Where - Where clause

 =head1 SYNOPSYS

-

-    my $where = DBIx::Custom::Where->new;

-    my $string_where = "$where";

+    

+    # Create DBIx::Custom::Where object

+    my $where = $dbi->where;

+    

+    # Set clause and parameter

+    $where->clause(['and', ':title{like}', ':price{=}']);

+    

+    # Create where clause by to_string method

+    my $where_clause = $where->to_string;

+    

+    # Create where clause by stringify

+    my $where_clause = "$where";

+    

+    # Created where clause in the above way

+    where :title{=} and :price{like}

+    

+    # Only price condition

+    $where->clause(['and', ':title{like}', ':price{=}']);

+    $where->param({price => 1900});

+    my $where_clause = "$where";

+    

+    # Created where clause in the above way

+    where :price{=}

+    

+    # Only title condition

+    $where->clause(['and', ':title{like}', ':price{=}']);

+    $where->param({title => 'Perl'});

+    my $where_clause = "$where";

+    

+    # Created where clause in the above way

+    where :title{like}

+    

+    # Nothing

+    $where->clause(['and', ':title{like}', ':price{=}']);

+    $where->param({});

+    my $where_clause = "$where";

+    

+    # or condition

+    $where->clause(['or', ':title{like}', ':price{=}']);

+    

+    # More than one parameter

+    $where->clause(['and', ':price{>}', ':price{<}']);

+    $where->param({price => [1000, 2000]});

+    

+    # Only first condition

+    $where->clause(['and', ':price{>}', ':price{<}']);

+    $where->param({price => [1000, $dbi->not_exists]});

+    

+    # Only second condition

+    $where->clause(['and', ':price{>}', ':price{<}']);

+    $where->param({price => [$dbi->not_exists, 2000]});

+    

+    # More complex condition

+    $where->clause(

+        [

+            'and',

+            ':price{=}',

+            ['or', ':title{=}', ':title{=}', ':title{=}']

+        ]

+    );

+    my $where_clause = "$where";

+    

+    # Created where clause in the above way

+    where :price{=} and (:title{=} or :title{=} or :title{=})

+    

+    # Using Full-qualified column name

+    $where->clause(['and', ':book.title{like}', ':book.price{=}']);

 =head1 ATTRIBUTES

@@ -156,15 +220,15 @@ DBIx::Custom::Where - Where clause

     my $clause = $where->clause;

     $where = $where->clause(

         ['and',

-            'title = :title', 

-            ['or', 'date < :date', 'date > :date']

+            ':title{=}', 

+            ['or', ':date{<}', ':date{>}']

         ]

     );

 Where clause. Above one is expanded to the following SQL by to_string

 If all parameter names is exists.

-    "where ( title = :title and ( date < :date or date > :date ) )"

+    where title = :title and ( date < :date or date > :date )

 =head2 C<param>

@@ -5,8 +5,6 @@ use FindBin;

 use lib "$FindBin::Bin/common";

 $ENV{DBIX_CUSTOM_TEST_RUN} = 1;

-

-

 use DBIx::Custom;

 {

     package DBIx::Custom;

@@ -651,6 +651,17 @@ eval {

 like($@, qr/primary_key/);

+eval {

+    $dbi->insert({$key1 => 1}, table => $table1);

+    $dbi->update_or_insert(

+        {$key2 => 3},

+        table => $table1,

+        primary_key => $key1,

+        id => 1

+    );

+};

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

+

 test 'model update_or_insert';

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

 $dbi->execute($create_table1);

@@ -662,6 +673,15 @@ $model->update_or_insert({$key2 => 2}, id => 1);

 $row = $model->select(id => 1)->one;

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

+eval {

+    $model->insert({$key1 => 1});

+    $model->update_or_insert(

+        {$key2 => 3},

+        id => 1

+    );

+};

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

+

 test 'default_bind_filter';

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

 $dbi->register_filter(

@@ -1987,16 +2007,6 @@ is($dbi->select(table => $table1)->one->{$key1}, 1);

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

 is($dbi->select(table => $table1)->one->{$key3}, 3);

-eval {

-    $dbi->insert_at(

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

-        table => $table1,

-        primary_key => [$key1, $key2],

-        where => {},

-    );

-};

-like($@, qr/must be/);

-

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1_2);

@@ -2090,43 +2100,6 @@ is($row->{$key1}, 1);

 is($row->{$key2}, 2);

 is($row->{$key3}, 3);

-eval {

-    $result = $dbi->select_at(

-        table => $table1,

-        primary_key => [$key1, $key2],

-        where => {},

-    );

-};

-like($@, qr/must be/);

-

-eval {

-    $result = $dbi->select_at(

-        table => $table1,

-        primary_key => [$key1, $key2],

-        where => [1],

-    );

-};

-like($@, qr/same/);

-

-eval {

-    $result = $dbi->update_at(

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

-        table => $table1,

-        primary_key => [$key1, $key2],

-        where => {},

-    );

-};

-like($@, qr/must be/);

-

-eval {

-    $result = $dbi->delete_at(

-        table => $table1,

-        primary_key => [$key1, $key2],

-        where => {},

-    );

-};

-like($@, qr/must be/);

-

 test 'model delete_at';

 $dbi = MyDBI6->connect;

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

@@ -2461,6 +2434,19 @@ is($dbi->select(table => $table1)->one->{$key1}, 0);

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

 is($dbi->select(table => $table1)->one->{$key3}, 3);

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

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

+$dbi->execute($create_table1_2);

+$dbi->insert(

+    {$key3 => 3},

+    primary_key => [$key1, $key2], 

+    table => $table1,

+    id => 1,

+);

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

+ok(!$dbi->select(table => $table1)->one->{$key2});

+is($dbi->select(table => $table1)->one->{$key3}, 3);

+

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1_2);