@@ -1126,11 +1126,16 @@ sub setup_model {

     sub {

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

       my $schema = $column_info->{TABLE_SCHEM};

-      return if exists $opt{schema} && $opt{schema} ne $schema;

-      $table = "$schema.$table" if exists $opt{prefix};

+      my $default_schema = $self->default_schema;

+      

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

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

+        if (!defined $default_schema || $default_schema eq $schema) {

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

+        }

+      }

+      if (my $fullqualified_model = $self->models->{"$schema.$table"}) {

+        push @{$fullqualified_model->columns}, $column;

       }

     }

   );

@@ -1218,7 +1223,7 @@ sub type_rule {

           my $schema = $column_info->{TABLE_SCHEM};

           my $default_schema = $self->default_schema;

-          if (!defined $default_schema || (defined $default_schema && $default_schema eq $schema)) {

+          if (!defined $default_schema || $default_schema eq $schema) {

             $self->{"_$into"}{key}{$table}{$column} = $filter;

             $self->{"_$into"}{dot}{"$table.$column"} = $filter;

           }

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

 =head2 C<setup_model>

   $dbi->setup_model;

-  $dbi->setup_model(schema => 'main');

-  $dbi->setup_model(schema => '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(

@@ -43,7 +43,7 @@ use DBIx::Custom;

   has key8 => $key8;

   has key9 => $key9;

   has key10 => $key10;

-  has setup_model_args => sub { [database => 'dbix_custom', prefix => 1] };

+  has default_schema => 'dbix_custom';

   my $date_typename = 'Date';

   my $datetime_typename = 'Datetime';

@@ -39,7 +39,6 @@ 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';

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

   has key8 => $key8;

   has key9 => $key9;

   has key10 => $key10;

+  has default_schema => 'main';

   my $date_typename = 'Date';

   my $datetime_typename = 'Datetime';

@@ -75,7 +75,6 @@ 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;

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

 $dbi->execute($create_table1);

 $dbi->execute($create_table2);

 $dbi->separator('__');

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

+$dbi->setup_model;

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

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

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

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

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

 $dbi->execute($create_table1);

 $dbi->execute($create_table2);

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

+$dbi->setup_model;

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

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

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

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

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

 $dbi->execute($create_table1);

 $dbi->execute($create_table2);

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

+$dbi->setup_model;

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

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

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

@@ -3103,7 +3102,7 @@ $dbi->create_model(

 $model2 = $dbi->create_model(

   table => $table2,

 );

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

+$dbi->setup_model;

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

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

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

@@ -3160,7 +3159,7 @@ $dbi->create_model(

   ],

   primary_key => [$key1],

 );

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

+$dbi->setup_model;

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

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

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

@@ -3945,7 +3944,7 @@ test 'dbi method from model';

 $dbi = MyDBI9->connect;

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

 $dbi->execute($create_table1);

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

+$dbi->setup_model;

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

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

 ok(!$@);

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

 $dbi->execute($create_table1);

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

 $dbi->execute($create_table2);

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

+$dbi->setup_model;

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

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

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

@@ -4014,7 +4013,7 @@ $dbi->create_model(

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

   ]

 );

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

+$dbi->setup_model;

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

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

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

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

 $dbi->execute($create_table1);

 $dbi->execute($create_table2);

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

+$dbi->setup_model;

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

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