@@ -1235,8 +1235,27 @@ sub _create_query {

     unless ($query) {

         # Create query

-        my $builder = $self->query_builder;

-        $query = $builder->build_query($source);

+        if (exists $ENV{DBIX_CUSTOM_TAG_PARSE} && !$ENV{DBIX_CUSTOM_TAG_PARSE}) {

+            $source ||= '';

+            my $columns = [];

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

+            my %duplicate;

+            my $duplicate;

+            # Parameter regex

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

+            while ($source =~ /(^|.*?[^\\]):([$c\.]+)(?:\{(.*?)\})?(.*)/sg) {

+                push @$columns, $2;

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

+                $source = defined $3 ? "$1$2 $3 ?$4" : "$1?$4";

+            }

+            $source =~ s/\\:/:/g if index($source, "\\:") != -1;

+

+            # Create query

+            $query = {sql => $source, columns => $columns, duplicate => $duplicate};

+        }

+        else {

+            $query = $self->query_builder->build_query($source);

+        }

         # Save query to cache

         $self->cache_method->(

@@ -1268,7 +1287,7 @@ sub _create_query {

     $query->{sth} = $sth;

     # Set filters

-    $query->{filters} = $self->filters;

+    $query->{filters} = $self->{filters} || $self->filters;

     return $query;

 }

@@ -14,12 +14,7 @@ sub build_query {

     my ($self, $sql) = @_;

     # Parse tag. tag is DEPRECATED!

-    my $tag_parse;

-    $tag_parse = $ENV{DBIX_CUSTOM_TAG_PARSE}

-      if exists $ENV{DBIX_CUSTOM_TAG_PARSE};

-    $tag_parse = $self->dbi->{tag_parse} unless defined $tag_parse;

-    

-    if ($tag_parse && $sql =~ /(\s|^)\{/) {

+    if ($self->dbi->{tag_parse} && $sql =~ /(\s|^)\{/) {

         my $query = $self->_parse_tag($sql);

         my $tag_count = delete $query->{tag_count};

         warn qq/Tag system such as {? name} is DEPRECATED! / .

@@ -52,7 +47,7 @@ sub build_query {

     $sql =~ s/\\:/:/g if index($sql, "\\:") != -1;

     # Create query

-    return {sql => $sql, columns => $columns};

+    return {sql => $sql, columns => $columns, duplicate => 1};

 }

 # DEPRECATED!

@@ -39,7 +39,8 @@ sub to_string {

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

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

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

-    $self->{_tag_parse} = $self->dbi->{tag_parse};

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

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

     $self->_parse($clause, $where, $count, 'and');

     # Stringify

@@ -3056,6 +3056,8 @@ test 'DBIX_CUSTOM_TAG_PARSE environment variable';

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

     eval {$dbi->execute("select * from $table1 where {= $key1}", {$key1 => 1})};

     ok($@);

+    eval {$dbi->select(table => $table1, where => ["{= $key1}", {$key1 => 1}]) };

+    ok($@);

     delete$ENV{DBIX_CUSTOM_TAG_PARSE};

 }

@@ -3065,7 +3067,7 @@ test 'DBIX_CUSTOM_TAG_PARSE environment variable';

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

     $dbi->execute($create_table1);

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

-    is($dbi->select(table => $table1)->one->{$key1}, 1);

+    is($dbi->select(table => $table1, wher => {$key1 => 1})->one->{$key1}, 1);

     delete$ENV{DBIX_CUSTOM_TAG_PARSE};

 }