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

 0.1686

-    - 

+    - set reserved_word_quote automatically from driver name

 0.1685

     - insert_at, update_at, delete_at, select_at is DEPRECATED!

       use insert, update, delete, select method and id option.

@@ -180,7 +180,7 @@ sub column {

     # Column clause

     my @column;

     $columns ||= [];

-    push @column, "$q$table$q.$q$_$q as $q${table}${q}__$q$_$q" for @$columns;

+    push @column, "$q$table$q.$q$_$q as $q${table}__$_$q" for @$columns;

     return join (', ', @column);

 }

@@ -274,10 +274,20 @@ sub dbh {

             croak "connector must have dbh() method " . _subname

               unless ref $connector && $connector->can('dbh');

-            return $self->{dbh} = $connector->dbh;

+            $self->{dbh} = $connector->dbh;

         }

-        return $self->{dbh} ||= $self->_connect;

+        # Connect

+        $self->{dbh} ||= $self->_connect;

+        

+        # Quote

+        unless ($self->reserved_word_quote) {

+            my $driver = $self->{dbh}->{Driver}->{Name};

+            my $quote = $driver eq 'mysql' ? '`' : '"';

+            $self->reserved_word_quote($quote);

+        }

+

+        return $self->{dbh};

     }

 }

@@ -772,7 +782,7 @@ sub new {

           unless $self->can($attr);

     }

-    # Register tag

+    # DEPRECATED!

     $self->query_builder->{tags} = {

         '?'     => \&DBIx::Custom::Tag::placeholder,

         '='     => \&DBIx::Custom::Tag::equal,

@@ -6,7 +6,7 @@ use utf8;

 use Encode qw/encode_utf8 decode_utf8/;

 use Data::Dumper;

-#$SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DEPRECATED/};

+$SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DEPRECATED/};

 BEGIN {

     eval { require DBD::SQLite; 1 }

@@ -110,7 +110,6 @@ test 'Insert query return value';

 $dbi->execute($DROP_TABLE->{0});

 $dbi->execute($CREATE_TABLE->{0});

 $source = "insert into table1 {insert_param key1 key2}";

-$DB::single = 1;

 $query = $dbi->create_query($source);

 $ret_val = $dbi->execute($query, param => {key1 => 1, key2 => 2});

 ok($ret_val);