@@ -1,3 +1,5 @@

+0.1714

+    - fixed not backword compatible change in 0.1712 query_buider

 0.1713

     - fixed memory leak and connection increasing bug when using model.

 0.1712

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

 package DBIx::Custom;

 use Object::Simple -base;

-our $VERSION = '0.1713';

+our $VERSION = '0.1714';

 use 5.008001;

 use Carp 'croak';

@@ -15,7 +15,7 @@ use DBIx::Custom::Tag;

 use DBIx::Custom::Order;

 use DBIx::Custom::Util qw/_array_to_hash _subname/;

 use Encode qw/encode encode_utf8 decode_utf8/;

-use Scalar::Util qw/weaken isweak/;

+use Scalar::Util qw/weaken/;

 use constant DEBUG => $ENV{DBIX_CUSTOM_DEBUG} || 0;

 use constant DEBUG_ENCODING => $ENV{DBIX_CUSTOM_DEBUG_ENCODING} || 'UTF-8';

@@ -52,6 +52,12 @@ has [qw/connector dsn password quote user exclude_table/],

     },

     last_sql => '',

     models => sub { {} },

+    query_builder => sub {

+        my $self = shift;

+        my $builder = DBIx::Custom::QueryBuilder->new(dbi => $self);

+        weaken $builder->{dbi};

+        return $builder;

+    },

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

     safety_character => '\w',

     separator => '.',

@@ -252,9 +258,7 @@ sub delete {

 sub delete_all { shift->delete(allow_delete_all => 1, @_) }

-sub DESTROY {

-

-}

+sub DESTROY { }

 sub create_model {

     my $self = shift;

@@ -269,7 +273,7 @@ sub create_model {

     # Create model

     my $model = $model_class->new($args);

-    weaken $self unless isweak $self;

+    weaken $model->{dbi};

     $model->name($model_name) unless $model->name;

     $model->table($model_table) unless $model->table;

@@ -746,24 +750,9 @@ sub new {

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

           unless $self->can($attr);

     }

-    

-    return $self;

-}

-

-my $not_exists = bless {}, 'DBIx::Custom::NotExists';

-sub not_exists { $not_exists }

-

-sub order {

-    my $self = shift;

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

-}

-sub query_builder {

-    my $self = shift;

-    my $builder = DBIx::Custom::QueryBuilder->new(dbi => $self);

-    

     # DEPRECATED

-    $builder->register_tag(

+    $self->{_tags} = {

         '?'     => \&DBIx::Custom::Tag::placeholder,

         '='     => \&DBIx::Custom::Tag::equal,

         '<>'    => \&DBIx::Custom::Tag::not_equal,

@@ -775,9 +764,17 @@ sub query_builder {

         'in'    => \&DBIx::Custom::Tag::in,

         'insert_param' => \&DBIx::Custom::Tag::insert_param,

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

-    );

-    $builder->register_tag($self->{_tags} || {});

-    return $builder;

+    };

+    

+    return $self;

+}

+

+my $not_exists = bless {}, 'DBIx::Custom::NotExists';

+sub not_exists { $not_exists }

+

+sub order {

+    my $self = shift;

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

 }

 sub register_filter {

@@ -248,8 +248,9 @@ sub _parse_tag {

                 next;

             }

             # Get tag

+            $self->dbi->{_tags} ||= {};

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

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

+                             || $self->dbi->{_tags}->{$tag_name};

             # Tag is not registered

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

               unless $tag;

@@ -4,6 +4,7 @@ use warnings;

 use Encode qw/encode_utf8/;

 use FindBin;

 use lib "$FindBin::Bin/common";

+use Scalar::Util 'isweak';

 my $dbi;

@@ -208,6 +209,7 @@ $dbi->insert({key1 => '01-01'}, table => 'table1');

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

 is($result->one->{key1}, '2010-01-01');

+$DB::single = 1;

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1_type);

@@ -3142,6 +3144,7 @@ is_deeply($result->all, [{'table1-key1' => 1, 'table1-key2' => 3},

   {'table1-key1' => 2, 'table1-key2' => 2}]);

 test 'tag_parse';

+$DB::single = 1;

 $dbi = DBIx::Custom->connect;

 $dbi->tag_parse(0);

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

@@ -3327,14 +3330,16 @@ $datas = [

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

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

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

+    my $dbi = DBIx::Custom->new;

+    my $builder = $dbi->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");

 }

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

-$ret_val = $builder->register_tag(

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

+$builder = $dbi->query_builder;

+$dbi->register_tag(

     p => sub {

         my @args = @_;

@@ -3347,9 +3352,6 @@ $ret_val = $builder->register_tag(

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

 is($query->{sql}, "? a b;", "register_tag sql");

 is_deeply($query->{columns}, [2], "register_tag columns");

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

-

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

 eval{$builder->build_query('{? }')};

 like($@, qr/\QColumn name must be specified in tag "{? }"/, "? not arguments");

@@ -3357,35 +3359,33 @@ like($@, qr/\QColumn name must be specified in tag "{? }"/, "? not arguments");

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

 like($@, qr/\QTag "a" is not registered/, "tag not exist");

-$builder->register_tag({

+$dbi->register_tag({

     q => 'string'

 });

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

 like($@, qr/Tag "q" must be sub reference/, "tag not code ref");

-$builder->register_tag({

+$dbi->register_tag({

    r => sub {} 

 });

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

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

-$builder->register_tag({

+$dbi->register_tag({

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

 });

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

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

-$builder->register_tag(

+$dbi->register_tag(

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

 );

-test 'General error case';

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

-$builder->register_tag(

+$dbi->register_tag(

     a => sub {

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

     }