@@ -317,7 +317,6 @@ sub each_column {

         eval {$sth_columns = $self->dbh->column_info(undef, $schema, $table, '%')};

         next if $@;

         while (my $column_info = $sth_columns->fetchrow_hashref) {

-          $DB::single = 1;

           my $column = $column_info->{COLUMN_NAME};

           $self->$cb($table, $column, $column_info);

         }

@@ -0,0 +1,78 @@

+use strict;

+use warnings;

+

+use FindBin;

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

+$ENV{DBIX_CUSTOM_TEST_RUN} = 1

+  if -f "$FindBin::Bin/run/common-mysql-fullqualified.run";

+$ENV{DBIX_CUSTOM_SKIP_MESSAGE} = 'mysql private test';

+

+

+

+use DBIx::Custom;

+{

+  package DBIx::Custom;

+  no warnings 'redefine';

+

+  my $table1 = 'dbix_custom.table1';

+  my $table2 = 'dbix_custom.table2';

+  my $table2_alias = 'dbix_custom.table2_alias';

+  my $table3 = 'dbix_custom.table3';

+  my $key1 = 'key1';

+  my $key2 = 'key2';

+  my $key3 = 'key3';

+  my $key4 = 'key4';

+  my $key5 = 'key5';

+  my $key6 = 'key6';

+  my $key7 = 'key7';

+  my $key8 = 'key8';

+  my $key9 = 'key9';

+  my $key10 = 'key10';

+

+  has table1 => $table1;

+  has table2 => $table2;

+  has table2_alias => $table2_alias;

+  has table3 => $table3;

+  has key1 => $key1;

+  has key2 => $key2;

+  has key3 => $key3;

+  has key4 => $key4;

+  has key5 => $key5;

+  has key6 => $key6;

+  has key7 => $key7;

+  has key8 => $key8;

+  has key9 => $key9;

+  has key10 => $key10;

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

+

+  my $date_typename = 'Date';

+  my $datetime_typename = 'Datetime';

+  

+  sub date_typename { lc $date_typename }

+  sub datetime_typename { lc $datetime_typename }

+

+  my $date_datatype = 9;

+  my $datetime_datatype = 11;

+  

+  sub date_datatype { lc $date_datatype }

+  sub datetime_datatype { lc $datetime_datatype }

+

+  no warnings 'redefine';

+  has dsn => "dbi:mysql:database=dbix_custom";

+  has user => 'dbix_custom';

+  has password => 'dbix_custom';

+  

+  sub create_table1 { "create table $table1 ($key1 varchar(255), $key2 varchar(255)) engine=InnoDB" }

+  sub create_table1_2 { "create table $table1 ($key1 varchar(255), $key2 varchar(255), "

+   . "$key3 varchar(255), key4 varchar(255), key5 varchar(255)) engine=InnoDB" }

+  sub create_table1_type { "create table $table1 ($key1 $date_typename, $key2 $datetime_typename) engine=InnoDB" }

+  sub create_table1_highperformance { "create table $table1 ($key1 varchar(255), $key2 varchar(255), "

+    . "$key3 varchar(255), $key4 varchar(255), $key5 varchar(255), $key6 varchar(255), $key7 varchar(255)) 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' }

+}

+

+require "$FindBin::Bin/common.t";

@@ -237,7 +237,38 @@ require MyDBI1;

   }

   sub list { shift->select; }

+

+  package MyModel2::dbix_custom::table1;

+

+  use strict;

+  use warnings;

+

+  use base 'MyModel2::Base1';

+

+  sub insert {

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

+    

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

+  }

+

+  sub list { shift->select; }

+

+  package MyModel2::dbix_custom::table2;

+

+  use strict;

+  use warnings;

+

+  use base 'MyModel2::Base1';

+

+  sub insert {

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

+    

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

+  }

+

+  sub list { shift->select; }

 }

+

 {

    package MyDBI5;

@@ -3930,6 +3961,7 @@ $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);

