@@ -1,4 +1,8 @@

 0.1745

+    - DBIx::Custom::QueryBuilder class is DEPRECATED!

+    - added DBIX_CUSTOM_DISABLE_MODEL_EXECUTE environment variable

+    - added DBIX_CUSTOM_TAG_PARSE environment variable

+    - tag_parse attribute is DEPRECATED! 

     - show_datatype method return lower case string

     - show_typename method return lower case string

     - DBIx::Custom::Result filter_on method is DEPRECATED!

@@ -1,7 +1,7 @@

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.1744';

+our $VERSION = '0.1745';

 use 5.008001;

 use Carp 'croak';

@@ -71,8 +71,7 @@ has [qw/connector dsn password quote user exclude_table user_table_info

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

     safety_character => '\w',

     separator => '.',

-    stash => sub { {} },

-    tag_parse => 1;

+    stash => sub { {} };

 sub available_datatype {

     my $self = shift;

@@ -838,6 +837,9 @@ sub new {

         'update_param' => \&DBIx::Custom::Tag::update_param

     };

+    # DEPRECATED!

+    $self->{tag_parse} = 1;

+    

     return $self;

 }

@@ -1705,6 +1707,18 @@ has default_dbi_option => sub {

     return shift->default_option;

 };

+# DEPRECATED

+sub tag_parse {

+   my $self = shift;

+   warn "tag_parse is DEPRECATED! use \$ENV{DBIX_CUSTOM_TAG_PARSE} " .

+         "environment variable";

+    if (@_) {

+        $self->{tag_parse} = $_[0];

+        return $self;

+    }

+    return $self->{tag_parse};

+}

+

 # DEPRECATED!

 sub method {

     warn "method is DEPRECATED! use helper instead";

@@ -2612,6 +2626,18 @@ You can check SQL, column, or get statment handle.

     my $sth = $query->sth;

     my $columns = $query->columns;

+=item C<reuse>

+    

+    reuse => $hash_ref

+

+Reuse query object if the hash reference variable is set.

+    

+    my $queries = {};

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

+

+This will improved performance when you want to execute same query repeatedly

+because generally creating query object is slow.

+

 =item C<primary_key>

     primary_key => 'id'

@@ -2643,18 +2669,6 @@ Table alias. Key is real table name, value is alias table name.

 If you set C<table_alias>, you can enable C<into1> and C<into2> type rule

 on alias table name.

-=item C<reuse>

-    

-    reuse => $hash_ref

-

-Reuse query object if the hash reference variable is set.

-    

-    my $queries = {};

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

-

-This will improved performance when you want to execute same query repeatedly

-because generally creating query object is slow.

-

 =item C<type_rule_off>

     type_rule_off => 1

@@ -3392,6 +3406,7 @@ DEBUG output encoding. Default to UTF-8.

 L<DBIx::Custom>

     # Attribute methods

+    tag_parse # will be removed 2017/1/1

     default_dbi_option # will be removed 2017/1/1

     dbi_option # will be removed 2017/1/1

     data_source # will be removed at 2017/1/1

@@ -3464,6 +3479,8 @@ L<DBIx::Custom::Query>

     filter # will be removed at 2017/1/1

 L<DBIx::Custom::QueryBuilder>

+

+This module is DEPRECATED! # will be removed at 2017/1/1

     # Attribute methods

     tags # will be removed at 2017/1/1

@@ -87,17 +87,27 @@ sub update_or_insert {

 }

 sub execute {

-    warn "DBIx::Custom::Model execute method is DEPRECATED!";

     my $self = shift;

-    return $self->dbi->execute(

-        shift,

-        shift,

-        table => $self->table,

-        bind_type => $self->bind_type,

-        primary_key => $self->primary_key,

-        type => $self->type,

-        @_

-    );

+    

+    if ($ENV{DBIX_CUSTOM_DISABLE_MODEL_EXECUTE}) {

+        $self->dbi->execute(@_);

+    }

+    else {

+        warn "DBIx::Custom::Model execute method is DEPRECATED! " .

+             "use DBIx::Custom execute method. " .

+             "If you want to call DBIx::Custom execute method directory from model, " .

+             "set \$ENV{DBIX_CUSTOM_DISABLE_MODEL_EXECUTE} to 1 " .

+             "until DBIx::Custom::Model execute method is removed in the future." ;

+        return $self->dbi->execute(

+            shift,

+            shift,

+            table => $self->table,

+            bind_type => $self->bind_type,

+            primary_key => $self->primary_key,

+            type => $self->type,

+            @_

+        );    

+    }

 }

 sub DESTROY { }

@@ -10,13 +10,16 @@ use DBIx::Custom::Util '_subname';

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

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

-has 'dbi';

-

 sub build_query {

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

     # Parse tag. tag is DEPRECATED!

-    if ($sql =~ /(\s|^)\{/ && $self->dbi->tag_parse) {

+    my $tag_parse;

+    $tag_parse = $ENV{DBIX_CUSTOM_TAG_PARSE}

+      if exists $ENV{DBIX_CUSTOM_TAG_PARSE};

+    $tag_parse = $self->dbi->{tag_parse} unless defined $tag_parse;

+    

+    if ($tag_parse && $sql =~ /(\s|^)\{/) {

         my $query = $self->_parse_tag($sql);

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

         warn qq/Tag system such as {? name} is DEPRECATED! / .

@@ -77,7 +80,10 @@ sub _parse_parameter {

     return $query;

 }

-    

+

+# DEPRECATED

+has 'dbi';

+

 # DEPRECATED!

 has tags => sub { {} };

@@ -286,33 +292,10 @@ sub register_tag_processor {

 =head1 NAME

-DBIx::Custom::QueryBuilder - Query builder

+DBIx::Custom::QueryBuilder - DEPRECATED!

-=head1 SYNOPSIS

-    

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

-    my $query = $builder->build_query(

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

-    );

-

-=head1 ATTRIBUTES

-

-=head2 C<dbi>

-

-    my $dbi = $builder->dbi;

-    $builder = $builder->dbi($dbi);

-

-L<DBIx::Custom> object.

-

-=head1 METHODS

-

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

-and implements the following new ones.

-

-=head2 C<build_query>

-    

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

+=head1 DESCRIPTION

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

+This module functionality will be moved to DBIx::Custom

 =cut

@@ -39,14 +39,14 @@ sub to_string {

     $self->{_query_builder} = $self->dbi->query_builder;

     $self->{_safety_character} = $self->dbi->safety_character;

     $self->{_quote} = $self->dbi->_quote;

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

+    $self->{_tag_parse} = $self->dbi->{tag_parse};

     $self->_parse($clause, $where, $count, 'and');

     # Stringify

     unshift @$where, 'where' if @$where;

     return join(' ', @$where);

 }

-

+    

 our %VALID_OPERATIONS = map { $_ => 1 } qw/and or/;

 sub _parse {

     my ($self, $clause, $where, $count, $op, $info) = @_;

@@ -3024,6 +3024,28 @@ $dbi->insert({$key1 => 1, $key2 => 1}, table => $table1);

 eval {$dbi->execute("select * from $table1 where {= $key1}", {$key1 => 1})};

 ok($@);

+test 'DBIX_CUSTOM_TAG_PARSE environment variable';

+{

+    $ENV{DBIX_CUSTOM_TAG_PARSE} = 0;

+    $dbi = DBIx::Custom->connect;

+    eval { $dbi->execute("drop table $table1") };

+    $dbi->execute($create_table1);

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

+    eval {$dbi->execute("select * from $table1 where {= $key1}", {$key1 => 1})};

+    ok($@);

+    delete$ENV{DBIX_CUSTOM_TAG_PARSE};

+}

+

+{

+    $ENV{DBIX_CUSTOM_TAG_PARSE} = 0;

+    $dbi = DBIx::Custom->connect;

+    eval { $dbi->execute("drop table $table1") };

+    $dbi->execute($create_table1);

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

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

+    delete$ENV{DBIX_CUSTOM_TAG_PARSE};

+}

+

 test 'last_sql';

 $dbi = DBIx::Custom->connect;

 eval { $dbi->execute("drop table $table1") };

@@ -3135,6 +3157,35 @@ $rows = [

     );

 }

+eval { $dbi->execute("drop table $table1") };

+$dbi->execute($create_table1);

+{

+    $ENV{DBIX_CUSTOM_DISABLE_MODEL_EXECUTE} = 1;

+    $model = $dbi->create_model(table => $table1, primary_key => $key1);

+    eval {$model->execute("select * from $table1 where :${key1}{=}", id => 1)};

+    like($@, qr/primary_key/);

+    delete $ENV{DBIX_CUSTOM_DISABLE_MODEL_EXECUTE};

+}

+

+{

+    $ENV{DBIX_CUSTOM_DISABLE_MODEL_EXECUTE} = 1;

+    $model = $dbi->create_model(table => $table1, primary_key => $key1);

+    $model->insert({$key1 => 1});

+    $result = $model->execute("select * from $table1 where :${key1}{=}", id => 1,

+      table => $table1, primary_key => $key1);

+    is($result->one->{$key1}, 1);

+    delete $ENV{DBIX_CUSTOM_DISABLE_MODEL_EXECUTE};

+}

+

+eval { $dbi->execute("drop table $table1") };

+$dbi->execute($create_table1);

+{

+    $model = $dbi->create_model(table => $table1, primary_key => $key1);

+    $model->insert({$key1 => 1});

+    eval {$result = $model->execute("select * from $table1 where :${key1}{=}", {}, id => 1)};

+    is($result->one->{$key1}, 1);

+}

+

 test 'id option more';

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_highperformance);