[Catalyst-commits] r6369 - in trunk/Catalyst-Model-DBI: . lib/Catalyst/Helper/Model lib/Catalyst/Model

[alex at dev.catalyst.perl.org]

Author: alex
Date: 2007-05-06 22:22:24 +0100 (Sun, 06 May 2007)
New Revision: 6369

Modified:
   trunk/Catalyst-Model-DBI/Changes
   trunk/Catalyst-Model-DBI/lib/Catalyst/Helper/Model/DBI.pm
   trunk/Catalyst-Model-DBI/lib/Catalyst/Model/DBI.pm
Log:
added fix to support ACCEPT_CONTEXT as per issue brought up by Evan Caroll

Modified: trunk/Catalyst-Model-DBI/Changes
===================================================================
--- trunk/Catalyst-Model-DBI/Changes	2007-05-06 18:08:42 UTC (rev 6368)
+++ trunk/Catalyst-Model-DBI/Changes	2007-05-06 21:22:24 UTC (rev 6369)
@@ -1,4 +1,6 @@
 Revision history for Perl extension Catalyst::Model::DBI.
+0.16  Sun May 06 14:48:00 2007
+	- added fix to support ACCEPT_CONTEXT as per issue brought up by Evan Caroll
 0.15  Sun Dec 10 23:00:00 2006
         - added fix to support config
 0.14  Sat Jun 24 18:00:00 2006

Modified: trunk/Catalyst-Model-DBI/lib/Catalyst/Helper/Model/DBI.pm
===================================================================
--- trunk/Catalyst-Model-DBI/lib/Catalyst/Helper/Model/DBI.pm	2007-05-06 18:08:42 UTC (rev 6368)
+++ trunk/Catalyst-Model-DBI/lib/Catalyst/Helper/Model/DBI.pm	2007-05-06 21:22:24 UTC (rev 6369)
@@ -3,7 +3,7 @@
 use strict;
 use File::Spec;
 
-our $VERSION = '0.15';
+our $VERSION = '0.16';
 
 =head1 NAME
 

Modified: trunk/Catalyst-Model-DBI/lib/Catalyst/Model/DBI.pm
===================================================================
--- trunk/Catalyst-Model-DBI/lib/Catalyst/Model/DBI.pm	2007-05-06 18:08:42 UTC (rev 6368)
+++ trunk/Catalyst-Model-DBI/lib/Catalyst/Model/DBI.pm	2007-05-06 21:22:24 UTC (rev 6369)
@@ -5,7 +5,7 @@
 use NEXT;
 use DBI;
 
-our $VERSION = '0.15';
+our $VERSION = '0.16';
 
 __PACKAGE__->mk_accessors( qw/_dbh _pid _tid/ );
 
@@ -51,12 +51,14 @@
 
 sub new {
 	my $self = shift;
-	my ($c) = @_;
-	$self = $self->NEXT::new(@_);
+	my ( $c ) = @_;
+	$self = $self->NEXT::new( @_ );
 	$self->{namespace}               ||= ref $self;
 	$self->{additional_base_classes} ||= ();
 	$self->{log} = $c->log;
 	$self->{debug} = $c->debug;
+	my $dbh;
+	$self->{__dbh} = \$dbh;
 	return $self;
 }
 
@@ -78,6 +80,7 @@
 	} else {
 		$self->_dbh ( $self->connect );
 	}
+	${$self->{__dbh}} = $self->_dbh;
 	return $self->_dbh;
 }