@@ -85,7 +85,7 @@ sub connect {

     my $connect_info = $self->connect_info;

     foreach my $key (keys %{$self->connect_info}) {

-        croak("connect_info '$key' is invald")

+        croak("connect_info '$key' is wrong name")

           unless $VALID_CONNECT_INFO{$key};

     }

@@ -319,6 +319,7 @@ sub create_sql {

 our $TAG_SYNTAX = <<'EOS';

 [tag]            [expand]

+{? name}         ?

 {= name}         name = ?

 {<> name}        name <> ?

@@ -364,7 +365,7 @@ sub parse {

             my ($tag_name, @args) = split /\s+/, $tag;

             $tag ||= '';

-            croak("Tag '$tag' in SQL template is invalid.\n\n" .

+            croak("Tag '$tag' in SQL template is not exist.\n\n" .

                   "SQL template tag syntax\n$TAG_SYNTAX\n\n" .

                   "Your SQL template is \n$original_template\n\n")

               unless $VALID_TAG_NAMES{$tag_name};

@@ -486,6 +487,8 @@ Version 0.0101

 =head2 add_filter

+    

+

 =head2 bind_filter

 =head2 clone

@@ -164,7 +164,7 @@ use Scalar::Util qw/blessed/;

     );

     eval{$dbi->connect};

-    like($@, qr/connect_info 'no_exist' is invald/, 'no exist');

+    like($@, qr/connect_info 'no_exist' is wrong name/, 'no exist');

 }

 {

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

 use Test::More;

 use strict;

 use warnings;

+use DBI;

 BEGIN {

     eval { require DBD::SQLite; 1 }

@@ -12,14 +13,57 @@ BEGIN {

     use_ok('DBI::Custom');

 }

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

-   connect_info => {data_source => 'dbi:SQLite:dbname=:memory:'}

-);

+package Test::DBI::Custom;

+use Object::Simple;

-$dbi->query_raw_sql("create table t1 (k1 char(10), k2 char(10))");

+sub dbi : Attr {}

-{

-    $dbi->query("insert into t1 {insert_values}",{insert_values => {k1 => 1, k2 => 2}});

+sub new {

+    my $self = shift->SUPER::new;

+    my $dbi = DBI::Custom->new->connect_info(data_source => 'dbi:SQLite:dbname=:memory:');

+    

+    $dbi->connect;

+    $self->dbi($dbi);

+    return $self;

+}

+

+sub create_table {

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

+    $self->dbi->query_raw_sql($create_table);

+    return $self;

+}

+

+sub create_table1 {

+    my $self = shift;

+    $self->create_table("create table t1 (k1 char(255), k2 char(255), k3 char(255), k4 char(255), k5 char(255));");

+    return $self;

+}

+

+sub insert {

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

+    my $table = ref $values_list[0] ? '' : shift;

+    $table ||= 't1';

+    

+    foreach my $values (@values_list) {

+        my $sql = $self->dbi->query(

+            "insert into $table {insert_values}", {insert_values => $values}

+        );

+    }

+    return $self;

+}

+

+sub test {

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

+    $code->($self->dbi);

+}

+

+Object::Simple->build_class;

+

+package main;

+my $t = Test::DBI::Custom->new;

+

+$t->new->create_table1->insert({k1 => 1, k2 => 2}, {k1 => 3, k2 => 4})->test(sub {

+    my $dbi = shift;

     $dbi->fetch_filter(sub {

         my ($key, $value) = @_;

@@ -36,4 +80,5 @@ $dbi->query_raw_sql("create table t1 (k1 char(10), k2 char(10))");

     $result->finish;

     is_deeply(\@values, [3, 2]);

-}

+});

+

@@ -1,38 +0,0 @@

-use Test::More;

-use strict;

-use warnings;

-

-# user password database

-our ($U, $P, $D) = connect_info();

-

-plan skip_all => 'private MySQL test' unless $U;

-

-plan 'no_plan';

-

-use DBI::Custom;

-use Scalar::Util 'blessed';

-{

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

-        connect_info => {

-            user => $U,

-            password => $P,

-            data_source => "dbi:mysql:$D"

-        }

-    );

-    $dbi->connect;

-    

-    ok(blessed $dbi->dbh);

-    can_ok($dbi->dbh, qw/prepare/);

-}

-

-sub connect_info {

-    my $file = 'password.tmp';

-    open my $fh, '<', $file

-      or return;

-    

-    my ($user, $password, $database) = split(/\s/, (<$fh>)[0]);

-    

-    close $fh;

-    

-    return ($user, $password, $database);

-}