@@ -123,6 +123,10 @@ sub assign_clause {

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

     my $wrap = $opts->{wrap} || {};

+

+    my $qp = $self->_q('');

+    my $q = substr($qp, 0, 1) || '';

+    my $p = substr($qp, 1, 1) || '';

     # Create set tag

     my @params;

@@ -130,8 +134,8 @@ sub assign_clause {

     for my $column (sort keys %$param) {

         croak qq{"$column" is not safety column name } . _subname

           unless $column =~ /^[$safety\.]+$/;

-        my $column_quote = $self->_q($column);

-        $column_quote =~ s/\./$self->_q(".")/e;

+        my $column_quote = "$q$column$p";

+        $column_quote =~ s/\./$p.$q/;

         my $func = $wrap->{$column} || sub { $_[0] };

         push @params,

           ref $param->{$column} eq 'SCALAR' ? "$column_quote = " . ${$param->{$column}}

@@ -1081,8 +1085,8 @@ sub values_clause {

     my @columns;

     my @placeholders;

     my $qp = $self->_q('');

-    my $q = substr($qp, 0, 1);

-    my $p = substr($qp, 1, 1);

+    my $q = substr($qp, 0, 1) || '';

+    my $p = substr($qp, 1, 1) || '';

     for my $column (sort keys %$param) {

         croak qq{"$column" is not safety column name } . _subname