@@ -153,13 +153,14 @@ sub column {

   my $separator = $self->separator;

   # . is replaced

-  $table =~ s/\./$separator/g;

+  my $t = $table;

+  $t =~ s/\./$separator/g;

   # Column clause

   my @column;

   $columns ||= [];

   push @column, $self->_tq($table) . "." . $self->q($_) .

-    " as " . $self->q("${table}${separator}$_")

+    " as " . $self->q("${t}${separator}$_")

     for @$columns;

   return join (', ', @column);

@@ -290,7 +291,7 @@ sub create_model {

 sub each_column {

   my ($self, $cb, %options) = @_;

-

+  

   my $user_column_info = $self->user_column_info;

   if ($user_column_info) {

@@ -790,7 +791,6 @@ sub include_model {

       if $@;

     # Search model modules

-    $DB::single = 1;

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

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

     opendir my $dh, $path

@@ -1113,12 +1113,16 @@ sub select {

 }

 sub setup_model {

-  my $self = shift;

+  my ($self, %opt) = @_;

   # Setup model

   $self->each_column(

     sub {

       my ($self, $table, $column, $column_info) = @_;

+      my $database = $column_info->{TABLE_SCHEM};

+      return if exists $opt{database} && $opt{database} ne $database;

+      

+      $table = "$database.$table" if exists $opt{prefix};

       if (my $model = $self->models->{$table}) {

         push @{$model->columns}, $column;

       }

@@ -1656,7 +1660,7 @@ sub _push_join {

       my @j_clauses = reverse split /\s(and|on)\s/, $j_clause;

       my $c = $self->{safety_character};

-      my $join_re = qr/([$c]+)\.[$c]+[^$c].*?([$c]+)\.[$c]+/sm;

+      my $join_re = qr/((?:[$c]+?\.[$c]+?)|(?:[$c]+?))\.[$c]+[^$c].*?((?:[$c]+?\.[$c]+?)|(?:[$c]+?))\.[$c]+/sm;

       for my $clause (@j_clauses) {

         if ($clause =~ $join_re) {

           $table1 = $1;

@@ -3404,10 +3408,17 @@ See also L<DBIx::Custom::Where> to know how to create where clause.

 =head2 C<setup_model>

   $dbi->setup_model;

+  $dbi->setup_model(database => 'main');

+  $dbi->setup_model(database => 'main', prefix => 1);

 Setup all model objects.

 C<columns> of model object is automatically set, parsing database information.

+If C<database> option is specified, only the database is searched.

+

+If C<prefix> option is specified, Target model is qualified by dabtabase name

+like C<main.book>.

+

 =head2 C<type_rule>

   $dbi->type_rule(

@@ -39,6 +39,7 @@ use DBIx::Custom;

   has key8 => $key8;

   has key9 => $key9;

   has key10 => $key10;

+  has setup_model_args => sub { [database => 'main', prefix => 1] };

   my $date_typename = 'Date';

   my $datetime_typename = 'Datetime';

@@ -23,6 +23,18 @@ sub u($) {

   return $value;

 }

+sub u2($) {

+  my $value = shift;

+  $value =~ s/\./__/g;

+  return $value;

+}

+

+sub hy($) {

+  my $value = shift;

+  $value =~ s/\./-/g;

+  return $value;

+}

+

 # Constant

 my $table1 = $dbi->table1;

 my $table2 = $dbi->table2;

@@ -52,6 +64,7 @@ my $date_typename = $dbi->date_typename;

 my $datetime_typename = $dbi->datetime_typename;

 my $date_datatype = $dbi->date_datatype;

 my $datetime_datatype = $dbi->datetime_datatype;

+my $setup_model_args = $dbi->can('setup_model_args') ? $dbi->setup_model_args : [];

 # Variables

 my $builder;

@@ -2479,7 +2492,7 @@ eval { $dbi->execute("drop table $table2") };

 $dbi->execute($create_table1);

 $dbi->execute($create_table2);

 $dbi->separator('__');

-$dbi->setup_model;

+$dbi->setup_model(@$setup_model_args);

 $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1);

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

 $model = $dbi->model($table1);

@@ -2488,7 +2501,7 @@ $result = $model->select(

   where => {"$table1.$key1" => 1}

 );

 is_deeply($result->one,

-        {$key1 => 1, $key2 => 2, "${table2}__$key1" => 1, "${table2}__$key3" => 3});

+        {$key1 => 1, $key2 => 2, u2"${table2}__$key1" => 1, u2"${table2}__$key3" => 3});

 test 'values_clause';

 $dbi = DBIx::Custom->connect;

@@ -2522,7 +2535,7 @@ eval { $dbi->execute("drop table $table1") };

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

 $dbi->execute($create_table1);

 $dbi->execute($create_table2);

-$dbi->setup_model;

+$dbi->setup_model(@$setup_model_args);

 $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1);

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

 $model = $dbi->model($table1);

@@ -2599,23 +2612,23 @@ $dbi->insert({$key1 => 1, $key3 => 4}, table => $table2);

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

 $rows = $dbi->select(

   table => $table1,

-  column => "$table1.$key1 as ${table1}_$key1, $key2, $key3",

+  column => "$table1.$key1 as " . u("${table1}_$key1") . ", $key2, $key3",

   where   => {"$table1.$key2" => 3},

   join  => ["inner join (select * from $table2 where {= $table2.$key3})" . 

-            " $table2 on $table1.$key1 = $table2.$key1"],

+            " \"$table2\" on $table1.$key1 = \"$table2\".$key1"],

   param => {"$table2.$key3" => 5}

 )->all;

-is_deeply($rows, [{"${table1}_$key1" => 2, $key2 => 3, $key3 => 5}]);

+is_deeply($rows, [{u"${table1}_$key1" => 2, $key2 => 3, $key3 => 5}]);

 $rows = $dbi->select(

   table => $table1,

-  column => "$table1.$key1 as ${table1}_$key1, $key2, $key3",

+  column => "$table1.$key1 as " . u("${table1}_$key1") . ", $key2, $key3",

   where   => {"$table1.$key2" => 3},

   join  => "inner join (select * from $table2 where {= $table2.$key3})" . 

-           " $table2 on $table1.$key1 = $table2.$key1",

+           " \"$table2\" on $table1.$key1 = \"$table2\".$key1",

   param => {"$table2.$key3" => 5}

 )->all;

-is_deeply($rows, [{"${table1}_$key1" => 2, $key2 => 3, $key3 => 5}]);

+is_deeply($rows, [{u"${table1}_$key1" => 2, $key2 => 3, $key3 => 5}]);

 test 'select() string where';

 $dbi = DBIx::Custom->connect;

@@ -2981,7 +2994,7 @@ eval { $dbi->execute("drop table $table1") };

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

 $dbi->execute($create_table1);

 $dbi->execute($create_table2);

-$dbi->setup_model;

+$dbi->setup_model(@$setup_model_args);

 $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1);

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

 $model = $dbi->model($table1);

@@ -3017,7 +3030,7 @@ $dbi->create_model(

 $model2 = $dbi->create_model(

   table => $table2,

 );

-$dbi->setup_model;

+$dbi->setup_model(@$setup_model_args);

 $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1);

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

 $model = $dbi->model($table1);

@@ -3042,7 +3055,7 @@ $result = $model->select(

   where => {"$table1.$key1" => 1}

 );

 is_deeply($result->one,

-        {$key1 => 1, $key2 => 2, "${table2}__$key1" => 1, "${table2}__$key3" => 3});

+        {$key1 => 1, $key2 => 2, u2"${table2}__$key1" => 1, u2"${table2}__$key3" => 3});

 is_deeply($model2->select->one, {$key1 => 1, $key3 => 3});

 $dbi->separator('-');

@@ -3055,7 +3068,7 @@ $result = $model->select(

   where => {"$table1.$key1" => 1}

 );

 is_deeply($result->one,

-  {$key1 => 1, $key2 => 2, "$table2-$key1" => 1, "$table2-$key3" => 3});

+  {$key1 => 1, $key2 => 2, hy"$table2-$key1" => 1, hy"$table2-$key3" => 3});

 is_deeply($model2->select->one, {$key1 => 1, $key3 => 3});

@@ -3074,7 +3087,7 @@ $dbi->create_model(

   ],

   primary_key => [$key1],

 );

-$dbi->setup_model;

+$dbi->setup_model(@$setup_model_args);

 $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1);

 $model = $dbi->model($table1);

 $result = $model->select(column => $key1);

@@ -3859,7 +3872,7 @@ test 'dbi method from model';

 $dbi = MyDBI9->connect;

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

 $dbi->execute($create_table1);

-$dbi->setup_model;

+$dbi->setup_model(@$setup_model_args);

 $model = $dbi->model($table1);

 eval{$model->execute("select * from $table1")};

 ok(!$@);

@@ -3871,7 +3884,7 @@ eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1);

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

 $dbi->execute($create_table2);

-$dbi->setup_model;

+$dbi->setup_model(@$setup_model_args);

 $dbi->execute("insert into $table1 ($key1, $key2) values (1, 2)");

 $dbi->execute("insert into $table2 ($key1, $key3) values (1, 4)");

 $model = $dbi->model($table1);

@@ -3928,7 +3941,7 @@ $dbi->create_model(

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

   ]

 );

-$dbi->setup_model;

+$dbi->setup_model(@$setup_model_args);

 $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1);

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

 $model = $dbi->model($table1);

@@ -4113,7 +4126,7 @@ eval { $dbi->execute("drop table $table2") };

 $dbi->execute($create_table1);

 $dbi->execute($create_table2);

-$dbi->setup_model;

+$dbi->setup_model(@$setup_model_args);

 is_deeply([sort @{$dbi->model($table1)->columns}], [$key1, $key2]);

 is_deeply([sort @{$dbi->model($table2)->columns}], [$key1, $key3]);