@@ -1,3 +1,9 @@

+0.1684

+    - update_param_tag is DEPRECATED! use update_param instead.

+    - insert_param_tag is DEPRECATED! use insert_param instead.

+    - assing_param_tag is DEPRECATED! use assign_param instead.

+    - Tag system such as {? title}, {= title} is DEPRECATED!

+      and added paramter system such as :title.

 0.1683

     - data_source is DEPRECATED! It is renamed to dsn

 0.1682

@@ -152,8 +152,7 @@ sub apply_filter {

     return $self;

 }

-

-sub assign_tag {

+sub assign_param {

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

     # Create set tag

@@ -163,9 +162,9 @@ sub assign_tag {

     foreach my $column (keys %$param) {

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

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

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

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

-        push @params, "$column = {? $column}";

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

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

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

     }

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

@@ -595,20 +594,9 @@ sub insert {

     # Reserved word quote

     my $q = $self->reserved_word_quote;

-    # Columns

-    my @columns;

-    my $safety = $self->safety_character;

-    foreach my $column (keys %$param) {

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

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

-          $column = "$q$column$q";

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

-        push @columns, $column;

-    }

-    

     # Insert statement

     my @sql;

-    push @sql, "insert into $q$table$q {insert_param ". join(' ', @columns) . '}';

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

     push @sql, $append if $append;

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

@@ -649,7 +637,7 @@ sub insert_at {

     return $self->insert(param => $param, %args);

 }

-sub insert_param_tag {

+sub insert_param {

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

     # Create insert parameter tag

@@ -660,10 +648,10 @@ sub insert_param_tag {

     foreach my $column (keys %$param) {

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

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

-        $column = "$q$column$q";

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

-        push @columns, $column;

-        push @placeholders, "{? $column}";

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

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

+        push @columns, $column_quote;

+        push @placeholders, ":$column";

     }

     return '(' . join(', ', @columns) . ') ' . 'values ' .

@@ -1030,21 +1018,9 @@ sub update {

         croak qq{"$name" is wrong option } . _subname

           unless $UPDATE_ARGS{$name};

     }

-    

-    # Columns

-    my @columns;

-    my $safety = $self->safety_character;

-    my $q = $self->reserved_word_quote;

-    foreach my $column (keys %$param) {

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

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

-          $column = "$q$column$q";

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

-        push @columns, "$column";

-    }

     # Update clause

-    my $update_clause = '{update_param ' . join(' ', @columns) . '}';

+    my $update_clause = $self->update_param($param);

     # Where

     my $where_clause = '';

@@ -1066,6 +1042,7 @@ sub update {

     # Update statement

     my @sql;

+    my $q = $self->reserved_word_quote;

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

     push @sql, $append if $append;

@@ -1112,11 +1089,11 @@ sub update_at {

     return $self->update(where => $where_param, %args);

 }

-sub update_param_tag {

+sub update_param {

     my ($self, $param, $opt) = @_;

     # Create update parameter tag

-    my $tag = $self->assign_tag($param);

+    my $tag = $self->assign_param($param);

     $tag = "set $tag" unless $opt->{no_set};

     return $tag;

@@ -1340,9 +1317,9 @@ sub _where_to_obj {

         my $clause = ['and'];

         my $q = $self->reserved_word_quote;

         foreach my $column (keys %$where) {

-            $column = "$q$column$q";

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

-            push @$clause, "{= $column}" for keys %$where;

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

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

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

         }

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

     }

@@ -1427,10 +1404,10 @@ sub default_fetch_filter {

 }

 # DEPRECATED!

-sub insert_param {

-    warn "insert_param is renamed to insert_param_tag."

-       . " insert_param is DEPRECATED!";

-    return shift->insert_param_tag(@_);

+sub insert_param_tag {

+    warn "insert_param_tag is DEPRECATED! " .

+         "use insert_param instead!";

+    return shift->insert_param(@_);

 }

 # DEPRECATED!

@@ -1439,10 +1416,10 @@ sub register_tag_processor {

 }

 # DEPRECATED!

-sub update_param {

-    warn "update_param is renamed to update_param_tag."

-       . " update_param is DEPRECATED!";

-    return shift->update_param_tag(@_);

+sub update_param_tag {

+    warn "update_param is DEPRECATED! " .

+         "use update_param instead";

+    return shift->update_param(@_);

 }

 # DEPRECATED!

 sub _push_relation {

@@ -1547,7 +1524,7 @@ DBIx::Custom - Useful database access, respecting SQL!

     # Execute SQL with parameter.

     $dbi->execute(

-        "select id from book where {= author} and {like title}",

+        "select id from book where author = :author and title like :title",

         param  => {author => 'ken', title => '%Perl%'}

     );

@@ -1758,15 +1735,15 @@ You can set multiple filters at once.

         }

     );

-=head2 C<assign_tag> EXPERIMENTAL

+=head2 C<assign_param> EXPERIMENTAL

-    my $assign_tag = $dbi->assign_tag({title => 'a', age => 2});

+    my $assign_param = $dbi->assign_param({title => 'a', age => 2});

 Create assign tag.

-    title = {? title}, author = {? author}

+    title = :title, author = :author

-This is equal to C<update_param_tag> exept that set is not added.

+This is equal to C<update_param> exept that set is not added.

 =head2 C<connect>

@@ -1848,7 +1825,7 @@ column name and column information.

 =head2 C<execute>

     my $result = $dbi->execute(

-        "select * from book where {= title} and {like author}",

+        "select * from book where title = :title and author like :author",

         param => {title => 'Perl', author => '%Ken%'}

     );

@@ -1943,14 +1920,14 @@ or array refrence, which contains where clause and paramter.

     # DBIx::Custom::Where object

     my $where = $dbi->where(

-        clause => ['and', '{= author}', '{like title}'],

+        clause => ['and', 'author = :author', 'title like :title'],

         param  => {author => 'Ken', title => '%Perl%'}

     );

     $dbi->delete(where => $where);

     # String(with where_param option)

     $dbi->delete(

-        where => '{like title}',

+        where => 'title like :title',

         where_param => {title => '%Perl%'}

     );

@@ -2190,13 +2167,13 @@ Place holders are set to 5 and 'Perl'.

 =back

-=head2 C<insert_param_tag>

+=head2 C<insert_param>

-    my $insert_param_tag = $dbi->insert_param_tag({title => 'a', age => 2});

+    my $insert_param = $dbi->insert_param({title => 'a', age => 2});

-Create insert parameter tag.

+Create insert parameters.

-    (title, author) values ({? title}, {? author});

+    (title, author) values (title = :title, age = :age);

 =head2 C<include_model>

@@ -2331,7 +2308,7 @@ This is used by C<clause> of L<DBIx::Custom::Where> .

 Register filters, used by C<filter> option of many methods.

-=head2 C<register_tag>

+=head2 C<register_tag> DEPRECATED!

     $dbi->register_tag(

         update => sub {

@@ -2412,14 +2389,14 @@ or array refrence, which contains where clause and paramter.

     # DBIx::Custom::Where object

     my $where = $dbi->where(

-        clause => ['and', '{= author}', '{like title}'],

+        clause => ['and', 'author = :author', 'title like :title'],

         param  => {author => 'Ken', title => '%Perl%'}

     );

     $dbi->select(where => $where);

     # String(with where_param option)

     $dbi->select(

-        where => '{like title}',

+        where => 'title like :title',

         where_param => {title => '%Perl%'}

     );

@@ -2462,7 +2439,7 @@ Parameter shown before where clause.

         table => 'table1',

         column => 'table1.key1 as table1_key1, key2, key3',

         where   => {'table1.key2' => 3},

-        join  => ['inner join (select * from table2 where {= table2.key3})' . 

+        join  => ['inner join (select * from table2 where table2.key3 = :table2.key3)' . 

                   ' as table2 on table1.key1 = table2.key1'],

         param => {'table2.key3' => 5}

     );

@@ -2622,7 +2599,7 @@ or array refrence.

     # DBIx::Custom::Where object

     my $where = $dbi->where(

-        clause => ['and', '{= author}', '{like title}'],

+        clause => ['and', 'author = :author', 'title like :title'],

         param  => {author => 'Ken', title => '%Perl%'}

     );

     $dbi->update(where => $where);

@@ -2739,28 +2716,20 @@ Place holders are set to 'Perl' and 5.

 =back

-=head2 C<update_param_tag>

+=head2 C<update_param>

-    my $update_param_tag = $dbi->update_param_tag({title => 'a', age => 2});

+    my $update_param = $dbi->update_param({title => 'a', age => 2});

 Create update parameter tag.

-    set title = {? title}, author = {? author}

+    set title = :title, author = :author

-You can create tag without 'set '

-by C<no_set> option.

-

-    my $update_param_tag = $dbi->update_param_tag(

-        {title => 'a', age => 2}

-        {no_set => 1}

-    );

-

-    title = {? title}, author = {? author}

+C<no_set> option is DEPRECATED! use C<assing_param> instead.

 =head2 C<where>

     my $where = $dbi->where(

-        clause => ['and', '{= title}', '{= author}'],

+        clause => ['and', 'title = :title', 'author = :author'],

         param => {title => 'Perl', author => 'Ken'}

     );

@@ -2773,71 +2742,87 @@ Create a new L<DBIx::Custom::Where> object.

 Setup all model objects.

 C<columns> of model object is automatically set, parsing database information.

-=head1 Tags

+=head1 Parameter

+

+Parameter start at ':'. This is replaced to place holoder

+

+    $dbi->execute(

+        "select * from book where title = :title and author = :author"

+        param => {title => 'Perl', author => 'Ken'}

+    );

+

+    "select * from book where title = ? and author = ?"

+

+=head1 Tags DEPRECATED!

+

+B<Tag> system is DEPRECATED! use parameter system :name instead.

+Parameter is simple and readable.

+

+Note that you can't use both tag and paramter at same time.

 The following tags is available.

-=head2 C<?>

+=head2 C<?> DEPRECATED!

 Placeholder tag.

     {? NAME}    ->   ?

-=head2 C<=>

+=head2 C<=> DEPRECATED!

 Equal tag.

     {= NAME}    ->   NAME = ?

-=head2 C<E<lt>E<gt>>

+=head2 C<E<lt>E<gt>> DEPRECATED!

 Not equal tag.

     {<> NAME}   ->   NAME <> ?

-=head2 C<E<lt>>

+=head2 C<E<lt>> DEPRECATED!

 Lower than tag

     {< NAME}    ->   NAME < ?

-=head2 C<E<gt>>

+=head2 C<E<gt>> DEPRECATED!

 Greater than tag

     {> NAME}    ->   NAME > ?

-=head2 C<E<gt>=>

+=head2 C<E<gt>=> DEPRECATED!

 Greater than or equal tag

     {>= NAME}   ->   NAME >= ?

-=head2 C<E<lt>=>

+=head2 C<E<lt>=> DEPRECATED!

 Lower than or equal tag

     {<= NAME}   ->   NAME <= ?

-=head2 C<like>

+=head2 C<like> DEPRECATED!

 Like tag

     {like NAME}   ->   NAME like ?

-=head2 C<in>

+=head2 C<in> DEPRECATED!

 In tag.

     {in NAME COUNT}   ->   NAME in [?, ?, ..]

-=head2 C<insert_param>

+=head2 C<insert_param> DEPRECATED!

 Insert parameter tag.

     {insert_param NAME1 NAME2}   ->   (NAME1, NAME2) values (?, ?)

-=head2 C<update_param>

+=head2 C<update_param> DEPRECATED!

 Updata parameter tag.

@@ -2879,5 +2864,3 @@ This program is free software; you can redistribute it and/or modify it

 under the same terms as Perl itself.

 =cut

-

-

@@ -162,7 +162,7 @@ use C<connect()> to connect to database.

 Return value is L<DBIx::Custom> object.

     my $dbi = DBIx::Custom->connect(

-        dsn => "dbi:mysql:database=bookstore",

+        dsn => "dbi:mysql:database=bookshop",

         user => 'ken',

         password => '!LFKD%$&',

         dbi_options => {mysql_enable_utf8 => 1}

@@ -8,7 +8,12 @@ use base 'Object::Simple';

 use Carp 'croak';

 use DBIx::Custom::Util '_subname';

-__PACKAGE__->attr([qw/columns sql sth filters tables/]);

+__PACKAGE__->attr(

+    [qw/sth filters/],

+    sql => '',

+    tables => sub { [] },

+    columns => sub { [] }

+);

 sub filter {

     my $self = shift;

@@ -13,120 +13,102 @@ use DBIx::Custom::Util '_subname';

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

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

-# Attributes

-__PACKAGE__->attr('tags' => sub { {} });

+# Parameter regex

+our $PARAM_RE = qr/(^|[^\.\w]):([\.\w]+)([^\.\w]|$)/sm;

 sub build_query {

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

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

-    # Parse

-    my $tree = $self->_parse($source);

+    my $query;

+    

+    # Parse tag. tag is DEPRECATED!

+    if ($source =~ /\{/ && $source =~ /\}/) {

+        $query = $self->_parse_tag($source);

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

+        warn qq/Tag system such as {? name} is DEPRECATED! This will be removed after 2017/ .

+             qq/use parameter system :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;

+            }

+        }

+    }

-    # Build query

-    my $query = $self->_build_query($tree);

+    # Parse parameter

+    else {

+        $query = $self->_parse_parameter($source);

+    }

+    my $sql = $query->sql;

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

+    $query->sql($sql);

+

+    # Check placeholder count

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

+        . _subname

+      unless $self->_placeholder_count($sql) eq @{$query->columns};

+        

     return $query;

 }

-sub register_tag {

-    my $self = shift;

-    

-    # Merge tag

-    my $tags = ref $_[0] eq 'HASH' ? $_[0] : {@_};

-    $self->tags({%{$self->tags}, %$tags});

+sub _placeholder_count {

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

-    return $self;

+    # Count

+    $sql ||= '';

+    my $count = 0;

+    my $pos   = -1;

+    while (($pos = index($sql, '?', $pos + 1)) != -1) {

+        $count++;

+    }

+    return $count;

 }

-sub _build_query {

-    my ($self, $tree) = @_;

-    

-    # SQL

-    my $sql = '';

-    

-    # All Columns

-    my $all_columns = [];

-    

-    # Tables

-    my $tables = [];

+sub _parse_parameter {

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

-    # Build SQL 

-    foreach my $node (@$tree) {

-        

-        # Text

-        if ($node->{type} eq 'text') { $sql .= $node->{value} }

-        

-        # Tag

-        else {

-            

-            # Tag name

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

-            

-            # Tag arguments

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

-            

-            # Table

-            if ($tag_name eq 'table') {

-                my $table = $tag_args->[0];

-                push @$tables, $table;

-                $sql .= $table;

-                next;

-            }

-

-            # Get tag

-            my $tag = $self->tag_processors->{$tag_name}

-                             || $self->tags->{$tag_name};

-            

-            # Tag is not registered

-            croak qq{Tag "$tag_name" is not registered } . _subname

-              unless $tag;

-            

-            # Tag not sub reference

-            croak qq{Tag "$tag_name" must be sub reference } . _subname

-              unless ref $tag eq 'CODE';

-            

-            # Execute tag

-            my $r = $tag->(@$tag_args);

-            

-            # Check tag return value

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

-                . _subname

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

-            

-            # Part of SQL statement and colum names

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

-            

-            # Add columns

-            push @$all_columns, @$columns;

-            

-            # Join part tag to SQL

-            $sql .= $part;

-        }

+    # Get and replace parameters

+    my $sql = $source || '';

+    my $columns = [];

+    while ($source =~ /$PARAM_RE/g) {

+        push @$columns, $2;

     }

+    $sql =~ s/$PARAM_RE/$1?$3/g;

-    # 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}

-        . _subname

-      unless $placeholder_count eq @$all_columns;

-    

-    # Add semicolon

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

-    

-    # Query

+    # Create query

     my $query = DBIx::Custom::Query->new(

         sql => $sql,

-        columns => $all_columns,

-        tables => $tables

+        columns => $columns

     );

     return $query;

 }

-sub _parse {

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

+# DEPRECATED!

+__PACKAGE__->attr('tags' => sub { {} });

+

+# DEPRECATED!

+sub register_tag {

+    my $self = shift;

+    # Merge tag

+    my $tags = ref $_[0] eq 'HASH' ? $_[0] : {@_};

+    $self->tags({%{$self->tags}, %$tags});

+    

+    return $self;

+}

+

+# DEPRECATED!

+sub _parse_tag {

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

+

     # Source

     $source ||= '';

@@ -147,11 +129,17 @@ sub _parse {

     # Parse

     my $original = $source;

+    my $tag_count = 0;

     while (defined(my $c = substr($source, $pos, 1))) {

         # Last

         last unless length $c;

+        # Parameter

+        if ($c eq ':' && (substr($source, $pos + 1, 1) || '') =~ /\w/) {

+            push @tree, {type => 'param'};;

+        }

+        

         # State is text

         if ($state eq 'text') {

@@ -240,6 +228,9 @@ sub _parse {

                     # Clear

                     $value = '';

+                    

+                    # Countup

+                    $tag_count++;

                 }

             }

@@ -258,24 +249,90 @@ sub _parse {

     croak qq{Tag not finished. "$original" } . _subname

       if $state eq 'tag';

+    # Not contains tag

+    return DBIx::Custom::Query->new(sql => $source, tag_count => $tag_count)

+      if $tag_count == 0;

+    

     # Add rest text

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

       if $value;

+        

+    # SQL

+    my $sql = '';

-    return \@tree;

-}

-

-sub _placeholder_count {

-    my ($self, $expand) = @_;

+    # All Columns

+    my $all_columns = [];

-    # Count

-    $expand ||= '';

-    my $count = 0;

-    my $pos   = -1;

-    while (($pos = index($expand, '?', $pos + 1)) != -1) {

-        $count++;

+    # Tables

+    my $tables = [];

+    

+    # Build SQL 

+    foreach my $node (@tree) {

+        

+        # Text

+        if ($node->{type} eq 'text') { $sql .= $node->{value} }

+        

+        # Parameter

+        elsif ($node->{type} eq 'param') {

+            push @$all_columns, 'RESERVED_PARAMETER';

+        }

+        # Tag

+        else {

+            

+            # Tag name

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

+            

+            # Tag arguments

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

+            

+            # Table

+            if ($tag_name eq 'table') {

+                my $table = $tag_args->[0];

+                push @$tables, $table;

+                $sql .= $table;

+                next;

+            }

+

+            # Get tag

+            my $tag = $self->tag_processors->{$tag_name}

+                             || $self->tags->{$tag_name};

+            

+            # Tag is not registered

+            croak qq{Tag "$tag_name" is not registered } . _subname

+              unless $tag;

+            

+            # Tag not sub reference

+            croak qq{Tag "$tag_name" must be sub reference } . _subname

+              unless ref $tag eq 'CODE';

+            

+            # Execute tag

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

+            

+            # Check tag return value

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

+                . _subname

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

+            

+            # Part of SQL statement and colum names

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

+            

+            # Add columns

+            push @$all_columns, @$columns;

+            

+            # Join part tag to SQL

+            $sql .= $part;

+        }

     }

-    return $count;

+

+    # Query

+    my $query = DBIx::Custom::Query->new(

+        sql => $sql,

+        columns => $all_columns,

+        tables => $tables,

+        tag_count => $tag_count

+    );

+    

+    return $query;

 }

 # DEPRECATED!

@@ -285,6 +342,8 @@ __PACKAGE__->attr('tag_processors' => sub { {} });

 sub register_tag_processor {

     my $self = shift;

+    warn "register_tag_processor is DEPRECATED! use register_tag instead";

+    

     # Merge tag

     my $tag_processors = ref $_[0] eq 'HASH' ? $_[0] : {@_};

     $self->tag_processors({%{$self->tag_processors}, %{$tag_processors}});

@@ -302,18 +361,9 @@ DBIx::Custom::QueryBuilder - Query builder

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

     my $query = $builder->build_query(

-        "select from table {= k1} && {<> k2} || {like k3}"

+        "select from table title = :title and author = :author"

     );

-=head1 ATTRIBUTES

-

-=head2 C<tags>

-

-    my $tags = $builder->tags;

-    $builder = $builder->tags(\%tags);

-

-Tags.

-

 =head1 METHODS

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

@@ -324,43 +374,5 @@ and implements the following new ones.

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

 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

-

-      "select * from table where {= title} && {like author} || {<= price}"

-

-Query

-

-    {

-        sql     => "select * from table where title = ? && author like ? price <= ?;"

-        columns => ['title', 'author', 'price']

-    }

-

-=head2 C<register_tag>

-

-    $builder->register_tag(\%tags);

-    $builder->register_tag(%tags);

-

-Register tag.

-

-B<Example:>

-

-    $builder->register_tag(

-        '?' => sub {

-            my $column = shift;

-            

-            return ['?', [$column]];

-        }

-    );

-

-See also L<DBIx::Custom::Tag> to know tag.

+=cut

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

+# DEPRECATED!

 package DBIx::Custom::Tag;

 use strict;

@@ -92,4 +93,7 @@ sub _basic {

 =head1 NAME

-DBIx::Custom::Tag - Tag processor

+DBIx::Custom::Tag - DEPRECATED!

+

+=cut

+

@@ -36,6 +36,14 @@ sub new {

 sub to_string {

     my $self = shift;

+    # Check if column name is safety character;

+    my $safety = $self->safety_character;

+    if (ref $self->param eq 'HASH') {

+        foreach my $column (keys %{$self->param}) {

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

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

+        }

+    }

     # Clause

     my $clause = $self->clause;

     $clause = ['and', $clause] unless ref $clause eq 'ARRAY';

@@ -95,7 +103,7 @@ sub _parse {

             return $pushed;

         }

         elsif (@$columns != 1) {

-            croak qq{Each tag contains one column name: tag "$clause" (}

+            croak qq{Each part contains one column name: "$clause" (}

                   . _subname . ")";

         }

@@ -181,3 +189,4 @@ If all parameter names is exists.

 Convert where clause to string correspoinding to param name.

+=cut

@@ -204,6 +204,37 @@ $rows = $result->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 1, key3 => 1, key4 => 1, key5 => 5},

                   {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10}], "basic");

+

+test 'parameter';

+$dbi->execute($DROP_TABLE->{0});

+$dbi->execute($CREATE_TABLE->{1});

+$dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

+$dbi->insert(table => 'table1', param => {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});

+

+$source = "select * from table1 where key1 = :key1 and key2 = :key2";

+$result = $dbi->execute($source, param => {key1 => 1, key2 => 2});

+$rows = $result->fetch_hash_all;

+is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}]);

+

+$source = "select * from table1 where key1 = \n:key1\n and key2 = :key2";

+$result = $dbi->execute($source, param => {key1 => 1, key2 => 2});

+$rows = $result->fetch_hash_all;

+is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}]);

+

+$source = "select * from table1 where key1 = :key1 or key1 = :key1";

+$result = $dbi->execute($source, param => {key1 => [1, 2]});

+$rows = $result->fetch_hash_all;

+is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}]);

+

+$source = "select * from table1 where key1 = :table1.key1 and key2 = :table1.key2";

+$result = $dbi->execute(

+    $source,

+    param => {'table1.key1' => 1, 'table1.key2' => 1},

+    filter => {'table1.key2' => sub { $_[0] * 2 }}

+);

+$rows = $result->fetch_hash_all;

+is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}]);

+

 test 'Error case';

 eval {DBIx::Custom->connect(dsn => 'dbi:SQLit')};

 ok($@, "connect error");

@@ -307,7 +338,7 @@ $dbi = DBIx::Custom->connect($NEW_ARGS->{0});

 $dbi->execute($CREATE_TABLE->{0});

 $dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2});

 $where = $dbi->where;

-$where->clause(['and', '{= key1}', '{= key2}']);

+$where->clause(['and', 'key1 = :key1', 'key2 = :key2']);

 $where->param({key1 => 1, key2 => 2});

 $dbi->update(table => 'table1', param => {key1 => 3}, where => $where);

 $result = $dbi->select(table => 'table1');

@@ -1354,7 +1385,7 @@ $dbi->default_bind_filter(undef);

 ok(!defined $dbi->default_bind_filter);

 $dbi->default_fetch_filter(undef);

 ok(!defined $dbi->default_fetch_filter);

-eval {$dbi->execute('select * from table1 {= author') };

+eval {$dbi->execute('select * from table1 {} {= author') };

 like($@, qr/Tag not finished/);

 $dbi = DBIx::Custom->connect($NEW_ARGS->{0});

@@ -1792,20 +1823,20 @@ $result = $model->select(

 is_deeply($result->fetch_hash_first,

           {key1 => 1, key2 => 2, 'table2__key1' => 1, 'table2__key3' => 3});

-test 'update_param_tag';

+test 'update_param';

 $dbi = DBIx::Custom->connect($NEW_ARGS->{0});

 $dbi->execute($CREATE_TABLE->{1});

 $dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

 $dbi->insert(table => 'table1', param => {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});

 $param = {key2 => 11};

-$update_param = $dbi->update_param_tag($param);

+$update_param = $dbi->update_param($param);

 $sql = <<"EOS";

-update {table table1} $update_param

+update table1 $update_param

 where key1 = 1

 EOS

 $dbi->execute($sql, param => $param);

-$result = $dbi->execute($SELECT_SOURCES->{0});

+$result = $dbi->execute($SELECT_SOURCES->{0}, table => 'table1');

 $rows   = $result->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 11, key3 => 3, key4 => 4, key5 => 5},

                   {key1 => 6, key2 => 7,  key3 => 8, key4 => 9, key5 => 10}],

@@ -1818,13 +1849,13 @@ $dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2, key3 => 3, key4

 $dbi->insert(table => 'table1', param => {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});

 $param = {key2 => 11, key3 => 33};

-$update_param = $dbi->update_param_tag($param);

+$update_param = $dbi->update_param($param);

 $sql = <<"EOS";

-update {table table1} $update_param

+update table1 $update_param

 where key1 = 1

 EOS

 $dbi->execute($sql, param => $param);

-$result = $dbi->execute($SELECT_SOURCES->{0});

+$result = $dbi->execute($SELECT_SOURCES->{0}, table => 'table1');

 $rows   = $result->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 11, key3 => 33, key4 => 4, key5 => 5},

                   {key1 => 6, key2 => 7,  key3 => 8, key4 => 9, key5 => 10}],

@@ -1836,37 +1867,36 @@ $dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2, key3 => 3, key4

 $dbi->insert(table => 'table1', param => {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});

 $param = {key2 => 11, key3 => 33};

-$update_param = $dbi->update_param_tag($param, {no_set => 1});

+$update_param = $dbi->update_param($param, {no_set => 1});

 $sql = <<"EOS";

-update {table table1} set $update_param

+update table1 set $update_param

 where key1 = 1

 EOS

 $dbi->execute($sql, param => $param);

-$result = $dbi->execute($SELECT_SOURCES->{0});

+$result = $dbi->execute($SELECT_SOURCES->{0}, table => 'table1');

 $rows   = $result->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 11, key3 => 33, key4 => 4, key5 => 5},

                   {key1 => 6, key2 => 7,  key3 => 8, key4 => 9, key5 => 10}],

                   "update param no_set");

-eval { $dbi->update_param_tag({";" => 1}) };

+eval { $dbi->update_param({";" => 1}) };

 like($@, qr/not safety/);

-test 'set_tag';

-test 'update_param_tag';

+test 'update_param';

 $dbi = DBIx::Custom->connect($NEW_ARGS->{0});

 $dbi->execute($CREATE_TABLE->{1});

 $dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

 $dbi->insert(table => 'table1', param => {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});

 $param = {key2 => 11};

-$update_param = $dbi->assign_tag($param);

+$update_param = $dbi->assign_param($param);

 $sql = <<"EOS";

-update {table table1} set $update_param

+update table1 set $update_param

 where key1 = 1

 EOS

-$dbi->execute($sql, param => $param);

+$dbi->execute($sql, param => $param, table => 'table1');

 $result = $dbi->execute($SELECT_SOURCES->{0});

 $rows   = $result->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 11, key3 => 3, key4 => 4, key5 => 5},

@@ -1878,11 +1908,11 @@ test 'insert_param';

 $dbi = DBIx::Custom->connect($NEW_ARGS->{0});

 $dbi->execute($CREATE_TABLE->{1});

 $param = {key1 => 1, key2 => 2};

-$insert_param = $dbi->insert_param_tag($param);

+$insert_param = $dbi->insert_param($param);

 $sql = <<"EOS";

-insert into {table table1} $insert_param

+insert into table1 $insert_param

 EOS

-$dbi->execute($sql, param => $param);

+$dbi->execute($sql, param => $param, table => 'table1');

 is($dbi->select(table => 'table1')->fetch_hash_first->{key1}, 1);

 is($dbi->select(table => 'table1')->fetch_hash_first->{key2}, 2);

@@ -1890,15 +1920,15 @@ $dbi = DBIx::Custom->connect($NEW_ARGS->{0});

 $dbi->reserved_word_quote('"');

 $dbi->execute($CREATE_TABLE->{1});

 $param = {key1 => 1, key2 => 2};

-$insert_param = $dbi->insert_param_tag($param);

+$insert_param = $dbi->insert_param($param);

 $sql = <<"EOS";

-insert into {table table1} $insert_param

+insert into table1 $insert_param

 EOS

-$dbi->execute($sql, param => $param);

+$dbi->execute($sql, param => $param, table => 'table1');

 is($dbi->select(table => 'table1')->fetch_hash_first->{key1}, 1);

 is($dbi->select(table => 'table1')->fetch_hash_first->{key2}, 2);

-eval { $dbi->insert_param_tag({";" => 1}) };

+eval { $dbi->insert_param({";" => 1}) };

 like($@, qr/not safety/);

@@ -2238,3 +2268,5 @@ $dbi->update(

 );

 $rows = $dbi->select(table => 'table1')->fetch_hash_all;

 is_deeply($rows, [{key1 => 5, key2 => 2}]);

+

+=cut

@@ -2,6 +2,8 @@ use Test::More;

 use strict;

 use warnings;

+$SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DEPRECATED/};

+

 # user password database

 our ($USER, $PASSWORD, $DATABASE) = connect_info();

@@ -8,6 +8,8 @@ use DBIx::Custom;

 # Function for test name

 sub test{ print "# $_[0]\n" }

+$SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DEPRECATED/};

+

 # Variable for test

 my $datas;

 my $builder;

@@ -57,7 +59,7 @@ for (my $i = 0; $i < @$datas; $i++) {

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

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

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

 }

@@ -123,7 +125,7 @@ $builder->register_tag(

     }

 );

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

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

+like($@, qr/\QPlaceholder count/, "placeholder count is invalid");

 test 'Default tag Error case';

@@ -166,4 +168,4 @@ $source = "a {= {}";

 eval{$builder->build_query($source)};

 like($@, qr/unexpected "{"/, "error : 2");

-

+=cut