@@ -84,12 +84,11 @@ sub assign_param {

     # Create set tag

     my @params;

     my $safety = $self->safety_character;

-    my $q = $self->_quote;

     foreach my $column (keys %$param) {

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

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

-        my $column_quote = "$q$column$q";

-        $column_quote =~ s/\./$q.$q/;

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

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

         push @params, "$column_quote = :$column";

     }

     my $tag = join(', ', @params);

@@ -109,16 +108,14 @@ sub column {

         $columns ||= $self->model($real_table)->columns;

     }

-    # Reserved word quote

-    my $q = $self->_quote;

-    

     # Separator

     my $separator = $self->separator;

     # Column clause

     my @column;

     $columns ||= [];

-    push @column, "$q$table$q.$q$_$q as $q${table}${separator}$_$q"

+    push @column, $self->_q($table) . "." . $self->_q($_) .

+      " as " . $self->_q("${table}${separator}$_")

       for @$columns;

     return join (', ', @column);

@@ -208,10 +205,9 @@ sub delete {

     # Delete statement

     my @sql;

-    my $q = $self->_quote;

     push @sql, "delete";

     push @sql, $prefix if defined $prefix;

-    push @sql, "from $q$table$q $where_clause";

+    push @sql, "from " . $self->_q($table) . " $where_clause";

     push @sql, $append if defined $append;

     my $sql = join(' ', @sql);

@@ -334,7 +330,8 @@ sub execute {

     my $main_table = pop @$tables;

     $tables = $self->_remove_duplicate_table($tables, $main_table);

     if (my $q = $self->_quote) {

-        $_ =~ s/$q//g for @$tables;

+        $q = quotemeta($q);

+        $_ =~ s/[$q]//g for @$tables;

     }

     # Type rule

@@ -499,14 +496,11 @@ sub insert {

         $param = $self->merge_param($id_param, $param);

     }

-    # Reserved word quote

-    my $q = $self->_quote;

-    

     # Insert statement

     my @sql;

     push @sql, "insert";

     push @sql, $prefix if defined $prefix;

-    push @sql, "into $q$table$q " . $self->insert_param($param);

+    push @sql, "into " . $self->_q($table) . " " . $self->insert_param($param);

     push @sql, $append if defined $append;

     my $sql = join (' ', @sql);

@@ -519,14 +513,13 @@ sub insert_param {

     # Create insert parameter tag

     my $safety = $self->safety_character;

-    my $q = $self->_quote;

     my @columns;

     my @placeholders;

     foreach my $column (keys %$param) {

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

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

-        my $column_quote = "$q$column$q";

-        $column_quote =~ s/\./$q.$q/;

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

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

         push @columns, $column_quote;

         push @placeholders, ":$column";

     }

@@ -698,9 +691,10 @@ sub mycolumn {

     # Create column clause

     my @column;

-    my $q = $self->_quote;

     $columns ||= [];

-    push @column, "$q$table$q.$q$_$q as $q$_$q" for @$columns;

+    push @column, $self->_q($table) . "." . $self->_q($_) .

+      " as " . $self->_q($_)

+      for @$columns;

     return join (', ', @column);

 }

@@ -737,7 +731,7 @@ sub not_exists { bless {}, 'DBIx::Custom::NotExists' }

 sub order {

     my $self = shift;

-    return DBIx::Custom::Order->new(quote => $self->quote, @_);

+    return DBIx::Custom::Order->new(dbi => $self, @_);

 }

 sub register_filter {

@@ -787,9 +781,6 @@ sub select {

     my @sql;

     push @sql, 'select';

-    # Reserved word quote

-    my $q = $self->_quote;

-    

     # Prefix

     push @sql, $prefix if defined $prefix;

@@ -806,7 +797,7 @@ sub select {

                     splice @$column, 1, 1;

                 }

-                $column = join(' ', $column->[0], 'as', $q . $column->[1] . $q);

+                $column = join(' ', $column->[0], 'as', $self->_q($column->[1]));

             }

             unshift @$tables, @{$self->_search_tables($column)};

             push @sql, ($column, ',');

@@ -820,13 +811,13 @@ sub select {

     if ($relation) {

         my $found = {};

         foreach my $table (@$tables) {

-            push @sql, ("$q$table$q", ',') unless $found->{$table};

+            push @sql, ($self->_q($table), ',') unless $found->{$table};

             $found->{$table} = 1;

         }

     }

     else {

         my $main_table = $tables->[-1] || '';

-        push @sql, "$q$main_table$q";

+        push @sql, $self->_q($main_table);

     }

     pop @sql if ($sql[-1] || '') eq ',';

     croak "Not found table name " . _subname

@@ -1060,10 +1051,9 @@ sub update {

     # Update statement

     my @sql;

-    my $q = $self->_quote;

     push @sql, "update";

     push @sql, $prefix if defined $prefix;

-    push @sql, "$q$table$q $update_clause $where_clause";

+    push @sql, $self->_q($table) . " $update_clause $where_clause";

     push @sql, $append if defined $append;

     # SQL

@@ -1131,7 +1121,8 @@ sub _create_query {

         # Remove reserved word quote

         if (my $q = $self->_quote) {

-            $_ =~ s/$q//g for @{$query->columns}

+            $q = quotemeta($q);

+            $_ =~ s/[$q]//g for @{$query->columns}

         }

         # Save query to cache

@@ -1336,7 +1327,7 @@ sub _push_join {

             my $j_clause = (split /\s+on\s+/, $join_clause)[-1];

             $j_clause =~ s/'.+?'//g;

             my $q_re = quotemeta($q);

-            $j_clause =~ s/$q_re//g;

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

             my $c = $self->safety_character;

             my $join_re = qr/(?:^|\s)($c+)\.$c+\s+=\s+($c+)\.$c+/;

             if ($j_clause =~ $join_re) {

@@ -1376,13 +1367,17 @@ sub _quote {

 }

 sub _q {

-    my $self = shift;

+    my ($self, $value) = @_;

     my $quote = $self->_quote;

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

-    my $p = substr($quote, 1, 1) || $q || '';

+    my $p;

+    if (defined $quote && length $quote > 1) {

+        $p = substr($quote, 1, 1);

+    }

+    else { $p = $q }

-    return ($q, $p);

+    return "$q$value$p";

 }

 sub _remove_duplicate_table {

@@ -1403,7 +1398,8 @@ sub _search_tables {

     my $safety_character = $self->safety_character;

     my $q = $self->_quote;

     my $q_re = quotemeta($q);

-    my $table_re = $q ? qr/(?:^|[^$safety_character])$q_re?([$safety_character]+)$q_re?\./

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

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

                       : qr/(?:^|[^$safety_character])([$safety_character]+)\./;

     while ($source =~ /$table_re/g) {

         push @$tables, $1;

@@ -1422,8 +1418,8 @@ sub _where_to_obj {

         my $clause = ['and'];

         my $q = $self->_quote;

         foreach my $column (keys %$where) {

-            my $column_quote = "$q$column$q";

-            $column_quote =~ s/\./$q.$q/;

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

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

             push @$clause, "$column_quote = :$column" for keys %$where;

         }

         $obj = $self->where(clause => $clause, param => $where);

@@ -7,16 +7,15 @@ use overload

 has orders => sub { [] },

-    quote => '';

+    dbi => '';

 sub prepend {

     my $self = shift;

-    my $q = $self->quote;

     foreach my $order (reverse @_) {

         if (ref $order eq 'ARRAY') {

             my $column = shift @$order;

-            $column = "$q$column$q" if defined $column;

+            $column = $self->dbi->_q($column) if defined $column;

             my $derection = shift @$order;

             $order = $column;

             $order .= " $derection" if $derection;

@@ -107,7 +107,8 @@ sub _parse {

         # Remove quote

         my $column = $columns->[0];

         if (my $q = $self->quote) {

-            $column =~ s/$q//g;

+            $q = quotemeta($q);

+            $column =~ s/[$q]//g;

         }

         # Check safety