0.08, and the removal of the halfhearted ->require attempt

diff --git a/Changes b/Changes
index 2b0f7bc..e6b6313 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,12 @@
 Revision history for Perl extension Catalyst::Model::DBIC::Schema
 
+0.08  Tue Feb 28 00:04:16 UTC 2006
+        - Bumped D::C::Schema::Loader recommendation to 0.02003
+          (should have been done last release)
+        - Removed the ->require stuff added in 0.07, it doesn't
+          do what it is supposed to do.  For now, users can layer
+          at the Schema::Loader level rather than at Model.
+
 0.07  Sun Feb 19 21:50:18 UTC 2006
         - bugfix for ::SchemaLoader::Foo password argument, and
           switch to connect_info argument of new Schema::Loader

diff --git a/META.yml b/META.yml
index 28e0520..b92947a 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -1,6 +1,6 @@
 ---
 name: Catalyst-Model-DBIC-Schema
-version: 0.07
+version: 0.08
 author:
   - 'Brandon L Black, C<blblack@gmail.com>'
 abstract: DBIx::Class::Schema Model Class
@@ -22,5 +22,5 @@ provides:
     file: lib/Catalyst/Helper/Model/DBIC/SchemaLoader.pm
   Catalyst::Model::DBIC::Schema:
     file: lib/Catalyst/Model/DBIC/Schema.pm
-    version: 0.07
+    version: 0.08
 generated_by: Module::Build version 0.2611

diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm
index e422e88..92616b4 100644 (file)
--- a/lib/Catalyst/Model/DBIC/Schema.pm
+++ b/lib/Catalyst/Model/DBIC/Schema.pm
@@ -6,7 +6,7 @@ use NEXT;
 use UNIVERSAL::require;
 use Carp;
 
-our $VERSION = '0.07';
+our $VERSION = '0.08';
 
 __PACKAGE__->mk_classaccessor('composed_schema');
 __PACKAGE__->mk_accessors('schema');
@@ -185,12 +185,6 @@ sub new {
     no strict 'refs';
     foreach my $moniker ($self->schema->sources) {
         my $classname = "${class}::$moniker";
-       $classname->require;
-        if($@ && $@ !~ /^Can't locate /) {
-            croak "Failed to load external class definition"
-                  . "for '$classname': $@";
-        }
-
         *{"${classname}::ACCEPT_CONTEXT"} = sub {
             shift;
             shift->model($model_name)->resultset($moniker);