@@ -1,3 +1,5 @@

+0.1730

+    - fixed id option bug when column name is anbiguous

 0.1729

     - dbi_option attribute is renamed to option, dbi_option is DEPRECATED!

     - default_dbi_option is renamed to default_option, default_dbi_option

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

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.1728';

+our $VERSION = '0.1730';

 use 5.008001;

 use Carp 'croak';

@@ -249,7 +249,8 @@ sub delete {

     my $prefix = delete $args{prefix};

     # Where

-    $where = $self->_create_param_from_id($id, $primary_key) if defined $id;

+    $where = $self->_create_param_from_id($id, $primary_key, $table)

+      if defined $id;

     my $where_clause = '';

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

         $where_clause = "where " . $where->[0];

@@ -403,16 +404,11 @@ sub execute {

     warn "sqlfilter option is DEPRECATED" if $args{sqlfilter};

     my $id = delete $args{id};

     my $primary_key = delete $args{primary_key};

-    croak "insert method primary_key option " .

+    croak "execute 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) {

         croak qq{"$name" is wrong option } . _subname

@@ -422,6 +418,7 @@ sub execute {

     $query = $self->_create_query($query, $after_build_sql) unless ref $query;

     # Save query

+    if (ref $query eq 'DBIx::Custom::Result') { $DB::single = 1 }

     $self->last_sql($query->sql);

     return $query if $query_return;

@@ -432,6 +429,11 @@ sub execute {

     # Tables

     unshift @$tables, @{$query->{tables} || []};

     my $main_table = @{$tables}[-1];

+

+    if (defined $id) {

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

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

+    }

     # DEPRECATED! Cleanup tables

     $tables = $self->_remove_duplicate_table($tables, $main_table)

@@ -932,7 +934,7 @@ sub select {

     }

     else {

         my $main_table = $tables->[-1] || '';

-        $sql .= $self->_q($main_table);

+        $sql .= $self->_q($main_table) . ' ';

     }

     $sql =~ s/, $/ /;

     croak "Not found table name " . _subname

@@ -944,7 +946,8 @@ sub select {

     # Where

     my $where_clause = '';

-    $where = $self->_create_param_from_id($id, $primary_key) if defined $id;

+    $where = $self->_create_param_from_id($id, $primary_key, $tables->[-1])

+      if defined $id;

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

         $where_clause = "where " . $where->[0];

         $where_param = $where->[1];

@@ -1141,7 +1144,8 @@ sub update {

     my $assign_clause = $self->assign_clause($param, {wrap => $wrap});

     # Where

-    $where = $self->_create_param_from_id($id, $primary_key) if defined $id;

+    $where = $self->_create_param_from_id($id, $primary_key, $table)

+      if defined $id;

     my $where_clause = '';

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

         $where_clause = "where " . $where->[0];

@@ -1315,7 +1319,7 @@ sub _create_bind_values {

 }

 sub _create_param_from_id {

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

+    my ($self, $id, $primary_keys, $table) = @_;

     # Create parameter

     my $param = {};

@@ -1328,7 +1332,9 @@ sub _create_param_from_id {

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

           unless @$primary_keys eq @$id;

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

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

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

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

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

         }

     }

@@ -2329,7 +2335,7 @@ and C<PrintError> option is false by default.

 =head2 C<count>

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

+    my $count = $dbi->count(table => 'book');

 Get rows count.

@@ -2806,7 +2806,7 @@ $result = $dbi->execute("select $key1 as h1, $key2 as h2 from $table1");

 is_deeply([map { lc } @{$result->header}], [qw/h1 h2/]);

 test 'Named placeholder :name(operater) syntax';

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

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

 $dbi->execute($create_table1_2);

 $dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2, $key3 => 3, $key4 => 4, $key5 => 5});

 $dbi->insert(table => $table1, param => {$key1 => 6, $key2 => 7, $key3 => 8, $key4 => 9, $key5 => 10});

@@ -2836,7 +2836,7 @@ $rows = $result->all;

 is_deeply($rows, [{$key1 => 1, $key2 => 2, $key3 => 3, $key4 => 4, $key5 => 5}]);

 test 'high perfomance way';

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

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

 $dbi->execute($create_table1_highperformance);

 $rows = [

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

@@ -2856,7 +2856,7 @@ $rows = [

     );

 }

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

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

 $dbi->execute($create_table1_highperformance);

 $rows = [

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

@@ -2878,7 +2878,7 @@ $rows = [

     );

 }

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

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

 $dbi->execute($create_table1_highperformance);

 $rows = [

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

@@ -2888,17 +2888,71 @@ $rows = [

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

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

+      $model->execute($query, $row, 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},

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

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

       ]

     );

 }

+test 'id option more';

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

+$dbi->execute($create_table1_highperformance);

+$row = {

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

+};

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

+$model->insert($row);

+$query = $model->update({$key7 => 11}, id => 1, query => 1);

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

+is_deeply($dbi->select(table => $table1)->one,

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

+);

+

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

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

+$dbi->execute($create_table1);

+$dbi->execute($create_table2);

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

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

+$model = $dbi->create_model(table => $table2, primary_key => $key1,

+    join => ["left outer join $table1 on $table2.$key1 = $table1.$key1"]);

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

+$result = $model->select(

+    column => {$table1 => ["$key2"]},

+    id => 1

+);

+$DB::single = 1;

+is_deeply($result->all, [{"$table1.$key2" => 2}]);

+

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

+$dbi->execute($create_table1_highperformance);

+$row = {

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

+};

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

+$model->insert($row);

+$query = $model->delete(id => 1, query => 1);

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

+is_deeply($dbi->select(table => $table1)->all, []);

+

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

+eval { $dbi->execute($create_table1_highperformance) };

+$row = {

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

+};

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

+$model->insert($row);

+$query = $model->select(id => 1, query => 1);

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

+is_deeply($dbi->select(table => $table1)->one,

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

+);

+

 test 'result';

 $dbi = DBIx::Custom->connect;

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