@@ -1,5 +1,6 @@

 0.1712

     - you can set any string as separator

+    - fixed memory leak and connection increasing bug, and query_buider method return new object.

 0.1711

     - renamed EXPERIMENTAL available_type_name to available_typename

     - renamed EXPERIMENTAL available_data_type to available_datatype

@@ -51,13 +51,34 @@ has [qw/connector dsn password quote user/],

     },

     last_sql => '',

     models => sub { {} },

-    query_builder => sub { DBIx::Custom::QueryBuilder->new(dbi => shift) },

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

     safety_character => '\w',

     separator => '.',

     stash => sub { {} },

     tag_parse => 1;

+sub query_builder {

+    my $self = shift;

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

+    

+    # DEPRECATED

+    $builder->register_tag(

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

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

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

+        '>'     => \&DBIx::Custom::Tag::greater_than,

+        '<'     => \&DBIx::Custom::Tag::lower_than,

+        '>='    => \&DBIx::Custom::Tag::greater_than_equal,

+        '<='    => \&DBIx::Custom::Tag::lower_than_equal,

+        'like'  => \&DBIx::Custom::Tag::like,

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

+}

+

 our $AUTOLOAD;

 sub AUTOLOAD {

     my $self = shift;

@@ -221,7 +242,9 @@ sub delete {

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

-sub DESTROY { }

+sub DESTROY {

+

+}

 sub create_model {

     my $self = shift;

@@ -707,21 +730,6 @@ sub new {

           unless $self->can($attr);

     }

-    # DEPRECATED!

-    $self->query_builder->{tags} = {

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

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

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

-        '>'     => \&DBIx::Custom::Tag::greater_than,

-        '<'     => \&DBIx::Custom::Tag::lower_than,

-        '>='    => \&DBIx::Custom::Tag::greater_than_equal,

-        '<='    => \&DBIx::Custom::Tag::lower_than_equal,

-        'like'  => \&DBIx::Custom::Tag::like,

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

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

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

-    };

-    

     return $self;

 }

@@ -1624,8 +1632,25 @@ sub insert_at {

 # DEPRECATED!

 sub register_tag {

+    my $self = shift;

+    

     warn "register_tag is DEPRECATED!";

-    shift->query_builder->register_tag(@_)

+    

+    # Merge tag

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

+    $self->{_tags} = {%{$self->{_tags} || {}}, %$tags};

+    

+    return $self;

+}

+

+# DEPRECATED!

+sub register_tag_processor {

+    my $self = shift;

+    warn "register_tag_processor is DEPRECATED!";

+    # Merge tag

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

+    $self->{_tags} = {%{$self->{_tags} || {}}, %{$tag_processors}};

+    return $self;

 }

 # DEPRECATED!

@@ -1690,12 +1715,6 @@ sub insert_param_tag {

     return shift->insert_param(@_);

 }

-# DEPRECATED!

-sub register_tag_processor {

-    warn "register_tag_processor is DEPRECATED!";

-    return shift->query_builder->register_tag_processor(@_);

-}

-

 # DEPRECATED!

 sub update_param_tag {

     warn "update_param_tag is DEPRECATED! " .

@@ -1936,10 +1955,9 @@ Password, used when C<connect> method is executed.

 =head2 C<query_builder>

-    my $sql_class = $dbi->query_builder;

-    $dbi = $dbi->query_builder(DBIx::Custom::QueryBuilder->new);

+    my $builder = $dbi->query_builder;

-Query builder, default to L<DBIx::Custom::QueryBuilder> object.

+Creat query builder. This is L<DBIx::Custom::QueryBuilder>.

 =head2 C<quote>

@@ -10,10 +10,22 @@ use DBIx::Custom;

 {

     package DBIx::Custom;

-    my $date = 'Date';

-    my $time = 'Time';

-    my $datetime = 'Datetime';

+    my $date_typename = 'Date';

+    my $time_typename = 'Time';

+    my $datetime_typename = 'Datetime';

+    sub date_typename { lc $date_typename }

+    sub time_typename { lc $time_typename }

+    sub datetime_typename { lc $datetime_typename }

+

+    my $date_datatype = 9;

+    my $time_datatype = 'Time';

+    my $datetime_datatype = 11;

+    

+    sub date_datatype { lc $date_datatype }

+    sub time_datatype { lc $time_datatype }

+    sub datetime_datatype { lc $datetime_datatype }

+

     no warnings 'redefine';

     has dsn => "dbi:mysql:database=dbix_custom";

     has user => 'dbix_custom';

@@ -22,7 +34,7 @@ use DBIx::Custom;

     sub create_table1 { 'create table table1 (key1 varchar(255), key2 varchar(255)) engine=InnoDB;' }

     sub create_table1_2 {'create table table1 (key1 varchar(255), key2 varchar(255), '

      . 'key3 varchar(255), key4 varchar(255), key5 varchar(255)) engine=InnoDB;' }

-    sub create_table1_type { 'create table table1 (key1 Date, key2 datetime) engine=InnoDB;;' }

+    sub create_table1_type { "create table table1 (key1 $date_typename, key2 $datetime_typename) engine=InnoDB;" }

     sub create_table1_highperformance { "create table table1 (ab varchar(255), bc varchar(255), "

       . "ik varchar(255), hi varchar(255), ui varchar(255), pq varchar(255), dc varchar(255)) engine=InnoDB;" }

     sub create_table2 { 'create table table2 (key1 varchar(255), key3 varchar(255)) engine=InnoDB;' }

@@ -11,9 +11,21 @@ use DBIx::Custom;

     package DBIx::Custom;

     no warnings 'redefine';

-    my $date = 'Date';

-    my $time = 'Time';

-    my $datetime = 'Timestamp';

+    my $date_typename = 'Date';

+    my $time_typename = 'Time';

+    my $datetime_typename = 'Timestamp';

+

+    sub date_typename { lc $date_typename }

+    sub time_typename { lc $time_typename }

+    sub datetime_typename { 'timestamp without time zone' }

+

+    my $date_datatype = 91;

+    my $time_datatype = 'Time';

+    my $datetime_datatype = 11;

+

+    sub date_datatype { lc $date_datatype }

+    sub time_datatype { lc $time_datatype }

+    sub datetime_datatype { lc $datetime_datatype }

     has dsn => "dbi:Pg:dbname=dbix_custom";

     has user  => 'dbix_custom';

@@ -22,7 +34,7 @@ use DBIx::Custom;

     sub create_table1 { 'create table table1 (key1 varchar(255), key2 varchar(255));' }

     sub create_table1_2 {'create table table1 (key1 varchar(255), key2 varchar(255), '

      . 'key3 varchar(255), key4 varchar(255), key5 varchar(255));' }

-    sub create_table1_type { 'create table table1 (key1 Date, key2 varchar(255));' }

+    sub create_table1_type { "create table table1 (key1 $date_typename, key2 $datetime_typename);" }

     sub create_table1_highperformance { "create table table1 (ab varchar(255), bc varchar(255), "

       . "ik varchar(255), hi varchar(255), ui varchar(255), pq varchar(255), dc varchar(255));" }

     sub create_table2 { 'create table table2 (key1 varchar(255), key3 varchar(255));' }

@@ -9,15 +9,27 @@ use DBIx::Custom;

     package DBIx::Custom;

     no warnings 'redefine';

-    my $date = 'Date';

-    my $time = 'Time';

-    my $datetime = 'Datetime';

+    my $date_typename = 'Date';

+    my $time_typename = 'Time';

+    my $datetime_typename = 'Datetime';

+    

+    sub date_typename { lc $date_typename }

+    sub time_typename { lc $time_typename }

+    sub datetime_typename { lc $datetime_typename }

+

+    my $date_datatype = 'Date';

+    my $time_datatype = 'Time';

+    my $datetime_datatype = 'Datetime';

+    

+    sub date_datatype { lc $date_datatype }

+    sub time_datatype { lc $time_datatype }

+    sub datetime_datatype { lc $datetime_datatype }

     has dsn => 'dbi:SQLite:dbname=:memory:';

     sub quote { '""' }

     sub create_table1 { 'create table table1 (key1 varchar, key2 varchar);' }

     sub create_table1_2 {'create table table1 (key1 varchar, key2 varchar, key3 varchar, key4 varchar, key5 varchar);' }

-    sub create_table1_type { 'create table table1 (key1 Date, key2 datetime);' }

+    sub create_table1_type { "create table table1 (key1 $date_typename, key2 $datetime_typename);" }

     sub create_table1_highperformance { "create table table1 (ab varchar, bc varchar, ik varchar, hi varchar, ui varchar, pq varchar, dc varchar);" }

@@ -9,14 +9,26 @@ use DBIx::Custom;

     package DBIx::Custom;

     no warnings 'redefine';

-    my $date = 'Date';

-    my $time = 'Time';

-    my $datetime = 'Datetime';

+    my $date_typename = 'Date';

+    my $time_typename = 'Time';

+    my $datetime_typename = 'Datetime';

+    

+    sub date_typename { lc $date_typename }

+    sub time_typename { lc $time_typename }

+    sub datetime_typename { lc $datetime_typename }

+

+    my $date_datatype = 'Date';

+    my $time_datatype = 'Time';

+    my $datetime_datatype = 'Datetime';

+    

+    sub date_datatype { lc $date_datatype }

+    sub time_datatype { lc $time_datatype }

+    sub datetime_datatype { lc $datetime_datatype }

     has dsn => 'dbi:SQLite:dbname=:memory:';

     sub create_table1 { 'create table table1 (key1 varchar, key2 varchar);' }

     sub create_table1_2 {'create table table1 (key1 varchar, key2 varchar, key3 varchar, key4 varchar, key5 varchar);' }

-    sub create_table1_type { "create table table1 (key1 $date, key2 $time);" }

+    sub create_table1_type { "create table table1 (key1 $date_typename, key2 $datetime_typename);" }

     sub create_table1_highperformance { "create table table1 (ab varchar, bc varchar, ik varchar, hi varchar, ui varchar, pq varchar, dc varchar);" }

@@ -24,6 +36,7 @@ use DBIx::Custom;

     sub create_table2_2 { "create table table2 (key1 varchar, key2 varchar, key3 varchar)" }

     sub create_table3 { "create table table3 (key1 varchar, key2 varchar, key3 varchar)" }

     sub create_table_reserved { 'create table "table" ("select" varchar, "update" varchar)' }

+    

 }

 require "$FindBin::Bin/common.t";

@@ -153,6 +153,12 @@ my $create_table3 = $dbi->create_table3;

 my $create_table_reserved = $dbi->create_table_reserved;

 my $q = substr($dbi->quote, 0, 1);

 my $p = substr($dbi->quote, 1, 1) || $q;

+my $date_typename = $dbi->date_typename;

+my $time_typename = $dbi->time_typename;

+my $datetime_typename = $dbi->datetime_typename;

+my $date_datatype = $dbi->date_datatype;

+my $time_datatype = $dbi->time_datatype;

+my $datetime_datatype = $dbi->datetime_datatype;

 # Variable

 # Variables

@@ -188,8 +194,151 @@ my $binary;

 # Drop table

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

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+test 'type_rule into';

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

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

+$dbi->execute($create_table1_type);

+$dbi->type_rule(

+    into1 => {

+        $date_typename => sub { '2010-' . $_[0] }

+    }

+);

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

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

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

+

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

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

+$dbi->execute($create_table1_type);

+$dbi->type_rule(

+    into1 => [

+         [$date_typename, $datetime_typename] => sub {

+            my $value = shift;

+            $value =~ s/02/03/g;

+            return $value;

+         }

+    ]

+);

+$dbi->insert({key1 => '2010-01-02', key2 => '2010-01-01 01:01:02'}, table => 'table1');

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

+$row = $result->one;

+is($row->{key1}, '2010-01-03');

+is($row->{key2}, '2010-01-01 01:01:03');

+

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

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

+$dbi->execute($create_table1_type);

+$dbi->insert({key1 => '2010-01-03', key2 => '2010-01-01 01:01:03'}, table => 'table1');

+$dbi->type_rule(

+    into1 => [

+        [$date_typename, $datetime_typename] => sub {

+            my $value = shift;

+            $value =~ s/02/03/g;

+            return $value;

+        }

+    ]

+);

+$result = $dbi->execute(

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

+    param => {key1 => '2010-01-03', 'table1.key2' => '2010-01-01 01:01:02'}

+);

+$row = $result->one;

+is($row->{key1}, '2010-01-03');

+is($row->{key2}, '2010-01-01 01:01:03');

+

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

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

+$dbi->execute($create_table1_type);

+$dbi->insert({key1 => '2010-01-03', key2 => '2010-01-01 01:01:03'}, table => 'table1');

+$dbi->type_rule(

+    into1 => [

+        [$date_typename, $datetime_typename] => sub {

+            my $value = shift;

+            $value =~ s/02/03/g;

+            return $value;

+        }

+    ]

+);

+$result = $dbi->execute(

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

+    param => {key1 => '2010-01-02', 'table1.key2' => '2010-01-01 01:01:02'},

+    table => 'table1'

+);

+$row = $result->one;

+is($row->{key1}, '2010-01-03');

+is($row->{key2}, '2010-01-01 01:01:03');

+

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

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

+$dbi->execute($create_table1_type);

+$dbi->register_filter(convert => sub {

+    my $value = shift;

+    $value =~ s/02/03/;

+    return $value;

+});

+$dbi->type_rule(

+    from1 => {

+        $date_datatype => 'convert',

+    },

+    into1 => {

+        $date_typename => 'convert',

+    }

+);

+$dbi->insert({key1 => '2010-02-02'}, table => 'table1');

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

+is($result->fetch->[0], '2010-03-03');

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

 # Create table

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

 $dbi->execute($create_table1);

 $model = $dbi->create_model(table => 'table1');

 $model->insert({key1 => 1, key2 => 2});

@@ -661,6 +810,7 @@ like($@, qr/"where" must be specified/,

 eval{$dbi->delete(table => 'table1', where => {';' => 1})};

 like($@, qr/safety/);

+$dbi = undef;

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table_reserved);

@@ -1707,14 +1857,14 @@ $dbi = DBIx::Custom->connect;

 $dbi->register_tag_processor(

     a => sub { 1 }

 );

-is($dbi->query_builder->tag_processors->{a}->(), 1);

+is($dbi->{_tags}->{a}->(), 1);

 test 'register_tag';

 $dbi = DBIx::Custom->connect;

 $dbi->register_tag(

     b => sub { 2 }

 );

-is($dbi->query_builder->tags->{b}->(), 2);

+is($dbi->{_tags}->{b}->(), 2);

 test 'table not specify exception';

 $dbi = DBIx::Custom->connect;

@@ -3346,13 +3496,14 @@ $result = $dbi->select(

 );

 is_deeply($result->all, [{'table2.key3' => 4}]);

+

 test 'table_alias';

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1_type);

 $dbi->type_rule(

     into1 => {

-        date => sub { '2010-' . $_[0] }

+        $date_typename => sub { '2010-' . $_[0] }

     }

 );

 $dbi->execute("insert into table1 (key1) values (:table2.key1)", {'table2.key1' => '01-01'},

@@ -3360,6 +3511,4 @@ $dbi->execute("insert into table1 (key1) values (:table2.key1)", {'table2.key1'

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

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

-

-

 1;

@@ -43,7 +43,7 @@ $dbi->delete_all(table => 'table1');

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

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

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

-$dbi->query_builder->register_tag_processor(

+$dbi->register_tag(

     limit => sub {

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

@@ -179,20 +179,6 @@ my $binary;

 $dbi = DBIx::Custom->connect;

 ### a little complex test

-test 'table_alias';

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

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

-$dbi->execute("create table table1 (key1 Date, key2 datetime)");

-$dbi->type_rule(

-    into1 => {

-        date => sub { uc $_[0] }

-    }

-);

-$dbi->execute("insert into table1 (key1) values (:table2.key1)", {'table2.key1' => 'a'},

-  table_alias => {table2 => 'table1'});

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

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

-

 test 'type_rule into';

 $dbi = DBIx::Custom->connect;

 $dbi->execute("create table table1 (key1 Date, key2 datetime)");