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

+0.24

+  - support full-qualified table name.

 0.23

   - DBIx::Custom::Mapper::map method support

     {value => '%<value>%'} syntax

@@ -790,16 +790,32 @@ sub include_model {

       if $@;

     # Search model modules

+    $DB::single = 1;

     my $path = $INC{"$name_space.pm"};

     $path =~ s/\.pm$//;

     opendir my $dh, $path

       or croak qq{Can't open directory "$path": $! } . _subname

-    $model_infos = [];

-    while (my $module = readdir $dh) {

-      push @$model_infos, $module

-        if $module =~ s/\.pm$//;

+    my @modules;

+    while (my $file = readdir $dh) {

+      my $file_abs = "$path/$file";

+      if (-d $file_abs) {

+        next if $file eq '.' || $file eq '..';

+        opendir my $fq_dh, $file_abs

+          or croak qq{Can't open directory "$file_abs": $! } . _subname;

+        while (my $fq_file = readdir $fq_dh) {

+          my $fq_file_abs = "$file_abs/$fq_file";

+          push @modules, "${file}::$fq_file" if -f $fq_file_abs;

+        }

+        close $fq_dh;

+      }

+      elsif(-f $file_abs) { push @modules, $file }

     }

     close $dh;

+    

+    $model_infos = [];

+    for my $module (@modules) {

+      if ($module =~ s/\.pm$//) { push @$model_infos, $module }

+    }

   }

   # Include models

@@ -817,7 +833,12 @@ sub include_model {

       $model_name  ||= $model_class;

       $model_table ||= $model_name;

     }

-    else { $model_class = $model_name = $model_table = $model_info }

+    else {

+      $model_class = $model_name = $model_table = $model_info;

+      $model_name =~ s/::/./;

+      $model_table =~ s/::/./;

+    }

+   

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

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

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

@@ -3100,6 +3121,14 @@ You can get model object by C<model>.

   my $book_model = $dbi->model('book');

   my $company_model = $dbi->model('company');

+You can include full-qualified table name like C<main.book>

+

+  lib / MyModel.pm

+      / MyModel / main / book.pm

+                       / company.pm

+

+  my $main_book = $self->model('main.book');

+

 See L<DBIx::Custom::Model> to know model features.

 =head2 C<like_value>

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

 use warnings;

 use FindBin;

-use lib "$FindBin::Bin/common";

+use lib "$FindBin::Bin/common_fullqualified";

 $ENV{DBIX_CUSTOM_TEST_RUN} = 1;

 use DBIx::Custom;

@@ -1325,7 +1325,6 @@ is_deeply($rows, [{$key1 => 1, $key2 => 2}], "filter");

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

 $dbi->execute($create_table2);

 $dbi->insert({$key1 => 1, $key3 => 5}, table => $table2);

-$DB::single = 1;

 $rows = $dbi->select(

   table => [$table1, $table2],

   column => "$table1.$key1 as " . u("${table1}_$key1")

@@ -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 => [

+      $self->table1,

+      $self->table2

+    ]

+  );

+}

+

+1;

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

+package MyModel1::main::table1;

+

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

+

+sub insert {

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

+  

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

+}

+

+sub list { shift->select; }

+

+1;

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

+package MyModel1::main::table2;

+

+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,5 @@

+package MyModel4;

+

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

+

+1;

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

+package MyModel4::main::table1;

+

+use MyModel4 -base;

+

+has table => 'main.table1';

+

+sub list { shift->select }

+

+1;

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

+package MyModel4::main::table2;

+

+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::main::table1;

+

+use MyModel5 -base;

+

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

+

+1;

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

+package MyModel5::main::table2;

+

+use strict;

+use warnings;

+

+use base 'MyModel5';

+

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

+

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

+

+1;

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

+package MyModel5::main::table3;

+

+use strict;

+use warnings;

+

+use base 'MyModel5';

+

+__PACKAGE__->attr(name => 'main.table3');

+__PACKAGE__->attr(table => 'main.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::main::table1;

+

+use base 'MyModel6';

+

+__PACKAGE__->attr(

+    join => sub {

+      [

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

+      ]

+    },

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

+);

+

+1;

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

+package MyModel6::main::table2;

+

+use base 'MyModel6';

+

+1;

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

+package MyModel6::main::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::main::table1;

+

+use base 'MyModel7';

+

+__PACKAGE__->attr(

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

+  join => sub {

+    [

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

+    ]

+  },

+);

+

+1;

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

+package MyModel7::main::table2;

+

+use base 'MyModel7';

+

+1;

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

+package MyModel8;

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

+

+1;

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

+package MyModel8::main::table1;

+use MyModel8 -base;

+

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

+

+

+1;

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

+package MyModel8::main::table2;

+use MyModel8 -base;

+

+has filter => sub {

+  {

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

+  }

+};

+

+1;

@@ -4,6 +4,7 @@ use warnings;

 use FindBin;

 use File::Basename qw/basename fileparse/;

 use File::Copy 'copy';

+use File::Path 'mkpath';

 my $top = $FindBin::Bin;

 my $common = "$top/common";

@@ -31,14 +32,14 @@ for my $dir (@dirs) {

         local $/;

         <$fh>;

       };

+

+      $content =~ s/::table(\d)/::main::table$1/g;

+      $content =~ s/([^:])table(\d)/$1main.table$2/g;

-      $content =~ s/table(\d)/TABLE$1/g;

-      $content =~ s/TABLE2_alias/TABLE2_ALIAS/g;

-      $content =~ s/key(\d)/KEY$1/g;

-      

+      mkpath "$common_fullqualified/$base_dir/main";

       my $base_name = (fileparse($file, qr/\..+$/))[0];

-      $base_name = uc $base_name;

-      my $new_file = "$common_fullqualified/$base_dir/$base_name.pm";

+      $base_name = $base_name;

+      my $new_file = "$common_fullqualified/$base_dir/main/$base_name.pm";

       open my $fh, '>', $new_file

         or die "Can't write file: $!";