@@ -1,5 +1,2 @@

-Revision history for DBI-Custom

-

-0.01    Date/time

-        First version, released on an unsuspecting world.

-

+0.0101

+  First release

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

 DBI-Custom

-The README is used to introduce the module and provide instructions on

-how to install the module, any machine dependencies it may have (for

-example C compilers and installed libraries) and any other information

-that should be provided before the module is installed.

-

-A README file is required for CPAN modules since CPAN extracts the README

-file from a module distribution so that people browsing the archive

-can use it to get an idea of the module's uses. It is usually a good idea

-to provide version information here so that people can decide whether

-fixes for the module are worth downloading.

-

+Custamizable DBI

 INSTALLATION

-To install this module, run the following commands:

-

-	perl Build.PL

-	./Build

-	./Build test

-	./Build install

-

-SUPPORT AND DOCUMENTATION

-

-After installing, you can find documentation for this module with the

-perldoc command.

-

-    perldoc DBI::Custom

-

-You can also look for information at:

-

-    RT, CPAN's request tracker

-        http://rt.cpan.org/NoAuth/Bugs.html?Dist=DBI-Custom

-

-    AnnoCPAN, Annotated CPAN documentation

-        http://annocpan.org/dist/DBI-Custom

-

-    CPAN Ratings

-        http://cpanratings.perl.org/d/DBI-Custom

-

-    Search CPAN

-        http://search.cpan.org/dist/DBI-Custom/

-

+cpan DBI::Custom

 COPYRIGHT AND LICENCE

@@ -5,9 +5,10 @@ our $VERSION = '0.0101';

 use Carp 'croak';

 use DBI;

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

-use DBI::Custom::Result;

 use DBI::Custom::Query;

+use DBI::Custom::Result;

+use DBI::Custom::SQL::Template;

+

 ### Class-Object Accessors

 sub user        : ClassObjectAttr { initialize => {clone => 'scalar'} }