+$DB::single = 1;

 $result = $model->select(

   column => [

     $model->column($table2, {alias => u$table2_alias})

@@ -4800,13 +4832,13 @@ $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1);

 $sql = <<"EOS";

 left outer join (

 select * from $table1 t1

-where t1.$key2 = (

-  select max(t2.$key2) from $table1 t2

-  where t1.$key1 = t2.$key1

-)

+  where t1.$key2 = (

+    select max(t2.$key2) from $table1 t2

+    where t1.$key1 = t2.$key1

+  )

 ) $table3 on $table1.$key1 = $table3.$key1

 EOS

-$sql =~ s/\Qmain.table3/main_table3/g;

+$sql =~ s/\Q.table3/_table3/g;

 $join = [$sql];

 $rows = $dbi->select(

   table => $table1,

@@ -1,7 +1,14 @@

 package MyModel8::table1;

 use MyModel8 -base;

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

+has join => sub {

+  my $self = shift;

+  

+  my $alias = 'table2_alias';

+  $alias =~ s/\./_/g;

+  

+  return ["left join table2 $alias on table1.key1 = $alias.key1"];

+};

 1;

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

+package MyModel1::dbix_custom::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::dbix_custom::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,9 @@

+package MyModel4::dbix_custom::table1;

+

+use MyModel4 -base;

+

+has table => 'dbix_custom.table1';

+

+sub list { shift->select }

+

+1;

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

+package MyModel4::dbix_custom::table2;

+

+use base 'MyModel4';

+

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

+sub list { shift->select }

+

+1;

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

+package MyModel5::dbix_custom::table1;

+

+use MyModel5 -base;

+

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

+

+1;

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

+package MyModel5::dbix_custom::table2;

+

+use strict;

+use warnings;

+

+use base 'MyModel5';

+

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

+

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

+

+1;

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

+package MyModel5::dbix_custom::table3;

+

+use strict;

+use warnings;

+

+use base 'MyModel5';

+

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

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

+

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

+

+1;

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

+package MyModel6::dbix_custom::table1;

+

+use base 'MyModel6';

+

+__PACKAGE__->attr(

+    join => sub {

+      [

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

+      ]

+    },

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

+);

+

+1;

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

+package MyModel6::dbix_custom::table2;

+

+use base 'MyModel6';

+

+1;

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

+package MyModel6::dbix_custom::table3;

+

+use base 'MyModel6';

+

+__PACKAGE__->attr(filter => sub {

+  [

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

+  ]

+});

+

+1;

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

+package MyModel7::dbix_custom::table1;

+

+use base 'MyModel7';

+

+__PACKAGE__->attr(

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

+  join => sub {

+    [

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

+    ]

+  },

+);

+

+1;

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

+package MyModel7::dbix_custom::table2;

+

+use base 'MyModel7';

+

+1;

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

+package MyModel8::dbix_custom::table1;

+use MyModel8 -base;

+

+has join => sub {

+  my $self = shift;

+  

+  my $alias = 'dbix_custom.table2_alias';

+  $alias =~ s/\./_/g;

+  

+  return ["left join dbix_custom.table2 $alias on dbix_custom.table1.key1 = $alias.key1"];

+};

+

+

+1;

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

+package MyModel8::dbix_custom::table2;

+use MyModel8 -base;

+

+has filter => sub {

+  {

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

+  }

+};

+

+1;

@@ -2,11 +2,12 @@ package MyModel8::main::table1;

 use MyModel8 -base;

 has join => sub {

-   my $self = shift;

-   

-   my ($q, $p) = $self->_qp;

-   

-   return ["left join main.table2 main_table2_alias on main.table1.key1 = main_table2_alias.key1"]

+  my $self = shift;

+  

+  my $alias = 'main.table2_alias';

+  $alias =~ s/\./_/g;

+  

+  return ["left join main.table2 $alias on main.table1.key1 = $alias.key1"];

 };

@@ -3,12 +3,12 @@ package MyModel6::TABLE1;

 use base 'MyModel6';

 __PACKAGE__->attr(

-  join => sub {

-    [

-      'left outer join TABLE2 on TABLE1.KEY1 = TABLE2.KEY1'

-    ]

-  },

-  primary_key => sub { ['KEY1'] }

+    join => sub {

+      [

+        'left outer join TABLE2 on TABLE1.KEY1 = TABLE2.KEY1'

+      ]

+    },

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

 );

 1;

@@ -1,7 +1,14 @@

 package MyModel8::TABLE1;

 use MyModel8 -base;

-has join => sub { ['left join TABLE2 TABLE2_ALIAS on TABLE1.KEY1 = TABLE2_ALIAS.KEY1'] };

+has join => sub {

+  my $self = shift;

+  

+  my $alias = 'TABLE2_ALIAS';

+  $alias =~ s/\./_/g;

+  

+  return ["left join TABLE2 $alias on TABLE1.KEY1 = $alias.KEY1"];

+};

 1;

@@ -27,23 +27,26 @@ for my $dir (@dirs) {

     my @files = grep { /table\d\.pm/ } glob("$dir/*");

     for my $file (@files) {

-      my $content = do {

-        open my $fh, '<', $file;

-        local $/;

-        <$fh>;

-      };

+      for my $database (qw/main dbix_custom/) {

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

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

-      

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

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

-      $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: $!";

-      

-      print $fh $content;

+        my $content = do {

+          open my $fh, '<', $file;

+          local $/;

+          <$fh>;

+        };

+        

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

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

+        

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

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

+        $base_name = $base_name;

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

+        

+        open my $fh, '>', $new_file

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

+        

+        print $fh $content;

+      }

     }

 }