@@ -20,6 +20,8 @@ use DBIx::Custom;

      . 'key3 varchar(255), key4 varchar(255), key5 varchar(255)) engine=InnoDB;' }

     sub create_table1_type { 'create table table1 (key1 Date, key2 datetime) engine=InnoDB;;' }

     sub create_table2 { 'create table table2 (key1 varchar(255), key3 varchar(255)) engine=InnoDB;' }

+    sub create_table2_2 { "create table table2 (key1 varchar(255), key2 varchar(255), key3 varchar(255)) engine=InnoDB" }

+    sub create_table3 { "create table table3 (key1 varchar(255), key2 varchar(255), key3 varchar(255)) engine=InnoDB" }

     sub create_table_reserved {

       'create table `table` (`select` varchar(255), `update` varchar(255)) engine=InnoDB;' }

 }

@@ -19,6 +19,8 @@ use DBIx::Custom;

      . 'key3 varchar(255), key4 varchar(255), key5 varchar(255));' }

     sub create_table1_type { 'create table table1 (key1 Date, key2 varchar(255));' }

     sub create_table2 { 'create table table2 (key1 varchar(255), key3 varchar(255));' }

+    sub create_table2_2 { "create table table2 (key1 varchar(255), key2 varchar(255), key3 varchar(255))" }

+    sub create_table3 { "create table table3 (key1 varchar(255), key2 varchar(255), key3 varchar(255))" }

     sub create_table_reserved { 'create table "table" ("select" varchar(255), "update" varchar(255))' }

 }

@@ -14,6 +14,8 @@ use DBIx::Custom;

     sub create_table1_2 {'create table table1 (key1, key2, key3, key4, key5);' }

     sub create_table1_type { 'create table table1 (key1 Date, key2 datetime);' }

     sub create_table2 { 'create table table2 (key1, key3);' }

+    sub create_table2_2 { "create table table2 (key1, key2, key3)" }

+    sub create_table3 { "create table table3 (key1, key2, key3)" }

     sub create_table_reserved { 'create table "table" ("select", "update")' }

 }

@@ -13,6 +13,8 @@ use DBIx::Custom;

     sub create_table1_2 {'create table table1 (key1, key2, key3, key4, key5);' }

     sub create_table1_type { 'create table table1 (key1 Date, key2 datetime);' }

     sub create_table2 { 'create table table2 (key1, key3);' }

+    sub create_table2_2 { "create table table2 (key1, key2, key3)" }

+    sub create_table3 { "create table table3 (key1, key2, key3)" }

     sub create_table_reserved { 'create table "table" ("select", "update")' }

 }

@@ -988,6 +988,7 @@ $dbi = DBIx::Custom->connect;

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

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

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

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

 $dbi->execute($create_table1_type);

 $dbi->execute($create_table2);

@@ -0,0 +1,19 @@

+package MyDBI1;

+

+use strict;

+use warnings;

+

+use base 'DBIx::Custom';

+

+sub connect {

+    my $self = shift->SUPER::connect(@_);

+    

+    $self->include_model(

+        MyModel1 => [

+            'book',

+            {class => 'Company', name => 'company'}

+        ]

+    );

+}

+

+1;

@@ -0,0 +1,17 @@

+package MyModel1::Company;

+

+use strict;

+use warnings;

+

+use base 'DBIx::Custom::Model';

+

+

+sub insert {

+    my ($self, $param) = @_;

+    

+    return $self->SUPER::insert(param => $param);

+}

+

+sub list { shift->select; }

+

+1;

@@ -0,0 +1,13 @@

+package MyModel1::book;

+

+use DBIx::Custom::Model -base;

+

+sub insert {

+    my ($self, $param) = @_;

+    

+    return $self->SUPER::insert(param => $param);

+}

+

+sub list { shift->select; }

+

+1;

@@ -0,0 +1,5 @@

+package MyModel4;

+

+use base 'DBIx::Custom::Model';

+

+1;

@@ -0,0 +1,9 @@

+package MyModel4::book;

+

+use base 'MyModel4';

+

+sub table { 'table1' }

+

+sub list { shift->select }

+

+1;

@@ -0,0 +1,8 @@

+package MyModel4::company;

+

+use base 'MyModel4';

+

+sub insert { shift->SUPER::insert(param => $_[0]) }

+sub list { shift->select }

+

+1;

@@ -0,0 +1,5 @@

+package MyModel5;

+

+use base 'DBIx::Custom::Model';

+

+1;

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

+package MyModel5::table1;

+

+use MyModel5 -base;

+

+has primary_key => sub { ['key1', 'key2'] };

+

+1;

@@ -0,0 +1,12 @@

+package MyModel5::table1_1;

+

+use strict;

+use warnings;

+

+use base 'MyModel5';

+

+__PACKAGE__->attr(table => 'table2');

+

+__PACKAGE__->attr('primary_key' => sub { ['key1', 'key2'] });

+

+1;

@@ -0,0 +1,13 @@

+package MyModel5::table1_2;

+

+use strict;

+use warnings;

+

+use base 'MyModel5';

+

+__PACKAGE__->attr(name => 'table1_3');

+__PACKAGE__->attr(table => 'table3');

+

+__PACKAGE__->attr('primary_key' => sub { ['key1', 'key2'] });

+

+1;

@@ -0,0 +1,5 @@

+package MyModel6;

+

+use base 'DBIx::Custom::Model';

+

+1;

@@ -0,0 +1,14 @@

+package MyModel6::table1;

+

+use base 'MyModel6';

+

+__PACKAGE__->attr(

+    join => sub {

+        [

+            'left outer join table2 on table1.key1 = table2.key1'

+        ]

+    },

+    primary_key => sub { ['key1'] }

+);

+

+1;

@@ -0,0 +1,5 @@

+package MyModel6::table2;

+

+use base 'MyModel6';

+

+1;

@@ -0,0 +1,11 @@

+package MyModel6::table3;

+

+use base 'MyModel6';

+

+__PACKAGE__->attr(filter => sub {

+    [

+        key1 => {in => sub { uc $_[0] }}

+    ]

+});

+

+1;

@@ -0,0 +1,5 @@

+package MyModel7;

+

+use base 'DBIx::Custom::Model';

+

+1;

@@ -0,0 +1,14 @@

+package MyModel7::table1;

+

+use base 'MyModel7';

+

+__PACKAGE__->attr(

+    primary_key => sub { ['key1'] },

+    join => sub {

+        [

+            'left outer join table2 on table1.key1 = table2.key1'

+        ]

+    },

+);

+

+1;

@@ -0,0 +1,5 @@

+package MyModel7::table2;

+

+use base 'MyModel7';

+

+1;

@@ -0,0 +1,4 @@

+package MyModel8;

+use DBIx::Custom::Model -base;

+

+1;

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

+package MyModel8::table1;

+use MyModel8 -base;

+

+has join => sub { ['left join table2 as table2_alias on table1.key1 = table2_alias.key1'] };

+

+

+1;

@@ -0,0 +1,10 @@

+package MyModel8::table2;

+use MyModel8 -base;

+

+has filter => sub {

+    {

+        key3 => {out => sub { $_[0] * 2}, in => sub { $_[0] * 3}, end => sub { $_[0] * 4 }}

+    }

+};

+

+1;