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

 0.2101

+    - micro optimization

     - select method can receive odd number argument. In that case first argument

       is column option.

     - fixed update_or_insert bug that when parameter don't contain any key-value

@@ -1259,12 +1259,15 @@ sub _create_query {

         else {

             my @columns;

             my $c = $self->{safety_character};

+            my $re = $c eq 'a-zA-Z0-9_'

+              ? qr/(.*?[^\\]):([$c\.]+)(?:\{(.*?)\})?(.*)/so

+              : qr/(.*?[^\\]):([$c\.]+)(?:\{(.*?)\})?(.*)/s;

             my %duplicate;

             my $duplicate;

             # Parameter regex

             $sql =~ s/([0-9]):/$1\\:/g;

             my $new_sql = '';

-            while ($sql =~ /(.*?[^\\]):([$c\.]+)(?:\{(.*?)\})?(.*)/s) {

+            while ($sql =~ /$re/) {

                 push @columns, $2;

                 $duplicate = 1 if ++$duplicate{$columns[-1]} > 1;

                 ($new_sql, $sql) = defined $3 ?

@@ -37,7 +37,10 @@ sub to_string {

     my $where = [];

     my $count = {};

     $self->{_query_builder} = $self->dbi->query_builder;

-    $self->{_safety_character} = $self->dbi->safety_character;

+    my $c = $self->dbi->safety_character;

+    $self->{_re} = $c eq 'a-zA-Z0-9_' ?

+      qr/[^\\]:([$c\.]+)/so : qr/[^\\]:([$c\.]+)/s;

+    

     $self->{_quote} = $self->dbi->_quote;

     $self->{_tag_parse} = exists $ENV{DBIX_CUSTOM_TAG_PARSE}

       ? $ENV{DBIX_CUSTOM_TAG_PARSE} : $self->dbi->{tag_parse};

@@ -90,7 +93,7 @@ sub _parse {

         my $pushed;

         # Column

-        my $c = $self->{_safety_character};

+        my $re = $self->{_re};

         my $column;

         my $sql = " " . $clause || '';

@@ -100,7 +103,7 @@ sub _parse {

         }

         else {

             $sql =~ s/([0-9]):/$1\\:/g;

-            ($column) = $sql =~ /[^\\]:([$c\.]+)/s;

+            ($column) = $sql =~ /$re/;

         }

         unless (defined $column) {

             push @$where, $clause;

@@ -243,7 +243,6 @@ test 'execute reuse option';

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

 $dbi->execute($create_table1);

 $reuse = {};

-$DB::single = 1;

 for my $i (1 .. 2) {

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

 }