@@ -1,3 +1,8 @@

+0.1742

+    - fixed update_or_insert method bug

+    - micro optimization

+0.1741

+    - added EXPERIMENTAL update_or_insert to DBIx::Custom::Model

 0.1740

     - EXPERIMENTAL update_or_insert need id and primary_key option

       and added option option

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

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.1740';

+our $VERSION = '0.1742';

 use 5.008001;

 use Carp 'croak';

@@ -36,34 +36,38 @@ sub AUTOLOAD {

 }

 my @methods = qw/insert insert_at update update_at update_all

-                 delete delete_at delete_all select select_at count/;

+  delete delete_at delete_all select select_at count update_or_insert/;

 for my $method (@methods) {

+    

+    my $code =

+         qq/sub {/ .

+         qq/my \$self = shift;/ .

+         qq/\$self->dbi->$method(/ .

+             qq/\@_ % 2 ? shift : (),/;

-    my $code = sub {

-        my $self = shift;

-        

-        unless ($self->{_attribute_cache}{$self}) {

-            $self->$_ for qw/table bind_type primary_key

-              type join created_at updated_at/;

-            $self->{_attribute_cache}{$self} = 1;

-        }

-

-        $self->dbi->$method(

-            @_ % 2 ? shift : (),

-            table => $self->{table},

-            exists $self->{type} ? (type => $self->{type}) : (),

-            exists $self->{created_at} && $method eq 'insert' ? (created_at => $self->{created_at}) : (),

-            exists $self->{updated_at} && ($method eq 'insert' || $method eq 'update') ? (updated_at => $self->{updated_at}) : (),

-            exists $self->{bind_type} ? (bind_type=> $self->{bind_type}) : (),

-            exists $self->{primary_key} ? (primary_key => $self->{primary_key}) : (),

-            exists $self->{join} && index($method, 'select') != -1 ? (join => $self->{join}) : (),

-            @_

-        )

-    };

+    

+    my @attrs = qw/table type primary_key bind_type/;

+    my @insert_attrs = qw/created_at updated_at/;

+    my @update_attrs = qw/updated_at/;

+    my @update_or_insert_attrs = qw/created_at updated_at/;

+    my @select_attrs = qw/join/;

+    if ($method eq 'insert') { push @attrs, @insert_attrs }

+    elsif ($method eq 'update_or_insert') {

+        push @attrs, @update_or_insert_attrs;

+    }

+    elsif ($method eq 'update') { push @attrs, @update_attrs }

+    elsif (index($method, 'select') != -1) { push @attrs, @select_attrs }

+    

+    for my $attr (@attrs) {

+        $code .= "$attr => exists \$self->{$attr} ? \$self->{$attr} : \$self->$attr,";

+    }

+    

+    $code .= qq/\@_);/ .

+         qq/}/;

     no strict 'refs';

-    my $class = __PACKAGE__;

-    *{"${class}::$method"} = $code;

+    *{__PACKAGE__ . "::$method"} = eval $code;

+    croak $code if $@;

 }

 sub execute {

@@ -214,28 +218,28 @@ Options is same as C<select> method's ones.

     $model->delete(...);

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

-you don't have to specify C<table> and C<primary_key> option.

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

 =head2 C<delete_all>

     $model->delete_all(...);

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

-you don't have to specify C<table> and C<primary_key> option.

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

 =head2 C<execute>

     $model->execute(...);

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

-you don't have to specify C<table> and C<primary_key> option.

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

 =head2 C<insert>

     $model->insert(...);

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

-you don't have to specify C<table> and C<primary_key> option.

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

 =head2 C<helper>

@@ -281,20 +285,27 @@ Create a L<DBIx::Custom::Model> object.

     $model->select(...);

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

-you don't have to specify C<table>, C<primary_key> and C<jon> option.

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

 =head2 C<update>

     $model->update(...);

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

-you don't have to specify C<table> and C<primary_key> option.

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

 =head2 C<update_all>

     $model->update_all(param => \%param);

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

-you don't have to specify C<table> and C<primary_key> option.

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

+

+=head2 C<update_or_insert EXPERIMENTAL>

+

+    $model->update_or_insert(...);

+    

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

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

 =cut

@@ -47,6 +47,7 @@ sub to_string {

     $self->{_query_builder} = $self->dbi->query_builder;

     $self->{_safety_character} = $self->dbi->safety_character;

     $self->{_quote} = $self->dbi->_quote;

+    $self->{_tag_parse} = $self->dbi->tag_parse;

     $self->_parse($clause, $where, $count, 'and');

@@ -105,23 +106,19 @@ sub _parse {

         my $pushed;

         # Column

-        my $columns = $self->{_query_builder}->build_query($clause)->{columns};

-        if (@$columns == 0) {

+        my $c = $self->{_safety_character};

+        

+        my $column;

+        if ($clause =~ /(\s|^)\{/ && $self->{_tag_parse}) {

+            my $columns = $self->dbi->query_builder->build_query($clause)->{columns};

+            $column = $columns->[0];

+        }

+        else { ($column) = $clause =~ /:([$c\.]+)/ }

+        unless (defined $column) {

             push @$where, $clause;

             $pushed = 1;

             return $pushed;

         }

-        elsif (@$columns != 1) {

-            croak qq{Each part contains one column name: "$clause" (}

-                  . _subname . ")";

-        }

-        

-        # Remove quote

-        my $column = $columns->[0];

-        if (my $q = $self->{_quote}) {

-            $q = quotemeta($q);

-            $column =~ s/[$q]//g;

-        }

         # Column count up

         my $count = ++$count->{$column};

@@ -152,7 +149,6 @@ sub _parse {

     }

     return;

 }

-

 1;

 =head1 NAME

@@ -616,7 +616,6 @@ 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,

@@ -644,6 +643,17 @@ eval {

 like($@, qr/primary_key/);

+test 'model update_or_insert';

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

+$dbi->execute($create_table1);

+$model = $dbi->create_model(

+    table => $table1,

+    primary_key => $key1

+);

+$model->update_or_insert({$key2 => 2}, id => 1);

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

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

+

 test 'default_bind_filter';

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

 $dbi->register_filter(

@@ -1606,12 +1616,6 @@ $result = $dbi->select(

 $row = $result->all;

 is_deeply($row, [{$key1 => 1, $key2 => 2}]);

-$where = $dbi->where

-             ->clause("$key1 = :$key1 $key2 = :$key2")

-             ->param({$key1 => 1});

-eval{$where->to_string};

-like($@, qr/one column/);

-

 $where = $dbi->where

              ->clause(['or', ("$key1 = :$key1") x 3])

              ->param({$key1 => [$dbi->not_exists, 1, 3]});

@@ -29,6 +29,7 @@ sub test { print "# $_[0]\n" }

 # Varialbes for tests

 my $dbname;

+my $row;

 my $rows;

 my $result;

@@ -47,7 +48,6 @@ $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(

     {key2 => 2},

     table => 'table1',

@@ -60,7 +60,7 @@ $dbi->update_or_insert(

     }

 );

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

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

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

 $dbi->update_or_insert(

@@ -75,7 +75,7 @@ $dbi->update_or_insert(

     }

 );

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

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

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

 # Test memory leaks

@@ -37,6 +37,7 @@ my $result;

 my $row;

 my $rows;

 my $binary;

+my $model;

 # Prepare table

 $dbi = DBIx::Custom->connect;

@@ -70,6 +71,17 @@ $row   = $result->one;

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

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

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

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

+$dbi->execute('create table table1 (key1, key2, key3)');

+$dbi->now(\"datetime('now')");

+$model = $dbi->create_model(created_at => 'key2', updated_at => 'key3', table => 'table1');

+$model->insert({key1 => \"datetime('now')"});

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

+$row = $result->one;

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

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

+

 test 'insert created_at and updated_at scalar reference';

 $dbi = DBIx::Custom->connect;

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

@@ -91,6 +103,28 @@ $result = $dbi->select(table => 'table1');

 $row   = $result->one;

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

+test 'update_or_insert created_at and updated_at';

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

+$dbi->execute('create table table1 (key1, key2, key3, key4)');

+$dbi->now(\"datetime('now')");

+$model = $dbi->create_model(created_at => 'key2', updated_at => 'key3', table => 'table1',

+primary_key => 'key4');

+$model->update_or_insert({key1 => \"datetime('now')"}, id => 1);

+$result = $model->select(table => 'table1', id => 1);

+$row = $result->one;

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

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

+

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

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

+$dbi->execute('create table table1 (key1, key2)');

+$dbi->now(\"datetime('now')");

+$model = $dbi->create_model(updated_at => 'key2', table => 'table1');

+$model->insert({key1 => \"datetime('now')"});

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

+$row   = $result->one;

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

+

 test 'DBIX_CUSTOM_DEBUG ok';

 {

     local $ENV{DBIX_CUSTOM_DEBUG} = 1;