@@ -299,13 +299,21 @@ sub each_column {

     my $re = $self->exclude_table;

+    my %tables;

+    

     # Iterate all tables

     my $sth_tables = $self->dbh->table_info;

     while (my $table_info = $sth_tables->fetchrow_hashref) {

-        

         # Table

         my $table = $table_info->{TABLE_NAME};

         next if defined $re && $table =~ /$re/;

+        $tables{$table}++;

+    }

+

+    # Iterate all tables

+    my @tables = sort keys %tables;

+    for (my $i = 0; $i < @tables; $i++) {

+        my $table = $tables[$i];

         # Iterate all columns

         my $sth_columns = $self->dbh->column_info(undef, undef, $table, '%');

@@ -0,0 +1,44 @@

+use strict;

+use warnings;

+

+use FindBin;

+$ENV{DBIX_CUSTOM_TEST_RUN} = 1

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

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

+

+use DBIx::Custom;

+{

+    package DBIx::Custom;

+    no warnings 'redefine';

+

+    my $date_typename = 'date';

+    my $datetime_typename = 'datetime';

+

+    sub date_typename { lc $date_typename }

+    sub datetime_typename { lc $datetime_typename }

+

+    my $date_datatype = 91;

+    my $datetime_datatype = 11;

+

+    sub date_datatype { lc $date_datatype }

+    sub datetime_datatype { lc $datetime_datatype }

+    

+    my $dsn = "dbi:ODBC:driver={SQL Server};Server={localhost\\SQLEXPRESS};"

+      . "Trusted_Connection=No;AutoTranslate=No;Database=dbix_custom;";

+    has dsn => $dsn;

+    has user  => 'dbix_custom';

+    has password => 'dbix_custom';

+    

+    sub create_table1 { 'create table table1 (key1 varchar(255), key2 varchar(255));' }

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

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

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

+    sub create_table1_highperformance { "create table table1 (ab varchar(255), bc varchar(255), "

+      . "ik varchar(255), hi varchar(255), ui varchar(255), pq varchar(255), dc 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))' }

+}

+

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

@@ -155,10 +155,8 @@ my $create_table_reserved = $dbi->create_table_reserved;

 my $q = substr($dbi->quote, 0, 1);

 my $p = substr($dbi->quote, 1, 1) || $q;

 my $date_typename = $dbi->date_typename;

-my $time_typename = $dbi->time_typename;

 my $datetime_typename = $dbi->datetime_typename;

 my $date_datatype = $dbi->date_datatype;

-my $time_datatype = $dbi->time_datatype;

 my $datetime_datatype = $dbi->datetime_datatype;

 # Variable

@@ -193,6 +191,7 @@ my $insert_param;

 my $join;

 my $binary;

+

 # Drop table

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

@@ -200,6 +199,7 @@ test 'type_rule into';

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1_type);

+$DB::single = 1;

 $dbi->type_rule(

     into1 => {

         $date_typename => sub { '2010-' . $_[0] }

@@ -1143,9 +1143,6 @@ is_deeply($rows, [{key1 => 1, key2 => 2}], "table and columns and where key");

 $rows = $dbi->select(table => 'table1', column => ['key1'], where => {key1 => 3})->all;

 is_deeply($rows, [{key1 => 3}], "table and columns and where key");

-$rows = $dbi->select(table => 'table1', append => "order by key1 desc limit 1")->all;

-is_deeply($rows, [{key1 => 3, key2 => 4}], "append statement");

-

 $dbi->register_filter(decrement => sub { $_[0] - 1 });

 $rows = $dbi->select(table => 'table1', where => {key1 => 2}, filter => {key1 => 'decrement'})

             ->all;

@@ -1553,43 +1550,6 @@ is_deeply($infos,

     ]

 );

-test 'limit';

-$dbi = DBIx::Custom->connect;

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

-$dbi->execute($create_table1);

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

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

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

-$dbi->register_tag(

-    limit => sub {

-        my ($count, $offset) = @_;

-        

-        my $s = '';

-        $s .= "limit $count";

-        $s .= " offset $offset" if defined $offset;

-        

-        return [$s, []];

-    }

-);

-$rows = $dbi->select(

-  table => 'table1',

-  where => {key1 => 1},

-  append => "order by key2 {limit 1 0}"

-)->all;

-is_deeply($rows, [{key1 => 1, key2 => 2}]);

-$rows = $dbi->select(

-  table => 'table1',

-  where => {key1 => 1},

-  append => "order by key2 {limit 2 1}"

-)->all;

-is_deeply($rows, [{key1 => 1, key2 => 4},{key1 => 1, key2 => 6}]);

-$rows = $dbi->select(

-  table => 'table1',

-  where => {key1 => 1},

-  append => "order by key2 {limit 1}"

-)->all;

-is_deeply($rows, [{key1 => 1, key2 => 2}]);

-

 test 'connect super';

 $dbi = DBIx::Custom->connect;

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

@@ -172,6 +172,16 @@ is($result->fetch_first->[0], 'A');

 $result = $dbi->select(table => 'table1');

 is($result->one->{key1}, 'A');

+test 'select limit';

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

+$dbi->execute($create_table1);

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

+$dbi->insert(table => 'table1', param => {key1 => 3, key2 => 4});

+$rows = $dbi->select(table => 'table1', append => "order by key1 desc limit 1")->all;

+is_deeply($rows, [{key1 => 3, key2 => 4}], "append statement");

+

+

+

 # DEPRECATED! test

 test 'filter __ expression';

 $dbi = DBIx::Custom->connect;

@@ -216,3 +226,40 @@ $dbi->update(table => 'table', where => {'table.select' => 1}, param => {update

 $result = $dbi->execute("select * from ${q}table$p");

 $rows   = $result->all;

 is_deeply($rows, [{select => 2, update => 6}], "reserved word");

+

+test 'limit tag';

+$dbi = DBIx::Custom->connect;

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

+$dbi->execute($create_table1);

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

+$dbi->insert(table => 'table1', param => {key1 => 1, key2 => 4});

+$dbi->insert(table => 'table1', param => {key1 => 1, key2 => 6});

+$dbi->register_tag(

+    limit => sub {

+        my ($count, $offset) = @_;

+        

+        my $s = '';

+        $s .= "limit $count";

+        $s .= " offset $offset" if defined $offset;

+        

+        return [$s, []];

+    }

+);

+$rows = $dbi->select(

+  table => 'table1',

+  where => {key1 => 1},

+  append => "order by key2 {limit 1 0}"

+)->all;

+is_deeply($rows, [{key1 => 1, key2 => 2}]);

+$rows = $dbi->select(

+  table => 'table1',

+  where => {key1 => 1},

+  append => "order by key2 {limit 2 1}"

+)->all;

+is_deeply($rows, [{key1 => 1, key2 => 4},{key1 => 1, key2 => 6}]);

+$rows = $dbi->select(

+  table => 'table1',

+  where => {key1 => 1},

+  append => "order by key2 {limit 1}"

+)->all;

+is_deeply($rows, [{key1 => 1, key2 => 2}]);