@@ -1,4 +1,5 @@

 0.1659

+    - EXPERIMETAL fork safety implementaion.

     - removed EXPERIMENTAL selection

     - added select() all_column option

 0.1658

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

 package DBIx::Custom;

-our $VERSION = '0.1658';

+our $VERSION = '0.1659';

 use 5.008001;

 use strict;

@@ -20,7 +20,7 @@ use DBIx::Custom::Util;

 use Encode qw/encode_utf8 decode_utf8/;

 __PACKAGE__->attr(

-    [qw/data_source dbh password user/],

+    [qw/data_source password pid user/],

     cache => 1,

     dbi_option => sub { {} },

     default_dbi_option => sub {{

@@ -35,6 +35,29 @@ __PACKAGE__->attr(

     stash => sub { {} }

 );

+sub dbh {

+    my $self = shift;

+

+    if (@_) {

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

+        return $self;

+    }

+    else {

+        my $pid = $$;

+        if ($self->pid eq $pid) {

+            return $self->{dbh};

+        }

+        else {

+            # Create new connection in child process

+            croak "Process is forked in transaction"

+              unless $self->{dbh}->{AutoCommit};

+            $self->pid($pid);

+            $self->{dbh}->{InactiveDestroy} = 1;

+            return $self->{dbh} = $self->_connect;

+        }

+    }

+}

+

 __PACKAGE__->attr(

     cache_method => sub {

         sub {

@@ -157,31 +180,14 @@ sub method {

 sub connect {

     my $self = ref $_[0] ? shift : shift->new(@_);;

-    # Attributes

-    my $data_source = $self->data_source;

-    croak qq{"data_source" must be specified to connect()"}

-      unless $data_source;

-    my $user        = $self->user;

-    my $password    = $self->password;

-    my $dbi_option = {%{$self->dbi_options}, %{$self->dbi_option}};

-    

-    # Connect

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

-        $data_source,

-        $user,

-        $password,

-        {

-            %{$self->default_dbi_option},

-            %$dbi_option

-        }

-    )};

-    

-    # Connect error

-    croak $@ if $@;

+    my $dbh = $self->_connect;

     # Database handle

     $self->dbh($dbh);

+    # Process ID

+    $self->pid($$);

+    

     return $self;

 }

@@ -1126,6 +1132,34 @@ sub _bind {

     return \@bind;

 }

+sub _connect {

+    my $self = shift;

+    

+    # Attributes

+    my $data_source = $self->data_source;

+    croak qq{"data_source" must be specified to connect()"}

+      unless $data_source;

+    my $user        = $self->user;

+    my $password    = $self->password;

+    my $dbi_option = {%{$self->dbi_options}, %{$self->dbi_option}};

+    

+    # Connect

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

+        $data_source,

+        $user,

+        $password,

+        {

+            %{$self->default_dbi_option},

+            %$dbi_option

+        }

+    )};

+    

+    # Connect error

+    croak $@ if $@;

+    

+    return $dbh;

+}

+

 sub _croak {

     my ($self, $error, $append) = @_;

     $append ||= "";

@@ -1434,13 +1468,6 @@ default to 1.

 Data source, used when C<connect()> is executed.

-=head2 C<dbh>

-

-    my $dbh = $dbi->dbh;

-    $dbi    = $dbi->dbh($dbh);

-

-Database handle of L<DBI>.

-

 =head2 C<dbi_option>

     my $dbi_option = $dbi->dbi_option;

@@ -1463,6 +1490,11 @@ default to the following values.

         AutoCommit => 1,

     }

+You should not change C<AutoCommit> value directly

+to check if the process is in transaction correctly.

+L<DBIx::Custom> determin the process is in transaction

+if AutoCommit is 0. 

+

 =head2 C<filters>

     my $filters = $dbi->filters;

@@ -1562,6 +1594,16 @@ instead of suger methods.

     $dbi->execute($query, {author => 'Ken', title => '%Perl%'});

+=head2 C<dbh>

+

+    my $dbh = $dbi->dbh;

+    $dbi    = $dbi->dbh($dbh);

+

+Get and set database handle of L<DBI>.

+

+If process is changed by forking, new connection is created

+and get new database hande ofL<DBI>. This feature is EXPERIMETNAL.

+

 =head2 C<execute>

     my $result = $dbi->execute($query,  param => $params, filter => \@filter);

@@ -30,6 +30,7 @@ sub connect_info {

 my $dbi;

 my $dbname;

 my $rows;

+my $result;

 # Constant varialbes for test

 my $CREATE_TABLE = {

@@ -59,6 +60,7 @@ $dbi = DBIx::Custom->connect(

     user => $USER,

     password => $PASSWORD

 );

+$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});

@@ -93,3 +95,48 @@ $rows = $dbi->select(

 )->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 2}]);

 $dbi->delete_all(table => 'table1');

+

+

+test 'fork';

+{

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

+        data_source => "dbi:mysql:database=$DATABASE",

+        user => $USER,

+        password => $PASSWORD

+    );

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

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

+    die "Can't fork" unless defined (my $pid = fork);

+

+    if ($pid) {

+        # Parent

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

+        is_deeply($result->fetch_hash_first, {key1 => 1, key2 => 2});

+    }

+    else {

+        # Child

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

+        die "Not OK" unless $result->fetch_hash_first->{key1} == 1;

+    }

+}

+

+test 'fork in transaction';

+{

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

+        data_source => "dbi:mysql:database=$DATABASE",

+        user => $USER,

+        password => $PASSWORD

+    );

+    

+    $dbi->begin_work;

+    die "Can't fork" unless defined (my $pid = fork);

+    

+    if ($pid) {

+        # Parent

+    }

+    else {

+        # Child

+        eval {$dbi->select(table => 'table1') };

+        die "Not OK" unless $@ =~ /transaction/;

+    }

+}