@@ -65,8 +66,7 @@ sub add_filter {

 sub _auto_commit {

     my $self = shift;

-    croak("Cannot change AutoCommit becouse of not connected")

-      unless $self->dbh;

+    croak("Not yet connect to database") unless $self->dbh;

     if (@_) {

         $self->dbh->{AutoCommit} = $_[0];

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

     my $password    = $self->password;

     my $dbi_options  = $self->dbi_options;

-    my $dbh = DBI->connect(

+    my $dbh = eval{DBI->connect(

         $data_source,

         $user,

         $password,

@@ -93,7 +93,9 @@ sub connect {

             AutoCommit => 1,

             %{$dbi_options || {} }

         }

-    );

+    )};

+    

+    croak $@ if $@;

     $self->dbh($dbh);

     return $self;

@@ -127,74 +129,19 @@ sub reconnect {

     $self->connect;

 }

-# Run tranzaction

-sub run_tranzaction {

-    my ($self, $tranzaction) = @_;

-    

-    # Auto commit off

-    $self->_auto_commit(0);

-    

-    # Run tranzaction

-    eval {$tranzaction->()};

-    

-    # Tranzaction error

-    my $tranzaction_error = $@;

-    

-    # RaiseError on

-    my $old_raise_error = $self->dbh->{RaiseError};

-    $self->dbh->{RaiseError} = 1;

-    

-    # Tranzaction is failed.

-    if ($tranzaction_error) {

-        # Rollback

-        eval{$self->dbh->rollback};

-        

-        # Rollback error

-        my $rollback_error = $@;

-        

-        # Auto commit on

-        $self->_auto_commit(1);

-        

-        # Restore RaiseError value

-        $self->dbh->{RaiseError} = $old_raise_error;

-        

-        if ($rollback_error) {

-            # Rollback is failed

-            croak("${tranzaction_error}Rollback is failed : $rollback_error");

-        }

-        else {

-            # Rollback is success

-            croak("${tranzaction_error}Rollback is success");

-        }

-    }

-    # Tranzaction is success

-    else {

-        # Commit

-        eval{$self->dbh->commit};

-        my $commit_error = $@;

-        

-        # Auto commit on

-        $self->_auto_commit(1);

-        

-        # Restore RaiseError value

-        $self->dbh->{RaiseError} = $old_raise_error;

-        

-        # Commit is failed

-        croak($commit_error) if $commit_error;

-    }

-}

-

 # Prepare statement handle

 sub prepare {

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

     # Connect if not

-    eval{$self->connect unless $self->connected};

-    croak($@) if $@;

+    $self->connect unless $self->connected;

     # Prepare

     my $sth = eval{$self->dbh->prepare($sql)};

-    croak($@) if $@;

+    

+    # Error

+    croak("$@<Your SQL>\n$sql") if $@;

+    

     return $sth;

 }

@@ -203,12 +150,21 @@ sub do{

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

     # Connect if not

-    eval{$self->connect unless $self->connected};

-    croak($@) if $@;

+    $self->connect unless $self->connected;

     # Do

-    eval{$self->dbh->do($sql, @bind_values)};

-    croak($@) if $@;

+    my $ret_val = eval{$self->dbh->do($sql, @bind_values)};

+    

+    # Error

+    if ($@) {

+        my $error = $@;

+        require Data::Dumper;

+        

+        my $bind_value_dump

+          = Data::Dumper->Dump([\@bind_values], ['*bind_valuds']);

+        

+        croak("$error<Your SQL>\n$sql\n<Your bind values>\n$bind_value_dump\n");

+    }

 }

 # Create query

@@ -224,16 +180,10 @@ sub create_query {

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

     # Connect if not

-    eval{$self->connect unless $self->connected};

-    croak($@) if $@;

+    $self->connect unless $self->connected;

     # Prepare statement handle

-    my $sth = eval{$self->dbh->prepare($query->{sql})};

-    if ($@) {

-        my $sql = $query->{sql} || '';

-        my $message = "<Created SQL>\n$sql\n";

-        croak("$@$message");

-    }

+    my $sth = $self->prepare($query->{sql});

     # Set statement handle

     $query->sth($sth);

@@ -274,13 +224,12 @@ sub execute {

     my $ret_val = eval{$sth->execute(@$bind_values)};

     # Execute error

-    if ($@) {

+    if (my $execute_error = $@) {

         require Data::Dumper;

         my $sql         = $query->{sql} || '';

         my $params_dump = Data::Dumper->Dump([$params], ['*params']);

-        my $message = "<Created SQL>\n$sql\n<Your parameters>$params_dump";

-        croak("$@$message");

+        croak("$execute_error<Your SQL>\n$sql\n<Your parameters>\n$params_dump");

     }

     # Return resultset if select statement is executed

@@ -332,11 +281,6 @@ sub _build_bind_values {

                 # Current key

                 my $current_key = $access_key->[$i];

-                # Each access key must be string or array reference

-                croak("'access_keys' each value must be string or array reference")

-                  unless (ref $current_key eq 'ARRAY' ||

-                          ($current_key && !ref $current_key));

-                

                 # Last key

                 if ($i == @$access_key - 1) {

                     # Key is array reference

@@ -406,7 +350,7 @@ sub _build_bind_values {

             require Data::Dumper;

             my $key_info_dump  = Data::Dumper->Dump([$key_info], ['*key_info']);

             my $params_dump    = Data::Dumper->Dump([$params], ['*params']);

-            croak("Key not found in your parameters\n" . 

+            croak("Corresponding key is not found in your parameters\n" . 

                   "<Key information>\n$key_info_dump\n\n" .

                   "<Your parameters>\n$params_dump\n");

         }

@@ -414,6 +358,56 @@ sub _build_bind_values {

     return \@bind_values;

 }

+# Run tranzaction

+sub run_tranzaction {

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

+    

+    # Check auto commit

+    croak("AutoCommit must be true before tranzaction start")

+      unless $self->_auto_commit;

+    

+    # Auto commit off

+    $self->_auto_commit(0);

+    

+    # Run tranzaction

+    eval {$tranzaction->()};

+    

+    # Tranzaction error

+    my $tranzaction_error = $@;

+    

+    # Tranzaction is failed.

+    if ($tranzaction_error) {

+        # Rollback

+        eval{$self->dbh->rollback};

+        

+        # Rollback error

+        my $rollback_error = $@;

+        

+        # Auto commit on

+        $self->_auto_commit(1);

+        

+        if ($rollback_error) {

+            # Rollback is failed

+            croak("${tranzaction_error}Rollback is failed : $rollback_error");

+        }

+        else {

+            # Rollback is success

+            croak("${tranzaction_error}Rollback is success");

+        }

+    }

+    # Tranzaction is success

+    else {

+        # Commit

+        eval{$self->dbh->commit};

+        my $commit_error = $@;

+        

+        # Auto commit on

+        $self->_auto_commit(1);

+        

+        # Commit is failed

+        croak($commit_error) if $commit_error;

+    }

+}

 Object::Simple->build_class;

@@ -674,6 +668,21 @@ See also L<DBI::Custom::SQL::Template>

 If tranzaction is success, commit is execute. 

 If tranzation is died, rollback is execute.

+=head1 CAUTION

+

+DBI::Custom have DIB object internal.

+This module is work well in the following DBI condition.

+

+    1. AutoCommit is true

+    2. RaiseError is true

+

+By default, Both AutoCommit and RaiseError is true.

+You must not change these mode not to damage your data.

+

+If you change these mode, 

+you cannot get correct error message, 

+or run_tranzaction may fail.

+

 =head1 AUTHOR

 Yuki Kimoto, C<< <kimoto.yuki at gmail.com> >>

@@ -58,12 +58,31 @@ $dbi->connect;

 $dbi->disconnect;

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

+

 test 'connected';

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

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

 $dbi->connect;

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

+

+test 'preapare';

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

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

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

+$sth->execute;

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

+ok($sth, "$test : basic");

+

+

+test 'do';

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

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

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

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

+ok(defined $ret_val, "$test : basic");

+

+

 # Prepare table

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

 $dbi->connect;

@@ -408,3 +427,40 @@ $rows   = $result->fetch_all_hash;

 is_deeply($rows, [], "$test : rollback");

+test 'Error case';

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

+eval{$dbi->run_tranzaction};

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

+

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

+eval{$dbi->connect;};

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

+

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

+$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(data_source => 'dbi:SQLite:dbname=:memory:');

+$sql = 'laksjdf';

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

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

+

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

+$sql = 'laksjdf';

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

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

+

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

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

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

+

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

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

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

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

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

+        "$test : execute corresponding key not found");

+

@@ -36,8 +36,6 @@ sub module_boilerplate_ok {

     );

 }

-TODO: {

-  local $TODO = "Need to replace the boilerplate text";

   not_in_file_ok(README =>

     "The README is used..."       => qr/The README is used/,

@@ -51,5 +49,3 @@ TODO: {

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

-}

-