[Bast-commits] r5919 - in branches/DBIx-Class-Schema-Loader/current: . lib/DBIx/Class/Schema/Loader

[ilmari at dev.catalyst.perl.org]

Author: ilmari
Date: 2009-04-21 04:34:04 +0100 (Tue, 21 Apr 2009)
New Revision: 5919

Modified:
   branches/DBIx-Class-Schema-Loader/current/Makefile.PL
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI.pm
Log:
Use Class::C3::Componentised->load_optional_class

Modified: branches/DBIx-Class-Schema-Loader/current/Makefile.PL
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/Makefile.PL	2009-04-21 00:05:49 UTC (rev 5918)
+++ branches/DBIx-Class-Schema-Loader/current/Makefile.PL	2009-04-21 03:34:04 UTC (rev 5919)
@@ -19,7 +19,7 @@
 requires 'Class::Accessor::Fast'       => '0.30';
 requires 'Class::Data::Accessor'       => '0.03';
 requires 'Class::C3'                   => '0.18';
-requires 'Class::C3::Componentised'    => 0;
+requires 'Class::C3::Componentised'    => '1.0005';
 requires 'Carp::Clan'                  => 0;
 requires 'Class::Inspector'            => 0;
 requires 'DBIx::Class'                 => '0.07006';

Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI.pm	2009-04-21 00:05:49 UTC (rev 5918)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/DBI.pm	2009-04-21 03:34:04 UTC (rev 5919)
@@ -40,11 +40,9 @@
     my $driver = $dbh->{Driver}->{Name};
 
     my $subclass = 'DBIx::Class::Schema::Loader::DBI::' . $driver;
-    if ($self->ensure_class_found($subclass)) {
-        eval { $self->ensure_class_loaded($subclass) };
-        croak "Failed to load $subclass: $@" if $@;
+    if ($self->load_optional_class($subclass)) {
         bless $self, $subclass unless $self->isa($subclass);
-        $self->_rebless();
+        $self->_rebless;
     }
 
     # Set up the default quoting character and name seperators