Changeset 33708

Timestamp:

06/01/09 20:52:56 (4 years ago)

Author:

yappo

Message:

add transaction support for Driver::DBI::MasterSlave?

Location:

lang/perl/Data-Model/trunk

Files:

• lib/Data/Model/Driver/DBI.pm (modified) (3 diffs)
• lib/Data/Model/Driver/DBI/MasterSlave.pm (modified) (1 diff)
• t/030_dbi/master_slave.t (modified) (3 diffs)

lang/perl/Data-Model/trunk/lib/Data/Model/Driver/DBI.pm

@@ -435 +435 @@
 sub txn_begin {
     my $self = shift;
+    $self->{active_transaction} = 1;
     my $dbh = $self->rw_handle;
     eval { $dbh->begin_work } or Carp::croak $@;
@@ -441 +442 @@
 sub txn_rollback {
     my $self = shift;
+    return unless $self->{active_transaction};
     my $dbh = $self->rw_handle;
     eval { $dbh->rollback } or Carp::croak $@;
@@ -447 +449 @@
 sub txn_commit {
     my $self = shift;
+    return unless $self->{active_transaction};
     my $dbh = $self->rw_handle;
     eval { $dbh->commit } or Carp::croak $@;
 }
 
+sub txn_end {
+    $_[0]->{active_transaction} = 0;
+}
+
 1;

lang/perl/Data-Model/trunk/lib/Data/Model/Driver/DBI/MasterSlave.pm

@@ -22 +22 @@
 
 sub rw_handle { $_[0]->_get_dbh('master') };
-sub r_handle  { $_[0]->_get_dbh('slave') };
+# トランザクション中は master のみを返す
+sub r_handle  { $_[0]->_get_dbh( $_[0]->{active_transaction} ? 'master' : 'slave' ) };
 
 1;

lang/perl/Data-Model/trunk/t/030_dbi/master_slave.t

@@ -22 +22 @@
     use Data::Model::Schema;
 
+    base_driver $driver;
     install_model counter => schema {
-        driver $driver;
         key 'id';
         column id
@@ -33 +33 @@
                 default => 0,
             };
+    };
+
+    install_model user => schema {
+        key 'name';
+
+        columns qw/ name nickname /;
+
+        schema_options create_sql_attributes => {
+            mysql => 'TYPE=InnoDB',
+        };
     };
 }
@@ -82 +92 @@
         };
     }
+
+    sub t_11_transaction : Tests(11) {
+        isnt($model->get_base_driver->rw_handle, $model->get_base_driver->r_handle, 'rw_handle != r_handle');
+        
+        my $scope = $model->txn_scope;
+        is($model->get_base_driver->rw_handle, $model->get_base_driver->r_handle, 'rw_handle == r_handle');
+        $scope->rollback;
+        isnt($model->get_base_driver->rw_handle, $model->get_base_driver->r_handle, 'rw_handle != r_handle');
+
+        $model->txn_scope;
+        isnt($model->get_base_driver->rw_handle, $model->get_base_driver->r_handle, 'rw_handle != r_handle');
+
+        do {
+            my $scope = $model->txn_scope;
+            is($model->get_base_driver->rw_handle, $model->get_base_driver->r_handle, 'rw_handle == r_handle');
+        };
+        isnt($model->get_base_driver->rw_handle, $model->get_base_driver->r_handle, 'rw_handle != r_handle');
+
+
+        $scope = $model->txn_scope;
+        $scope->set( user => { name => 'osawa', nickname => 'yappo' } );
+        my($get) = $scope->get( user => 'osawa' );
+        is($get->nickname, 'yappo', 'get from rw_handle');
+        $scope->commit;
+        isnt($model->get_base_driver->rw_handle, $model->get_base_driver->r_handle, 'rw_handle != r_handle');
+
+        ($get) = $model->get( user => 'osawa' );
+        ok(!$get, 'get from r_handle');
+
+        $scope = $model->txn_scope;
+        ($get) = $scope->get( user => 'osawa' );
+        is($get->nickname, 'yappo', 'get from rw_handle');
+        $scope->rollback;
+
+        ($get) = $model->get( user => 'osawa' );
+        ok(!$get, 'get from r_handle');
+    }
 }