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

+0.26

+  - fixed bug that when id option's value is object, don't work.

 0.25

   - added DBIX_CUSTOM_SUPPRESS_DEPRECATION environment varaible

     to suppress deprecation warnings

@@ -2,7 +2,7 @@ use 5.008007;

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.25';

+our $VERSION = '0.26';

 use Carp 'croak';

 use DBI;

@@ -461,8 +461,8 @@ sub execute {

       unless $statement;

     croak "execute id option must be specified with primary_key option"

       unless $opt{primary_key};

-    $opt{primary_key} = [$opt{primary_key}] unless ref $opt{primary_key};

-    $opt{id} = [$opt{id}] unless ref $opt{id};

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

+    $opt{id} = [$opt{id}] unless ref $opt{id} eq 'ARRAY';

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

       my $key = $opt{primary_key}->[$i];

       $key = "$main_table.$key" if $statement eq 'update' ||

@@ -732,8 +732,8 @@ sub insert {

   if (defined $opt{id} && !$multi) {

     croak "insert id option must be specified with primary_key option"

       unless $opt{primary_key};

-    $opt{primary_key} = [$opt{primary_key}] unless ref $opt{primary_key};

-    $opt{id} = [$opt{id}] unless ref $opt{id};

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

+    $opt{id} = [$opt{id}] unless ref $opt{id} eq 'ARRAY';

     for (my $i = 0; $i < @{$opt{primary_key}}; $i++) {

       my $key = $opt{primary_key}->[$i];

       next if exists $params->[0]->{$key};

@@ -851,8 +851,8 @@ sub include_model {

     my $mclass = "${name_space}::$model_class";

     croak qq{"$mclass" is invalid class name } . _subname

       if $mclass =~ /[^\w:]/;

-    unless ($mclass->can('isa')) {

-      eval "use $mclass";

+    unless ($mclass->can('new')) {

+      eval "require $mclass";

       croak "$@ " . _subname if $@;

     }

@@ -1562,7 +1562,7 @@ sub _id_to_param {

   # Create parameter

   my $param = {};

   if (defined $id) {

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

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

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

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

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

@@ -2016,7 +2016,7 @@ sub insert_at {

   $param = shift if @_ % 2;

   my %opt = @_;

   my $primary_key = delete $opt{primary_key};

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

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

   my $where = delete $opt{where};

   my $p = delete $opt{param} || {};

   $param  ||= $p;

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

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

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

+$dbi->insert(

+  {$key3 => 3},

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

+  table => $table1,

+  id => [1, 2],

+);

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

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

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

+

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

 $dbi->insert(

   {$key2 => 2, $key3 => 3},

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

+  table => $table1,

+  id => bless({value => 1}, 'AAAA'),

+  filter => {$key1 => sub { shift->{value} }}

+);

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

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

+

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1_2);

@@ -3868,10 +3891,10 @@ $dbi->register_tag(

 test 'Default tag Error case';

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

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

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

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

-like($@, qr/Column name and count of values must be specified in tag "{in }"/, "in : key not exist");

+like($@, qr/\QColumn name and count of values must be specified in tag "{in }"/, "in : key not exist");

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

 like($@, qr/\QColumn name and count of values must be specified in tag "{in }"/,

@@ -3904,7 +3927,7 @@ like($@, qr/unexpected "}"/, "error : 1");

 $source = "a {= {}";

 eval{$builder->build_query($source)};

-like($@, qr/unexpected "{"/, "error : 2");

+like($@, qr/\Qunexpected "{"/, "error : 2");

 test 'select() sqlfilter option';

 $dbi = DBIx::Custom->connect;