@@ -3,10 +3,10 @@ use warnings;

 use Module::Build;

 my $builder = Module::Build->new(

-    module_name         => 'DBI::Custom',

+    module_name         => 'DBIx::Custom',

     license             => 'perl',

     dist_author         => 'Yuki Kimoto <kimoto.yuki@gmail.com>',

-    dist_version_from   => 'lib/DBI/Custom.pm',

+    dist_version_from   => 'lib/DBIx/Custom.pm',

     build_requires => {

         'Test::More' => 0,

     },

@@ -16,11 +16,11 @@ my $builder = Module::Build->new(

     requires => {

         'Object::Simple' => 2.0702,

         'DBI'            => 1.605,

-        'DBI::Custom::Query' => 0.0101,

-        'DBI::Custom::Result' => 0.0101,

-        'DBI::Custom::SQL::Template' => 0.0101

+        'DBIx::Custom::Query' => 0.0101,

+        'DBIx::Custom::Result' => 0.0101,

+        'DBIx::Custom::SQL::Template' => 0.0101

     },

-    add_to_cleanup      => [ 'DBI-Custom-*' ],

+    add_to_cleanup      => [ 'DBIx-Custom-*' ],

     create_makefile_pl => 'traditional',

 );

@@ -1,10 +1,10 @@

-DBI-Custom

+DBIx-Custom

 Custamizable DBI

 INSTALLATION

-cpan DBI::Custom

+cpan DBIx::Custom

 COPYRIGHT AND LICENCE

@@ -1,13 +1,13 @@

-package DBI::Custom;

+package DBIx::Custom;

 use Object::Simple;

 our $VERSION = '0.0101';

 use Carp 'croak';

 use DBI;

-use DBI::Custom::Query;

-use DBI::Custom::Result;

-use DBI::Custom::SQL::Template;

+use DBIx::Custom::Query;

+use DBIx::Custom::Result;

+use DBIx::Custom::SQL::Template;

 ### Class-Object Accessors

@@ -45,14 +45,14 @@ sub formats : ClassObjectAttr {

 sub result_class : ClassObjectAttr {

     initialize => {

         clone   => 'scalar',

-        default => 'DBI::Custom::Result'

+        default => 'DBIx::Custom::Result'

     }

 }

 sub sql_template : ClassObjectAttr {

     initialize => {

         clone   => sub {$_[0] ? $_[0]->clone : undef},

-        default => sub {DBI::Custom::SQL::Template->new}

+        default => sub {DBIx::Custom::SQL::Template->new}

     }

 }

@@ -203,7 +203,7 @@ sub create_query {

         $query = eval{$sql_template->create_query($template)};

         croak($@) if $@;

-        $query = DBI::Custom::Query->new($query);

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

         $class->_add_query_cache($template, $query);

     }

@@ -721,7 +721,7 @@ Object::Simple->build_class;

 =head1 NAME

-DBI::Custom - Customizable simple DBI

+DBIx::Custom - Customizable simple DBI

 =head1 VERSION

@@ -738,7 +738,7 @@ Please tell me bug if you find

 =head1 SYNOPSIS

-  my $dbi = DBI::Custom->new;

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

   my $query = $dbi->create_query($template);

   $dbi->execute($query);

@@ -870,7 +870,7 @@ you can get DBI database handle if you need.

     $result_class = $dbi->result_class;

     # Sample

-    $dbi->result_class('DBI::Custom::Result');

+    $dbi->result_class('DBIx::Custom::Result');

 =head2 dbh

@@ -885,7 +885,7 @@ you can get DBI database handle if you need.

     $self = $dbi->connect;

     # Sample

-    $dbi = DBI::Custom->new(user => 'taro', password => 'lji8(', 

+    $dbi = DBIx::Custom->new(user => 'taro', password => 'lji8(', 

                             data_soruce => "dbi:mysql:dbname=$database");

     $dbi->connect;

@@ -976,7 +976,7 @@ add_filter add filter to filters

         # do something

     }

-See also L<DBI::Custom::SQL::Template>

+See also L<DBIx::Custom::SQL::Template>

 =head2 run_tranzaction

@@ -1071,11 +1071,11 @@ This method is same as DBI last_insert_id;

     $query_cache_max = $class->query_cache_max;

     # Sample

-    DBI::Custom->query_cache_max(50);

+    DBIx::Custom->query_cache_max(50);

 =head1 CAUTION

-DBI::Custom have DIB object internal.

+DBIx::Custom have DIB object internal.

 This module is work well in the following DBI condition.

     1. AutoCommit is true

@@ -3,7 +3,7 @@

 use Test::More tests => 1;

 BEGIN {

-	use_ok( 'DBI::Custom' );

+	use_ok( 'DBIx::Custom' );

 }

-diag( "Testing DBI::Custom $DBI::Custom::VERSION, Perl $], $^X" );

+diag( "Testing DBIx::Custom $DBIx::Custom::VERSION, Perl $], $^X" );

@@ -2,8 +2,8 @@ use Test::More 'no_plan';

 use strict;

 use warnings;

-use DBI::Custom;

-use DBI::Custom::SQL::Template;

+use DBIx::Custom;

+use DBIx::Custom::SQL::Template;

 # Function for test name

 my $test;

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

 # Variables for test

 our $SQL_TMPL = {

-    0 => DBI::Custom::SQL::Template->new->tag_start(0),

-    1 => DBI::Custom::SQL::Template->new->tag_start(1),

-    2 => DBI::Custom::SQL::Template->new->tag_start(2)

+    0 => DBIx::Custom::SQL::Template->new->tag_start(0),

+    1 => DBIx::Custom::SQL::Template->new->tag_start(1),

+    2 => DBIx::Custom::SQL::Template->new->tag_start(2)

 };

 my $dbi;

 test 'Constructor';

-$dbi = DBI::Custom->new(

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

     user => 'a',

     database => 'a',

     password => 'b',

@@ -39,13 +39,13 @@ is_deeply($dbi,{user => 'a', database => 'a', password => 'b', data_source => 'c

                 dbi_options => {d => 1, e => 2}, filters => {f => 3}, bind_filter => 'f',

                 fetch_filter => 'g', result_class => 'g',

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

-isa_ok($dbi, 'DBI::Custom');

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

 test 'Sub class constructor';

 {

-    package DBI::Custom::T1;

-    use base 'DBI::Custom';

+    package DBIx::Custom::T1;

+    use base 'DBIx::Custom';

     __PACKAGE__

       ->user('a')

@@ -61,11 +61,11 @@ test 'Sub class constructor';

       )

       ->bind_filter('f')

       ->fetch_filter('g')

-      ->result_class('DBI::Custom::Result')

+      ->result_class('DBIx::Custom::Result')

       ->sql_template($SQL_TMPL->{0})

     ;

 }

-$dbi = DBI::Custom::T1->new(

+$dbi = DBIx::Custom::T1->new(

     user => 'ao',

     database => 'ao',

     password => 'bo',

@@ -93,10 +93,10 @@ is($dbi->bind_filter, 'fo', "$test : bind_filter");

 is($dbi->fetch_filter, 'go', "$test : fetch_filter");

 is($dbi->result_class, 'ho', "$test : result_class");

 is($dbi->sql_template->tag_start, 0, "$test : sql_template");

-isa_ok($dbi, 'DBI::Custom::T1');

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

 test 'Sub class constructor default';

-$dbi = DBI::Custom::T1->new;

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

 is($dbi->user, 'a', "$test : user");

 is($dbi->database, 'a', "$test : database");

 is($dbi->password, 'b', "$test : password");

@@ -106,17 +106,17 @@ is_deeply({$dbi->filters}, {f => 3}, "$test : filters");

 is_deeply({$dbi->formats}, {f => 3}, "$test : formats");

 is($dbi->bind_filter, 'f', "$test : bind_filter");

 is($dbi->fetch_filter, 'g', "$test : fetch_filter");

-is($dbi->result_class, 'DBI::Custom::Result', "$test : result_class");

+is($dbi->result_class, 'DBIx::Custom::Result', "$test : result_class");

 is($dbi->sql_template->tag_start, 0, "$test : sql_template");

-isa_ok($dbi, 'DBI::Custom::T1');

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

 test 'Sub sub class constructor default';

 {

-    package DBI::Custom::T1_2;

-    use base 'DBI::Custom::T1';

+    package DBIx::Custom::T1_2;

+    use base 'DBIx::Custom::T1';

 }

-$dbi = DBI::Custom::T1_2->new;

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

 is($dbi->user, 'a', "$test : user");

 is($dbi->database, 'a', "$test : database");

 is($dbi->password, 'b', "$test : passowrd");

@@ -126,15 +126,15 @@ is_deeply(scalar $dbi->filters, {f => 3}, "$test : filters");

 is_deeply(scalar $dbi->formats, {f => 3}, "$test : formats");

 is($dbi->bind_filter, 'f', "$test : bind_filter");

 is($dbi->fetch_filter, 'g', "$test : fetch_filter");

-is($dbi->result_class, 'DBI::Custom::Result', "$test : result_class");

+is($dbi->result_class, 'DBIx::Custom::Result', "$test : result_class");

 is($dbi->sql_template->tag_start, 0, "$test sql_template");

-isa_ok($dbi, 'DBI::Custom::T1_2');

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

 test 'Customized sub class constructor default';

 {

-    package DBI::Custom::T1_3;

-    use base 'DBI::Custom::T1';

+    package DBIx::Custom::T1_3;

+    use base 'DBIx::Custom::T1';

     __PACKAGE__

       ->user('ao')

@@ -154,7 +154,7 @@ test 'Customized sub class constructor default';

       ->sql_template($SQL_TMPL->{1})

     ;

 }

-$dbi = DBI::Custom::T1_3->new;

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

 is($dbi->user, 'ao', "$test : user");

 is($dbi->database, 'ao', "$test : database");

 is($dbi->password, 'bo', "$test : password");

@@ -166,11 +166,11 @@ is($dbi->bind_filter, 'fo', "$test : bind_filter");

 is($dbi->fetch_filter, 'go', "$test : fetch_filter");

 is($dbi->result_class, 'ho', "$test : result_class");

 is($dbi->sql_template->tag_start, 1, "$test : sql_template");

-isa_ok($dbi, 'DBI::Custom::T1_3');

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

 test 'Customized sub class constructor';

-$dbi = DBI::Custom::T1_3->new(

+$dbi = DBIx::Custom::T1_3->new(

     user => 'a',

     database => 'a',

     password => 'b',

@@ -198,16 +198,16 @@ is($dbi->bind_filter, 'f', "$test : bind_filter");

 is($dbi->fetch_filter, 'g', "$test : fetch_filter");

 is($dbi->result_class, 'h', "$test : result_class");

 is($dbi->sql_template->tag_start, 2, "$test : sql_template");

-isa_ok($dbi, 'DBI::Custom');

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

 test 'add_filters';

-$dbi = DBI::Custom->new;

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

 $dbi->add_filter(a => sub {1});

 is($dbi->filters->{a}->(), 1, $test);

 test 'add_formats';

-$dbi = DBI::Custom->new;

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

 $dbi->add_format(a => sub {1});

 is($dbi->formats->{a}->(), 1, $test);

@@ -9,7 +9,7 @@ BEGIN {

         or plan skip_all => 'DBD::SQLite >= 1.00 required';

     plan 'no_plan';

-    use_ok('DBI::Custom');

+    use_ok('DBIx::Custom');

 }

 # Function for test name

@@ -59,21 +59,21 @@ my $ret_val;

 test 'disconnect';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

 $dbi->connect;

 $dbi->disconnect;

 ok(!$dbi->dbh, $test);

 test 'connected';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

 ok(!$dbi->connected, "$test : not connected");

 $dbi->connect;

 ok($dbi->connected, "$test : connected");

 test 'preapare';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

 $sth = $dbi->prepare($CREATE_TABLE->{0});

 ok($sth, "$test : auto connect");

 $sth->execute;

@@ -82,7 +82,7 @@ ok($sth, "$test : basic");

 test 'do';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

 $ret_val = $dbi->do($CREATE_TABLE->{0});

 ok(defined $ret_val, "$test : auto connect");

 $ret_val = $dbi->do($DROP_TABLE->{0});

@@ -90,7 +90,7 @@ ok(defined $ret_val, "$test : basic");

 # Prepare table

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

 $dbi->connect;

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

 $sth = $dbi->prepare("insert into table1 (key1, key2) values (?, ?);");

@@ -98,7 +98,7 @@ $sth->execute(1, 2);

 $sth->execute(3, 4);

-test 'DBI::Custom::Result test';

+test 'DBIx::Custom::Result test';

 $tmpl = "select key1, key2 from table1";

 $query = $dbi->create_query($tmpl);

 $result = $dbi->execute($query);

@@ -244,7 +244,7 @@ $rows = $result->fetch_all_hash;

 is_deeply($rows, [{key1 => 2, key2 => 4}], "$test : bind_filter");

-test 'DBI::Custom::SQL::Template basic tag';

+test 'DBIx::Custom::SQL::Template basic tag';

 $dbi->do($DROP_TABLE->{0});

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

 $sth = $dbi->prepare("insert into table1 (key1, key2, key3, key4, key5) values (?, ?, ?, ?, ?);");

@@ -314,7 +314,7 @@ $rows = $result->fetch_all_hash;

 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : with table dot");

-test 'DBI::Custom::SQL::Template insert tag';

+test 'DBIx::Custom::SQL::Template insert tag';

 $dbi->do("delete from table1");

 $insert_tmpl = 'insert into table1 {insert key1 key2 key3 key4 key5}';

 $dbi->execute($insert_tmpl, {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

@@ -356,7 +356,7 @@ $rows = $result->fetch_all_hash;

 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : #insert with table name dot");

-test 'DBI::Custom::SQL::Template update tag';

+test 'DBIx::Custom::SQL::Template update tag';

 $dbi->do("delete from table1");

 $insert_tmpl = "insert into table1 {insert key1 key2 key3 key4 key5}";

 $dbi->execute($insert_tmpl, {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

@@ -434,36 +434,36 @@ is_deeply($rows, [], "$test : rollback");

 test 'Error case';

-$dbi = DBI::Custom->new;

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

 eval{$dbi->run_tranzaction};

 like($@, qr/Not yet connect to database/, "$test : Yet Connected");

-$dbi = DBI::Custom->new(data_source => 'dbi:SQLit');

+$dbi = DBIx::Custom->new(data_source => 'dbi:SQLit');

 eval{$dbi->connect;};

 ok($@, "$test : connect error");

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

 $dbi->connect;

 $dbi->dbh->{AutoCommit} = 0;

 eval{$dbi->run_tranzaction()};

 like($@, qr/AutoCommit must be true before tranzaction start/,

          "$test : run_tranzaction auto commit is false");

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

 $sql = 'laksjdf';

 eval{$dbi->prepare($sql)};

 like($@, qr/$sql/, "$test : prepare fail");

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

 $sql = 'laksjdf';

 eval{$dbi->do($sql, qw/1 2 3/)};

 like($@, qr/$sql/, "$test : do fail");

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

 eval{$dbi->create_query("{p }")};

 ok($@, "$test : create_query invalid SQL template");

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

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

 $query = $dbi->create_query("select * from table1 where {= key1}");

 eval{$dbi->execute($query, {key2 => 1})};

@@ -472,7 +472,7 @@ like($@, qr/Corresponding key is not found in your parameters/,

 test 'insert';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

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

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

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

@@ -505,7 +505,7 @@ like($@, qr/Query edit callback must be code reference/, "$test : query edit cal

 test 'update';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

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

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

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

@@ -547,7 +547,7 @@ is_deeply($rows, [{key1 => 1, key2 => 22, key3 => 3, key4 => 4, key5 => 5},

 test 'update error';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

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

 eval{$dbi->update('table1')};

 like($@, qr/Key-value pairs for update must be specified to 'update' second argument/,

@@ -563,7 +563,7 @@ like($@, qr/Query edit callback must be code reference/,

 test 'update_all';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

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

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

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

@@ -582,7 +582,7 @@ is_deeply($rows, [{key1 => 1, key2 => 20, key3 => 3, key4 => 4, key5 => 5},

 test 'delete';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

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

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

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

@@ -614,7 +614,7 @@ is_deeply($rows, [{key1 => 3, key2 => 4}], "$test : delete multi key");

 test 'delete error';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

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

 eval{$dbi->delete('table1')};

 like($@, qr/Key-value pairs for where clause must be specified to 'delete' second argument/,

@@ -626,7 +626,7 @@ like($@, qr/Query edit callback must be code reference/,

 test 'delete_all';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

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

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

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

@@ -637,7 +637,7 @@ is_deeply($rows, [], "$test : basic");

 test 'select';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

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

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

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

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

@@ -678,39 +678,39 @@ $rows = $dbi->select([qw/table1 table2/],

 is_deeply($rows, [{table1_key1 => 1, table2_key1 => 1, key2 => 2, key3 => 5}], "$test : join");

 test 'Cache';

-$dbi = DBI::Custom->new($NEW_ARGS->{0});

-DBI::Custom->query_cache_max(2);

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

+DBIx::Custom->query_cache_max(2);

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

-DBI::Custom->delete_class_attr('_query_caches');

-DBI::Custom->delete_class_attr('_query_cache_keys');

+DBIx::Custom->delete_class_attr('_query_caches');

+DBIx::Custom->delete_class_attr('_query_cache_keys');

 $tmpls[0] = "insert into table1 {insert key1 key2}";

 $queries[0] = $dbi->create_query($tmpls[0]);

-is(DBI::Custom->_query_caches->{$tmpls[0]}{sql}, $queries[0]->sql, "$test : sql first");

-is(DBI::Custom->_query_caches->{$tmpls[0]}{key_infos}, $queries[0]->key_infos, "$test : key_infos first");

-is_deeply(DBI::Custom->_query_cache_keys, [@tmpls], "$test : cache key first");

+is(DBIx::Custom->_query_caches->{$tmpls[0]}{sql}, $queries[0]->sql, "$test : sql first");

+is(DBIx::Custom->_query_caches->{$tmpls[0]}{key_infos}, $queries[0]->key_infos, "$test : key_infos first");

+is_deeply(DBIx::Custom->_query_cache_keys, [@tmpls], "$test : cache key first");

 $tmpls[1] = "select * from table1";

 $queries[1] = $dbi->create_query($tmpls[1]);

-is(DBI::Custom->_query_caches->{$tmpls[0]}{sql}, $queries[0]->sql, "$test : sql first");

-is(DBI::Custom->_query_caches->{$tmpls[0]}{key_infos}, $queries[0]->key_infos, "$test : key_infos first");

-is(DBI::Custom->_query_caches->{$tmpls[1]}{sql}, $queries[1]->sql, "$test : sql second");

-is(DBI::Custom->_query_caches->{$tmpls[1]}{key_infos}, $queries[1]->key_infos, "$test : key_infos second");

-is_deeply(DBI::Custom->_query_cache_keys, [@tmpls], "$test : cache key second");

+is(DBIx::Custom->_query_caches->{$tmpls[0]}{sql}, $queries[0]->sql, "$test : sql first");

+is(DBIx::Custom->_query_caches->{$tmpls[0]}{key_infos}, $queries[0]->key_infos, "$test : key_infos first");

+is(DBIx::Custom->_query_caches->{$tmpls[1]}{sql}, $queries[1]->sql, "$test : sql second");

+is(DBIx::Custom->_query_caches->{$tmpls[1]}{key_infos}, $queries[1]->key_infos, "$test : key_infos second");

+is_deeply(DBIx::Custom->_query_cache_keys, [@tmpls], "$test : cache key second");

 $tmpls[2] = "select key1, key2 from table1";

 $queries[2] = $dbi->create_query($tmpls[2]);

-ok(!exists DBI::Custom->_query_caches->{$tmpls[0]}, "$test : cache overflow deleted key");

-is(DBI::Custom->_query_caches->{$tmpls[1]}{sql}, $queries[1]->sql, "$test : sql cache overflow deleted key");

-is(DBI::Custom->_query_caches->{$tmpls[1]}{key_infos}, $queries[1]->key_infos, "$test : key_infos cache overflow deleted key");

-is(DBI::Custom->_query_caches->{$tmpls[2]}{sql}, $queries[2]->sql, "$test : sql cache overflow deleted key");

-is(DBI::Custom->_query_caches->{$tmpls[2]}{key_infos}, $queries[2]->key_infos, "$test : key_infos cache overflow deleted key");

-is_deeply(DBI::Custom->_query_cache_keys, [@tmpls[1, 2]], "$test : cache key third");

+ok(!exists DBIx::Custom->_query_caches->{$tmpls[0]}, "$test : cache overflow deleted key");

+is(DBIx::Custom->_query_caches->{$tmpls[1]}{sql}, $queries[1]->sql, "$test : sql cache overflow deleted key");

+is(DBIx::Custom->_query_caches->{$tmpls[1]}{key_infos}, $queries[1]->key_infos, "$test : key_infos cache overflow deleted key");

+is(DBIx::Custom->_query_caches->{$tmpls[2]}{sql}, $queries[2]->sql, "$test : sql cache overflow deleted key");

+is(DBIx::Custom->_query_caches->{$tmpls[2]}{key_infos}, $queries[2]->key_infos, "$test : key_infos cache overflow deleted key");

+is_deeply(DBIx::Custom->_query_cache_keys, [@tmpls[1, 2]], "$test : cache key third");

 $queries[1] = $dbi->create_query($tmpls[1]);

-ok(!exists DBI::Custom->_query_caches->{$tmpls[0]}, "$test : cache overflow deleted key");

-is(DBI::Custom->_query_caches->{$tmpls[1]}{sql}, $queries[1]->sql, "$test : sql cache overflow deleted key");

-is(DBI::Custom->_query_caches->{$tmpls[1]}{key_infos}, $queries[1]->key_infos, "$test : key_infos cache overflow deleted key");

-is(DBI::Custom->_query_caches->{$tmpls[2]}{sql}, $queries[2]->sql, "$test : sql cache overflow deleted key");

-is(DBI::Custom->_query_caches->{$tmpls[2]}{key_infos}, $queries[2]->key_infos, "$test : key_infos cache overflow deleted key");

-is_deeply(DBI::Custom->_query_cache_keys, [@tmpls[1, 2]], "$test : cache key third");

+ok(!exists DBIx::Custom->_query_caches->{$tmpls[0]}, "$test : cache overflow deleted key");

+is(DBIx::Custom->_query_caches->{$tmpls[1]}{sql}, $queries[1]->sql, "$test : sql cache overflow deleted key");

+is(DBIx::Custom->_query_caches->{$tmpls[1]}{key_infos}, $queries[1]->key_infos, "$test : key_infos cache overflow deleted key");

+is(DBIx::Custom->_query_caches->{$tmpls[2]}{sql}, $queries[2]->sql, "$test : sql cache overflow deleted key");

+is(DBIx::Custom->_query_caches->{$tmpls[2]}{key_infos}, $queries[2]->key_infos, "$test : key_infos cache overflow deleted key");

+is_deeply(DBIx::Custom->_query_cache_keys, [@tmpls[1, 2]], "$test : cache key third");

@@ -9,10 +9,10 @@ plan skip_all => 'private MySQL test' unless $USER;

 plan 'no_plan';

-use DBI::Custom;

+use DBIx::Custom;

 use Scalar::Util 'blessed';

 {

-    my $dbi = DBI::Custom->new(

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

         user => $USER,

         password => $PASSWORD,

         data_source => "dbi:mysql:dbname=$DATABASE"

@@ -46,6 +46,6 @@ sub module_boilerplate_ok {

     "placeholder date/time"       => qr(Date/time)

   );

-  module_boilerplate_ok('lib/DBI/Custom.pm');

+  module_boilerplate_ok('lib/DBIx/Custom.pm');