Merge pull request #7 from tokuhirom/master

[catagits/Web-Session.git] / lib / Plack / Session / Store / DBI.pm

diff --git a/lib/Plack/Session/Store/DBI.pm b/lib/Plack/Session/Store/DBI.pm
index e8c6ace..28f0b30 100644 (file)
--- a/lib/Plack/Session/Store/DBI.pm
+++ b/lib/Plack/Session/Store/DBI.pm
@@ -7,19 +7,18 @@ use warnings;
 our $VERSION   = '0.10';
 our $AUTHORITY = 'cpan:STEVAN';
 
-use DBI;
 use MIME::Base64 ();
 use Storable ();
 
 use parent 'Plack::Session::Store';
 
-use Plack::Util::Accessor qw[ dbh table_name serializer deserializer ];
+use Plack::Util::Accessor qw[ dbh get_dbh table_name serializer deserializer ];
 
 sub new {
     my ($class, %params) = @_;
 
-    if (! $params{dbh} ) {
-        die "DBI instance was not available in the argument list";
+    if (! $params{dbh} && ! $params{get_dbh}) {
+        die "DBI instance or a callback was not available in the argument list";
     }
 
     $params{table_name}   ||= 'sessions';
@@ -29,43 +28,19 @@ sub new {
         sub { Storable::thaw( MIME::Base64::decode_base64( $_[0] ) ) };
 
     my $self = bless { %params }, $class;
-    $self->_prepare_dbh();
     return $self;
 }
 
-sub _prepare_dbh {
-    my $self = shift;
-
-    my $dbh = $self->{dbh};
-    # These are pre-cooked, so we can efficiently execute them upon request
-    my $table_name = $self->{table_name};
-    my %sql = (
-        get_session    =>
-            "SELECT session_data FROM $table_name WHERE id = ?",
-
-        delete_session =>
-            "DELETE FROM $table_name WHERE id = ?",
-
-        # XXX argument list order matters for insert and update!
-        # (they should match, so we can execute them the same way)
-        # If you change this, be sure to change store() as well.
-        insert_session => 
-            "INSERT INTO $table_name (session_data, id) VALUES (?, ?)",
-        update_session =>
-            "UPDATE $table_name SET session_data = ? WHERE id = ?",
-
-        check_session => 
-            "SELECT 1 FROM $table_name WHERE id = ?",
-    );
-
-    while (my ($name, $sql) = each %sql ) {
-        $self->{"_sth_$name"} = $dbh->prepare($sql);
-    }
+sub _dbh {
+    my $self =shift;
+    ( exists $self->{get_dbh} ) ? $self->{get_dbh}->() : $self->{dbh};
 }
 
 sub fetch {
     my ($self, $session_id) = @_;
-    my $sth = $self->{_sth_get_session};
+    my $table_name = $self->{table_name};
+    my $dbh = $self->_dbh;
+    my $sth = $dbh->prepare_cached("SELECT session_data FROM $table_name WHERE id = ?");
     $sth->execute( $session_id );
     my ($data) = $sth->fetchrow_array();
     $sth->finish;
@@ -74,13 +49,12 @@ sub fetch {
 
 sub store {
     my ($self, $session_id, $session) = @_;
+    my $table_name = $self->{table_name};
 
     # XXX To be honest, I feel like there should be a transaction 
     # call here.... but Catalyst didn't have it, so I'm not so sure
 
-    my $sth;
-
-    $sth = $self->{_sth_check_session};
+    my $sth = $self->_dbh->prepare_cached("SELECT 1 FROM $table_name WHERE id = ?");
     $sth->execute($session_id);
 
     # need to fetch. on some DBD's execute()'s return status and
@@ -89,15 +63,21 @@ sub store {
 
     $sth->finish;
     
-    $sth = ($exists) ?
-        $self->{_sth_update_session} : $self->{_sth_insert_session};
-
-    $sth->execute( $self->serializer->($session), $session_id );
+    if ($exists) {
+        my $sth = $self->_dbh->prepare_cached("UPDATE $table_name SET session_data = ? WHERE id = ?");
+        $sth->execute( $self->serializer->($session), $session_id );
+    }
+    else {
+        my $sth = $self->_dbh->prepare_cached("INSERT INTO $table_name (id, session_data) VALUES (?, ?)");
+        $sth->execute( $session_id , $self->serializer->($session) );
+    }
+    
 }
 
 sub remove {
     my ($self, $session_id) = @_;
-    my $sth = $self->{_sth_delete_session};
+    my $table_name = $self->{table_name};
+    my $sth = $self->_dbh->prepare_cached("DELETE FROM $table_name WHERE id = ?");
     $sth->execute( $session_id );
     $sth->finish;
 }
@@ -128,11 +108,21 @@ Plack::Session::Store::DBI - DBI-based session store
       $app;
   };
 
+  # set get_dbh callback for ondemand
+
+  builder {
+      enable 'Session',
+          store => Plack::Session::Store::DBI->new(
+              get_dbh => sub { DBI->connect( @connect_args ) }
+          );
+      $app;
+  };
+  
   # with custom serializer/deserializer
 
   builder {
       enable 'Session',
-          store => Plack::Session::Store::File->new(
+          store => Plack::Session::Store::DBI->new(
               dbh => DBI->connect( @connect_args )
               # YAML takes it's args the opposite order
               serializer   => sub { YAML::DumpFile( reverse @_ ) },
@@ -148,7 +138,7 @@ default it will use L<Storable> and L<MIME::Base64> to serialize and
 deserialize the data, but this can be configured easily. 
 
 This is a subclass of L<Plack::Session::Store> and implements
-it's full interface.
+its full interface.
 
 =head1 SESSION TABLE SCHEMA