@@ -1,3 +1,9 @@

+0.1720

+    - removed placeholder count check

+    - added EXPERIMENTAL execute method's id and primary key option.

+    - added EXPERIMENTAL DBIx::Custom::Model execute method

+0.1719

+    - DBIx::Custom support Microsoft Access through DBD::ODBC

 0.1718

     - added EXPERIMENTAL DBIx::Custom::Model call_dbi method

     - added EXPERIMENTAL count method

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

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.1718';

+our $VERSION = '0.1720';

 use 5.008001;

 use Carp 'croak';

@@ -397,6 +397,17 @@ sub execute {

     my $query_return = delete $args{query};

     my $table_alias = delete $args{table_alias} || {};

     my $sqlfilter = $args{sqlfilter};

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

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

+    croak "insert method primary_key option " .

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

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

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

+

+    if (defined $id) {

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

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

+    }

     # Check argument names

     foreach my $name (keys %args) {

@@ -2521,6 +2532,28 @@ registered by by C<register_filter>.

 This filter is executed before data is saved into database.

 and before type rule filter is executed.

+=item C<id>

+

+    id => 4

+    id => [4, 5]

+

+ID corresponding to C<primary_key>.

+You can delete rows by C<id> and C<primary_key>.

+

+    $dbi->execute(

+        "select * from book where id1 = :id1 and id2 = :id2",

+        {},

+        parimary_key => ['id1', 'id2'],

+        id => [4, 5],

+    );

+

+The above is same as the followin one.

+

+    $dbi->execute(

+        "select * from book where id1 = :id1 and id2 = :id2",

+        {id1 => 4, id2 => 5}

+    );

+

 =item C<query>

     query => 1

@@ -2558,6 +2591,10 @@ Note that $row must be simple hash reference, such as

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

 and don't forget to sort $row values by $row key asc order.

+=item C<primary_key>

+

+See C<id> option.

+

 =item C<sqlfilter EXPERIMENTAL> 

 SQL filter function.

@@ -67,6 +67,12 @@ sub call_dbi {

     return $self->dbi->$method(@args, @_);

 }

+sub execute {

+    my $self = shift;

+    push @_, ($_ => $self->$_) for qw/table bind_type primary_key type/;

+    return $self->dbi->execute(@_);

+}

+

 sub DESTROY { }

 sub method {

@@ -116,9 +122,9 @@ DBIx::Custom::Model - Model

 =head1 SYNOPSIS

-use DBIx::Custom::Table;

+use DBIx::Custom::Model;

-my $table = DBIx::Custom::Model->new(table => 'books');

+my $model = DBIx::Custom::Model->new(table => 'books');

 =head1 ATTRIBUTES

@@ -148,7 +154,7 @@ C<delete>, and C<select> method.

 =head2 C<table>

-    my $table = $model->table;

+    my $model = $model->table;

     $model = $model->table('book');

 Table name, this is passed to C<select> method.

@@ -193,24 +199,31 @@ Options is same as C<select> method's ones.

 =head2 C<delete>

-    $table->delete(...);

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

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

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

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

 =head2 C<delete_all>

-    $table->delete_all(...);

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

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

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

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

+

+=head2 C<execute EXPERIMENTAL>

+

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

 =head2 C<insert>

-    $table->insert(...);

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

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

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

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

 =head2 C<method>

@@ -247,29 +260,29 @@ If column names is omitted, C<columns> attribute of the model is used.

 =head2 C<new>

-    my $table = DBIx::Custom::Table->new;

+    my $model = DBIx::Custom::Model->new;

-Create a L<DBIx::Custom::Table> object.

+Create a L<DBIx::Custom::Model> object.

 =head2 C<select>

-    $table->select(...);

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

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

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

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

 =head2 C<update>

-    $table->update(...);

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

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

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

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

 =head2 C<update_all>

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

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

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

-you don't have to specify table name.

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

 =cut

@@ -42,28 +42,10 @@ sub build_query {

     my $sql = $query->sql;

     $query->sql($sql);

-

-    # Check placeholder count

-    croak qq{Placeholder count in "$sql" must be same as column count}

-        . _subname

-      unless $self->_placeholder_count($sql) eq @{$query->columns};

     return $query;

 }

-sub _placeholder_count {

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

-    

-    # Count

-    $sql ||= '';

-    my $count = 0;

-    my $pos   = -1;

-    while (($pos = index($sql, '?', $pos + 1)) != -1) {

-        $count++;

-    }

-    return $count;

-}

-

 sub _parse_parameter {

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

@@ -2767,6 +2767,27 @@ $rows = [

     );

 }

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

+$dbi->execute($create_table1_highperformance);

+$rows = [

+    {$key7 => 10, $key6 => 2, $key5 => 3, $key4 => 4, $key3 => 5, $key2 => 5},

+    {$key7 => 11, $key6 => 2, $key5 => 3, $key4 => 4, $key3 => 5, $key2 => 6},

+];

+{

+    $model = $dbi->create_model(table => $table1, primary_key => $key1);

+    my $query;

+    foreach my $row (@$rows) {

+      $query ||= $model->insert($row, id => 1, query => 1);

+      $model->execute($query, $row, id => 1, filter => {$key7 => sub { $_[0] * 2 }});

+    }

+    is_deeply($dbi->select(table => $table1, append => 'order by key2')->all,

+      [

+          {$key7 => 20, $key6 => 2, $key5 => 3, $key4 => 4, $key3 => 5, $key2 => 5, $key1 => 1},

+          {$key7 => 22, $key6 => 2, $key5 => 3, $key4 => 4, $key3 => 5, $key2 => 6, $key1 => 1},

+      ]

+    );

+}

+

 test 'result';

 $dbi = DBIx::Custom->connect;

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

@@ -2909,15 +2930,6 @@ $dbi->register_tag(

 );

-$dbi->register_tag(

-    a => sub {

-        return ["? ? ?", ['']];

-    }

-);

-eval{$builder->build_query("{a}")};

-like($@, qr/\QPlaceholder count/, "placeholder count is invalid");

-

-

 test 'Default tag Error case';

 eval{$builder->build_query("{= }")};

 like($@, qr/Column name must be specified in tag "{= }"/, "basic '=' : key not exist");