@@ -21,7 +21,7 @@ use Scalar::Util qw/weaken/;

 has [qw/connector dsn password quote user exclude_table user_table_info

-        user_column_info/],

+        user_column_info safety_character/],

     cache => 0,

     cache_method => sub {

         sub {

@@ -70,7 +70,6 @@ has [qw/connector dsn password quote user exclude_table user_table_info

         return $builder;

     },

     result_class  => 'DBIx::Custom::Result',

-    safety_character => '\w',

     separator => '.',

     stash => sub { {} };

@@ -395,12 +394,12 @@ sub execute {

     else {

         $query = $opt{reuse}->{$sql} if $opt{reuse};

         unless ($query) {

-            my $safety = $self->{safety_character} || $self->safety_character;

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

             # Check unsafety keys

-            unless ((join('', keys %$param) || '') =~ /^[$safety\.]+$/) {

+            unless ((join('', keys %$param) || '') =~ /^[$c\.]+$/) {

                 for my $column (keys %$param) {

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

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

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

                 }

             }

             $query = $self->_create_query($sql,$opt{after_build_sql} || $opt{sqlfilter});

@@ -829,6 +828,9 @@ sub new {

         croak qq{Invalid attribute: "$attr" } . _subname

           unless $self->can($attr);

     }

+    

+    $self->{safety_character} = 'a-zA-Z0-9_'

+      unless exists $self->{safety_character};

     # DEPRECATED

     $self->{_tags} = {

@@ -1256,7 +1258,7 @@ sub _create_query {

         }

         else {

             my @columns;

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

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

             my %duplicate;

             my $duplicate;

             # Parameter regex

@@ -1501,8 +1503,8 @@ sub _push_join {

             $j_clause =~ s/[$q_re]//g;

             my @j_clauses = reverse split /\s(and|on)\s/, $j_clause;

-            my $c = $self->safety_character;

-            my $join_re = qr/($c+)\.$c+[^$c].*?($c+)\.$c+/sm;

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

+            my $join_re = qr/([$c]+)\.[$c]+[^$c].*?([$c]+)\.[$c]+/sm;

             for my $clause (@j_clauses) {

                 if ($clause =~ $join_re) {

                     $table1 = $1;

@@ -1559,7 +1561,7 @@ sub _search_tables {

     # Search tables

     my $tables = [];

-    my $safety_character = $self->safety_character;

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

     my $q = $self->_quote;

     my $quoted_safety_character_re = $self->q("?([$safety_character]+)", 1);

     my $table_re = $q ? qr/(?:^|[^$safety_character])${quoted_safety_character_re}?\./

@@ -1604,7 +1606,7 @@ sub _where_clause_and_param {

             }

             # Check unsafety column

-            my $safety = $self->safety_character;

+            my $safety = $self->{safety_character};

             unless ($column_join =~ /^[$safety\.]+$/) {

                 for my $column (keys %$where) {

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

@@ -1,3 +1,4 @@

+# DEPRECATED!

 package DBIx::Custom::QueryBuilder;

 use Object::Simple -base;

@@ -10,44 +11,27 @@ use DBIx::Custom::Util '_subname';

 push @DBIx::Custom::CARP_NOT, __PACKAGE__;

 push @DBIx::Custom::Where::CARP_NOT, __PACKAGE__;

+# DEPRECATED!

 sub build_query {

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

-    

-    # Parse tag. tag is DEPRECATED!

-    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! / .

-             qq/use parameter system such as :name instead/

-          if $tag_count;

-        my $query2 = $self->_parse_parameter($query->sql);

-        $query->sql($query2->sql);

-        for (my $i =0; $i < @{$query->columns}; $i++) {

-            my $column = $query->columns->[$i];

-            if ($column eq 'RESERVED_PARAMETER') {

-                my $column2 = shift @{$query2->columns};

-                croak ":name syntax is wrong"

-                  unless defined $column2;

-                $query->columns->[$i] = $column2;

-            }

+

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

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

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

+         qq/use parameter system such as :name instead/

+      if $tag_count;

+    my $query2 = $self->_parse_parameter($query->sql);

+    $query->sql($query2->sql);

+    for (my $i =0; $i < @{$query->columns}; $i++) {

+        my $column = $query->columns->[$i];

+        if ($column eq 'RESERVED_PARAMETER') {

+            my $column2 = shift @{$query2->columns};

+            croak ":name syntax is wrong"

+              unless defined $column2;

+            $query->columns->[$i] = $column2;

         }

-        return $query;

-    }

-    

-    $sql ||= '';

-    my $columns = [];

-    my $c = ($self->{dbi} || {})->{safety_character}

-      || $self->dbi->safety_character;

-    # Parameter regex

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

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

-        push @$columns, $2;

-        $sql = defined $3 ? "$1$2 $3 ?$4" : "$1?$4";

     }

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

-

-    # Create query

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

+    return $query;

 }

 # DEPRECATED!

@@ -289,8 +273,4 @@ sub register_tag_processor {

 DBIx::Custom::QueryBuilder - DEPRECATED!

-=head1 DESCRIPTION

-

-This module functionality will be moved to DBIx::Custom

-

 =cut