[Bast-commits] r3509 - in trunk/DBIx-Class: . lib/DBIx lib/DBIx/Class/CDBICompat lib/DBIx/Class/Schema t

matthewt at dev.catalyst.perl.org matthewt at dev.catalyst.perl.org
Sun Jun 17 22:13:25 GMT 2007


Author: matthewt
Date: 2007-06-17 22:13:23 +0100 (Sun, 17 Jun 2007)
New Revision: 3509

Modified:
   trunk/DBIx-Class/Changes
   trunk/DBIx-Class/MANIFEST.SKIP
   trunk/DBIx-Class/lib/DBIx/Class.pm
   trunk/DBIx-Class/lib/DBIx/Class/CDBICompat/ImaDBI.pm
   trunk/DBIx-Class/lib/DBIx/Class/Schema/Versioned.pm
   trunk/DBIx-Class/t/03podcoverage.t
   trunk/DBIx-Class/t/94versioning.t
   trunk/DBIx-Class/t/96multi_create.t
Log:
0.08001 because I'm an idiot

Modified: trunk/DBIx-Class/Changes
===================================================================
--- trunk/DBIx-Class/Changes	2007-06-17 20:07:37 UTC (rev 3508)
+++ trunk/DBIx-Class/Changes	2007-06-17 21:13:23 UTC (rev 3509)
@@ -1,5 +1,10 @@
 Revision history for DBIx::Class
 
+0.08001 2007-06-17 21:21:02
+        - Cleaned up on_connect handling for versioned
+        - removed DateTime use line from multi_create test
+        - hid DBIx::ContextualFetch::st override in CDBICompat
+
 0.08000 2007-06-17 18:06:12
         - Fixed DBIC_TRACE debug filehandles to set ->autoflush(1)
         - Fixed circular dbh<->storage in HandleError with weakref

Modified: trunk/DBIx-Class/MANIFEST.SKIP
===================================================================
--- trunk/DBIx-Class/MANIFEST.SKIP	2007-06-17 20:07:37 UTC (rev 3508)
+++ trunk/DBIx-Class/MANIFEST.SKIP	2007-06-17 21:13:23 UTC (rev 3509)
@@ -45,4 +45,4 @@
 \.orig$
 
 # Dont use Module::Build anymore
-# Build.PL
+^Build.PL$

Modified: trunk/DBIx-Class/lib/DBIx/Class/CDBICompat/ImaDBI.pm
===================================================================
--- trunk/DBIx-Class/lib/DBIx/Class/CDBICompat/ImaDBI.pm	2007-06-17 20:07:37 UTC (rev 3508)
+++ trunk/DBIx-Class/lib/DBIx/Class/CDBICompat/ImaDBI.pm	2007-06-17 21:13:23 UTC (rev 3509)
@@ -108,7 +108,8 @@
   return sprintf($sql, @args);
 }
 
-package DBIx::ContextualFetch::st;
+package
+  DBIx::ContextualFetch::st; # HIDE FROM PAUSE THIS IS NOT OUR CLASS
 
 no warnings 'redefine';
 

Modified: trunk/DBIx-Class/lib/DBIx/Class/Schema/Versioned.pm
===================================================================
--- trunk/DBIx-Class/lib/DBIx/Class/Schema/Versioned.pm	2007-06-17 20:07:37 UTC (rev 3508)
+++ trunk/DBIx-Class/lib/DBIx/Class/Schema/Versioned.pm	2007-06-17 21:13:23 UTC (rev 3509)
@@ -60,6 +60,13 @@
   return $version;
 }
 
+sub connection {
+  my $self = shift;
+  $self->next::method(@_);
+  $self->_on_connect;
+  return $self;
+}
+
 sub _on_connect
 {
     my ($self) = @_;
@@ -67,7 +74,7 @@
     my $vtable = $vschema->resultset('Table');
     my $pversion;
 
-    if(!$self->exists($vtable))
+    if(!$self->_source_exists($vtable))
     {
 #        $vschema->storage->debug(1);
         $vschema->storage->ensure_connected();
@@ -146,7 +153,7 @@
 #    $self->upgrade($pversion, $self->schema_version);
 }
 
-sub exists
+sub _source_exists
 {
     my ($self, $rs) = @_;
 

Modified: trunk/DBIx-Class/lib/DBIx/Class.pm
===================================================================
--- trunk/DBIx-Class/lib/DBIx/Class.pm	2007-06-17 20:07:37 UTC (rev 3508)
+++ trunk/DBIx-Class/lib/DBIx/Class.pm	2007-06-17 21:13:23 UTC (rev 3509)
@@ -18,7 +18,7 @@
 # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports
 # brain damage and presumably various other packaging systems too
 
-$VERSION = '0.08000';
+$VERSION = '0.08001';
 
 sub MODIFY_CODE_ATTRIBUTES {
   my ($class,$code, at attrs) = @_;

Modified: trunk/DBIx-Class/t/03podcoverage.t
===================================================================
--- trunk/DBIx-Class/t/03podcoverage.t	2007-06-17 20:07:37 UTC (rev 3508)
+++ trunk/DBIx-Class/t/03podcoverage.t	2007-06-17 21:13:23 UTC (rev 3509)
@@ -75,9 +75,9 @@
 
     'DBIx::Class::InflateColumn::File'                  => { skip => 1 },
 
-# skipped because two methods may not need to be public
+# skip connection since it's just an override
 
-    'DBIx::Class::Schema::Versioned' => { ignore => [ qw(on_connect exists) ] },
+    'DBIx::Class::Schema::Versioned' => { ignore => [ qw(connection) ] },
 
 # must kill authors.
 

Modified: trunk/DBIx-Class/t/94versioning.t
===================================================================
--- trunk/DBIx-Class/t/94versioning.t	2007-06-17 20:07:37 UTC (rev 3508)
+++ trunk/DBIx-Class/t/94versioning.t	2007-06-17 21:13:23 UTC (rev 3509)
@@ -37,7 +37,7 @@
 # $schema->deploy();
 
 my $tvrs = $schema_orig->resultset('Table');
-is($schema_orig->exists($tvrs), 1, 'Created schema from DDL file');
+is($schema_orig->_source_exists($tvrs), 1, 'Created schema from DDL file');
 
 eval "use DBICVersionNew";
 my $schema_new = DBICVersion::Schema->connect(
@@ -63,7 +63,7 @@
 ## do this here or let Versioned.pm do it?
 $schema_upgrade->upgrade();
 $tvrs = $schema_upgrade->resultset('Table');
-is($schema_upgrade->exists($tvrs), 1, 'Upgraded schema from DDL file');
+is($schema_upgrade->_source_exists($tvrs), 1, 'Upgraded schema from DDL file');
 
 unlink($db_file) if -e $db_file;
 unlink($db_file . "-journal") if -e $db_file . "-journal";

Modified: trunk/DBIx-Class/t/96multi_create.t
===================================================================
--- trunk/DBIx-Class/t/96multi_create.t	2007-06-17 20:07:37 UTC (rev 3508)
+++ trunk/DBIx-Class/t/96multi_create.t	2007-06-17 21:13:23 UTC (rev 3509)
@@ -4,7 +4,6 @@
 use Test::More;
 use lib qw(t/lib);
 use DBICTest;
-use DateTime;
 
 my $schema = DBICTest->init_schema();
 




More information about the Bast-commits mailing list