@@ -54,7 +54,7 @@ sub _parse {

     # Source

     $source ||= '';

-    

+

     # Tree

     my $tree = [];

@@ -86,18 +86,10 @@ sub _parse {

             # Get tag name and arguments

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

-            # Tag processor not registerd

-            croak qq{Tag "$tag" in "$original" is not registerd}

+            # Tag processor not registered

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

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

-            # Check tag arguments

-            foreach my $tag_arg (@tag_args) {

-            

-                # Cannot cantain placehosder '?'

-                croak qq{Tag cannot contains "?"}

-                  if $tag_arg =~ /\?/;

-            }

-            

             # Add tag to parsing tree

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

                           tag_args => [@tag_args]};

@@ -145,15 +137,14 @@ sub _build_query {

               unless ref $tag_processor eq 'CODE';

             # Execute tag processor

-            my ($part, $columns) = @{$tag_processor->(@$tag_args)};

+            my $r = $tag_processor->(@$tag_args);

             # Check tag processor return value

             croak qq{Tag processor "$tag_name" must return [STRING, ARRAY_REFERENCE]}

-              if !defined $part || ref $columns ne 'ARRAY';

+              unless ref $r eq 'ARRAY' && defined $r->[0] && ref $r->[1] eq 'ARRAY';

-            # Check placeholder count

-            croak qq{Count of Placeholders must be same as count of columns in "$tag_name"}

-              unless $self->_placeholder_count($part) eq @$columns;

+            # Part of SQL statement and colum names

+            my ($part, $columns) = @$r;

             # Add columns

             push @$all_columns, @$columns;

@@ -162,6 +153,12 @@ sub _build_query {

             $sql .= $part;

         }

     }

+

+    # Check placeholder count

+    my $placeholder_count = $self->_placeholder_count($sql);

+    my $column_count      = @$all_columns;

+    croak qq{Placeholder count in "$sql" must be same as column count $column_count}

+      unless $placeholder_count eq @$all_columns;

     # Add semicolon

     $sql .= ';' unless $sql =~ /;$/;

@@ -9,7 +9,7 @@ sub _basic {

     my ($name, $column) = @_;

     # Check arguments

-    croak qq{Column must be specified in tag "{$name }"}

+    croak qq{Column name must be specified in tag "{$name }"}

       unless $column;

     return ["$column $name ?", [$column]];

@@ -37,7 +37,7 @@ sub in {

     my ($column, $count) = @_;

     # Check arguments

-    croak qq{Column and count of values must be specified in tag "{in }"}

+    croak qq{Column name and count of values must be specified in tag "{in }"}

       unless $column && $count && $count =~ /^\d+$/;

     # Part of statement

@@ -3,7 +3,7 @@ use strict;

 use warnings;

 use DBIx::Custom;

-use DBIx::Custom::SQLTemplate;

+use DBIx::Custom::QueryBuilder;

 # Function for test name

 my $test;

@@ -13,9 +13,9 @@ sub test {

 # Variables for test

 our $SQL_TMPL = {

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

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

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

+    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;

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

     default_bind_filter => 'f',

     default_fetch_filter => 'g',

     result_class => 'g',

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

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

 );

 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_class => $SQL_TMPL->{0}}, $test);

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

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

@@ -0,0 +1,142 @@

+use strict;

+use warnings;

+

+use Test::More 'no_plan';

+

+use DBIx::Custom::QueryBuilder;

+

+# Function for test name

+my $test;

+sub test{

+    $test = shift;

+}

+

+# Variable for test

+my $datas;

+my $builder;

+my $query;

+my $ret_val;

+

+test "Various source pattern";

+$datas = [

+    # Basic tests

+    {   name            => 'placeholder basic',

+        source            => "a {?  k1} b {=  k2} {<> k3} {>  k4} {<  k5} {>= k6} {<= k7} {like k8}", ,

+        sql_expected    => "a ? b k2 = ? k3 <> ? k4 > ? k5 < ? k6 >= ? k7 <= ? k8 like ?;",

+        columns_expected   => [qw/k1 k2 k3 k4 k5 k6 k7 k8/]

+    },

+    {

+        name            => 'placeholder in',

+        source            => "{in k1 3};",

+        sql_expected    => "k1 in (?, ?, ?);",

+        columns_expected   => [qw/k1 k1 k1/]

+    },

+    

+    # Table name

+    {

+        name            => 'placeholder with table name',

+        source            => "{= a.k1} {= a.k2}",

+        sql_expected    => "a.k1 = ? a.k2 = ?;",

+        columns_expected  => [qw/a.k1 a.k2/]

+    },

+    {   

+        name            => 'placeholder in with table name',

+        source            => "{in a.k1 2} {in b.k2 2}",

+        sql_expected    => "a.k1 in (?, ?) b.k2 in (?, ?);",

+        columns_expected  => [qw/a.k1 a.k1 b.k2 b.k2/]

+    },

+    {

+        name            => 'not contain tag',

+        source            => "aaa",

+        sql_expected    => "aaa;",

+        columns_expected  => [],

+    }

+];

+

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

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

+    my $builder = DBIx::Custom::QueryBuilder->new;

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

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

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

+}

+

+

+test 'Original tag processor';

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

+

+$ret_val = $builder->register_tag_processor(

+    p => sub {

+        my @args = @_;

+        

+        my $expand    = "? $args[0] $args[1]";

+        my $columns = [2];

+        return [$expand, $columns];

+    }

+);

+

+$query = $builder->build_query("{p a b}");

+is($query->{sql}, "? a b;", "$test : register_tag_processor sql");

+is_deeply($query->{columns}, [2], "$test : register_tag_processor columns");

+isa_ok($ret_val, 'DBIx::Custom::QueryBuilder');

+

+

+test "Tag processor error case";

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

+

+

+eval{$builder->build_query("{a }")};

+like($@, qr/\QTag "a" in "{a }" is not registered/, "$test : tag_processor not exist");

+

+$builder->register_tag_processor({

+    q => 'string'

+});

+

+eval{$builder->build_query("{q}", {})};

+like($@, qr/Tag processor "q" must be sub reference/, "$test : tag_processor not code ref");

+

+$builder->register_tag_processor({

+   r => sub {} 

+});

+

+eval{$builder->build_query("{r}")};

+like($@, qr/\QTag processor "r" must return [STRING, ARRAY_REFERENCE]/, "$test : tag processor return noting");

+

+$builder->register_tag_processor({

+   s => sub { return ["a", ""]} 

+});

+

+eval{$builder->build_query("{s}")};

+like($@, qr/\QTag processor "s" must return [STRING, ARRAY_REFERENCE]/, "$test : tag processor return not array columns");

+

+$builder->register_tag_processor(

+    t => sub {return ["a", []]}

+);

+

+

+test 'General error case';

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

+$builder->register_tag_processor(

+    a => sub {

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

+    }

+);

+eval{$builder->build_query("{a}")};

+like($@, qr/\QPlaceholder count in "? ? ?" must be same as column count 1/, "$test : placeholder count is invalid");

+

+

+test 'Default tag processor Error case';

+eval{$builder->build_query("{= }")};

+like($@, qr/Column name must be specified in tag "{= }"/, "$test : basic '=' : key not exist");

+

+eval{$builder->build_query("{in }")};

+like($@, qr/Column name and count of values must be specified in tag "{in }"/, "$test : in : key not exist");

+

+eval{$builder->build_query("{in a}")};

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

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

+

+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");

+