@@ -51,7 +51,7 @@ has [qw/connector dsn password quote user/],

     },

     last_sql => '',

     models => sub { {} },

-    query_builder => sub { DBIx::Custom::QueryBuilder->new },

+    query_builder => sub { DBIx::Custom::QueryBuilder->new(_dbi => shift) },

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

     safety_character => '\w',

     stash => sub { {} },

@@ -1114,7 +1114,6 @@ sub _create_query {

         # Create query

         my $builder = $self->query_builder;

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

-        $builder->safety_character($self->safety_character);

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

         # Remove reserved word quote

@@ -10,8 +10,6 @@ use DBIx::Custom::Util '_subname';

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

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

-has 'safety_character';

-

 sub build_query {

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

@@ -72,7 +70,7 @@ sub _parse_parameter {

     # Get and replace parameters

     my $sql = $source || '';

     my $columns = [];

-    my $c = $self->safety_character;

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

     # Parameter regex

     $sql =~ s/([^:]):(\d+):([^:])/$1\\:$2\\:$3/g;

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

@@ -57,7 +57,6 @@ $datas = [

 for (my $i = 0; $i < @$datas; $i++) {

     my $data = $datas->[$i];

     my $builder = DBIx::Custom->new->query_builder;

-    $builder->safety_character('\w');

     my $query = $builder->build_query($data->{source});

     is($query->{sql}, $data->{sql_expected}, "$data->{name} : sql");

     is_deeply($query->columns, $data->{columns_expected}, "$data->{name} : columns");

@@ -66,7 +65,6 @@ for (my $i = 0; $i < @$datas; $i++) {

 test 'Original tag';

 $builder = DBIx::Custom->new->query_builder;

-$builder->safety_character('\w');

 $ret_val = $builder->register_tag(

     p => sub {

@@ -86,7 +84,6 @@ isa_ok($ret_val, 'DBIx::Custom::QueryBuilder');

 test "Tag error case";

 $builder = DBIx::Custom->new->query_builder;

-$builder->safety_character('\w');

 eval{$builder->build_query('{? }')};

 like($@, qr/\QColumn name must be specified in tag "{? }"/, "? not arguments");

@@ -122,7 +119,6 @@ $builder->register_tag(

 test 'General error case';

 $builder = DBIx::Custom->new->query_builder;

-$builder->safety_character('\w');

 $builder->register_tag(

     a => sub {

         return ["? ? ?", ['']];