@@ -1,4 +1,6 @@

 0.1614

+  removed DBIx::Custom::Query start_tag and end tag attributes

+  enable escaping '{' and '}' in the source of SQL

   fixed Carp Carp trust relationship

 0.1613

   added experimental register_method() method

@@ -896,11 +896,11 @@ The following tags is available.

 See also L<DBIx::Custom::QueryBuilder>.

-Default start tag is '{'. end tag is '}'.

-You can change this tag.

+C<{> and C<}> is reserved. If you use these charactors,

+you must escape them using '\'. Note that '\' is

+already perl escaped charactor, so you must write '\\'. 

-    $dbi->query_builder->start_tag('|');

-    $dbi->query_builder->end_tag('|');

+    'select * from books \\{ something statement \\}'

 =head2 6. Filtering

@@ -1115,8 +1115,6 @@ You can change Result class if you need.

 You can custamize SQL builder object

     my $dbi = DBIx::Custom->connect(...);

-    $dbi->query_builder->start_tag('|');

-    $dbi->query_builder->end_tag('|');

     $dbi->query_builder->register_tag_processor(

         name => sub {

            ...

@@ -27,9 +27,6 @@ __PACKAGE__->register_tag_processor(

     'update_param' => \&DBIx::Custom::QueryBuilder::TagProcessors::expand_update_param_tag

 );

-__PACKAGE__->attr(tag_start => '{');

-__PACKAGE__->attr(tag_end   => '}');

-

 sub register_tag_processor {

     my $self = shift;

@@ -59,51 +56,134 @@ sub _parse {

     $source ||= '';

     # Tree

-    my $tree = [];

-    

-    # Start tag

-    my $tag_start = quotemeta $self->tag_start;

-    croak qq{tag_start must be a charactor}

-      if !$tag_start || length $tag_start == 1;

+    my @tree;

-    # End tag

-    my $tag_end   = quotemeta $self->tag_end;

-    croak qq{tag_end must be a charactor}

-      if !$tag_end || length $tag_end == 1;

+    # Value

+    my $value = '';

-    # Tokenize

+    # State

     my $state = 'text';

-    # Save original source

-    my $original = $source;

+    # Before charactor

+    my $before = '';

+

+    # Position

+    my $pos;

     # Parse

-    while ($source =~ s/([^$tag_start]*?)$tag_start([^$tag_end].*?)$tag_end//sm) {

-        my $text = $1;

-        my $tag  = $2;

+    while (my $c = substr($source, 0, 1, '')) {

-        # Parse tree

-        push @$tree, {type => 'text', tag_args => [$text]} if $text;

+        # State is text

+        if ($state eq 'text') {

+            

+            # Tag start charactor

+            if ($c eq '{') {

+                

+                # Escaped charactor

+                if ($before eq "\\") {

+                    substr($value, -1, 1, '');

+                    $value .= $c;

+                }

+                

+                # Tag start

+                else {

+                    

+                    # Change state

+                    $state = 'tag';

+                    

+                    # Add text

+                    push @tree, {type => 'text', value => $value}

+                      if $value;

+                    

+                    # Clear

+                    $value = '';

+                }

+            }

+            

+            # Tag end charactor

+            elsif ($c eq '}') {

+            

+                # Escaped charactor

+                if ($before eq "\\") {

+                    substr($value, -1, 1, '');

+                    $value .= $c;

+                }

+                

+                # Unexpected

+                else {

+                    croak qq/Parsing error. unexpected "}". / .

+                          qq/pos $pos of "$source"/;

+                }

+            }

+            

+            # Normal charactor

+            else { $value .= $c }

+        }

-        if ($tag) {

-            # Get tag name and arguments

-            my ($tag_name, @tag_args) = split /\s+/, $tag;

+        # State is tags

+        elsif ($state eq 'tag') {

+            

+            # Tag start charactor

+            if ($c eq '{') {

-            # Tag processor not registered

-            croak qq{Tag "$tag_name" in "$original" is not registered}

-               unless $self->tag_processors->{$tag_name};

+                # Escaped charactor

+                if ($before eq "\\") {

+                    substr($value, -1, 1, '');

+                    $value .= $c;

+                }

+                

+                # Unexpected

+                else {

+                    croak qq/Parsing error. unexpected "{". / .

+                          qq/pos $pos of "$source"/;

+                }

+            }

-            # Add tag to parsing tree

-            push @$tree, {type => 'tag', tag_name => $tag_name,

-                          tag_args => [@tag_args]};

+            # Tag end charactor

+            elsif ($c eq '}') {

+                

+                # Escaped charactor

+                if ($before eq "\\") {

+                    substr($value, -1, 1, '');

+                    $value .= $c;

+                }

+                

+                # Tag end

+                else {

+                

+                    # Change state

+                    $state = 'text';

+                    

+                    # Add tag

+                    my ($tag_name, @tag_args) = split /\s+/, $value;

+                    push @tree, {type => 'tag', tag_name => $tag_name, 

+                                 tag_args => \@tag_args};

+                    

+                    # Clear

+                    $value = '';

+                }

+            }

+            

+            # Normal charactor

+            else { $value .= $c }

         }

+        

+        # Save before charactor

+        $before = $c;

+        

+        # increment position

+        $pos++;

     }

-    # Add text to parsing tree 

-    push @$tree, {type => 'text', tag_args => [$source]}

-      if $source;

+    # Tag not finished

+    croak qq{Tag not finished. "$source"}

+      if $state eq 'tag';

-    return $tree;

+    # Add rest text

+    push @tree, {type => 'text', value => $value}

+      if $value;

+    

+    return \@tree;

 }

 sub _build_query {

@@ -119,22 +199,30 @@ sub _build_query {

     foreach my $node (@$tree) {

         # Get type, tag name, and arguments

-        my $type     = $node->{type};

-        my $tag_name = $node->{tag_name};

-        my $tag_args = $node->{tag_args};

+        my $type = $node->{type};

         # Text

         if ($type eq 'text') {

             # Join text

-            $sql .= $tag_args->[0];

+            $sql .= $node->{value};

         }

         # Tag

         elsif ($type eq 'tag') {

+            # Tag name

+            my $tag_name = $node->{tag_name};

+            

+            # Tag arguments

+            my $tag_args = $node->{tag_args};

+            

             # Get tag processor

             my $tag_processor = $self->tag_processors->{$tag_name};

+            # Tag processor is not registered

+            croak qq{Tag "$tag_name" in "{a }" is not registered}

+              unless $tag_processor;

+            

             # Tag processor not sub reference

             croak qq{Tag processor "$tag_name" must be sub reference}

               unless ref $tag_processor eq 'CODE';

@@ -207,22 +295,6 @@ DBIx::Custom::QueryBuilder - Query builder

 Tag processors.

-=head2 C<tag_start>

-    

-    my $tag_start = $builder->tag_start;

-    $builder      = $builder->tag_start('{');

-

-Tag start charactor.

-Default to '{'.

-

-=head2 C<tag_end>

-    

-    my $tag_end = $builder->tag_start;

-    $builder    = $builder->tag_start('}');

-

-Tag end charactor.

-Default to '}'.

-    

 =head1 METHODS

 L<DBIx::Custom::QueryBuilder> inherits all methods from L<Object::Simple>

@@ -235,6 +307,12 @@ and implements the following new ones.

 Create a new L<DBIx::Custom::Query> object from SQL source.

 SQL source contains tags, such as {= title}, {like author}.

+C<{> and C<}> is reserved. If you use these charactors,

+you must escape them using '\'. Note that '\' is

+already perl escaped charactor, so you must write '\\'. 

+

+    'select * from books \\{ something statement \\}'

+

 B<Example:>

 SQL source

@@ -12,14 +12,11 @@ sub test {

 }

 # Variables for test

-our $SQL_TMPL = {

-    0 => DBIx::Custom::QueryBuilder->new->tag_start(0),

-    1 => DBIx::Custom::QueryBuilder->new->tag_start(1),

-    2 => DBIx::Custom::QueryBuilder->new->tag_start(2)

-};

 my $dbi;

+my $query_builder;

 test 'Constructor';

+$query_builder = DBIx::Custom::QueryBuilder->new;

 $dbi = DBIx::Custom->new(

     user => 'a',

     database => 'a',

@@ -31,12 +28,12 @@ $dbi = DBIx::Custom->new(

     default_bind_filter => 'f',

     default_fetch_filter => 'g',

     result_class => 'g',

-    sql_builder => $SQL_TMPL->{0},

+    query_builder => $query_builder,

 );

 is_deeply($dbi,{user => 'a', database => 'a', password => 'b', data_source => 'c', 

                 filters => {f => 3}, default_bind_filter => 'f',

                 default_fetch_filter => 'g', result_class => 'g',

-                sql_builder => $SQL_TMPL->{0}}, $test);

+                query_builder => $query_builder}, $test);

 isa_ok($dbi, 'DBIx::Custom');

@@ -142,3 +142,7 @@ eval{$builder->build_query("{in a r}")};

 like($@, qr/\QColumn name and count of values must be specified in tag "{in }"/,

      "$test : in : key not exist");

+test '_parse';

+

+

+